update default instrument in scienta config

FAIRmat-NFDI · Mar 26, 2024 · 7a8c7d1 · 7a8c7d1
1 parent 29dda77
commit 7a8c7d1
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 3 deletions.
diff --git a/pynxtools_xps/config/config_scienta_txt.json b/pynxtools_xps/config/config_scienta_txt.json
@@ -124,7 +124,7 @@
           "identifier":"@eln"
         },
         "raw_data":{
-          "@signal":"None",
+          "@signal":"raw",
           "raw":"@detector_data:cycles/Cycle_",
           "raw/@units":"counts"
         }

diff --git a/pynxtools_xps/scienta/scienta_txt.py b/pynxtools_xps/scienta/scienta_txt.py
@@ -180,7 +180,7 @@ def _update_xps_dict_with_spectrum(self, spectrum, key_map):
 
         """
         # pylint: disable=too-many-locals,duplicate-code
-        group_parent = f'{self._root_path}/Region_{spectrum["spectrum_type"]}'
+        group_parent = f'{self._root_path}/Group_{spectrum["spectrum_type"]}'
         region_parent = f'{group_parent}/regions/Region_{spectrum["region_name"]}'
         file_parent = f"{region_parent}/file_info"
         instrument_parent = f"{region_parent}/instrument"
@@ -200,7 +200,7 @@ def _update_xps_dict_with_spectrum(self, spectrum, key_map):
             "calibration": f"{instrument_parent}/calibration",
             "sample": f"{region_parent}/sample",
             "data": f"{region_parent}/data",
-            "region": f"{region_parent}",
+            "region": f"{region_parent}/region",
         }
 
         for grouping, spectrum_keys in key_map.items():

diff --git a/tests/data/scienta_txt/eln_data.yaml b/tests/data/scienta_txt/eln_data.yaml
@@ -68,6 +68,56 @@ instrument:
       amplifier_type: channeltron
       detector_type: Multi-anode
   manipulator:
+    device_information:
+      vendor: Scienta Omicron
+    temperature_sensor:
+      name: type K thermocouple
+      measurement: temperature
+      attached_to: sample
+      type: type K thermocouple
+      value:
+        value: 298.0
+        unit: K
+    sample_heater:
+      name: Coherent Compact Evolution IR Diode LASER (DILAS)
+      physical_quantity: temperature
+      type: IR diode laser
+      heater_power:
+        value: 0.0
+        unit: W
+      pid:
+        setpoint:
+          value: 298.0
+          unit: K
+    cryostat:
+      name: null
+      physical_quantity: null
+      type: null
+      pid:
+        setpoint: null
+    drain_current_amperemeter:
+      name: Amperemeter 1.0
+      measurement: current
+      type: wire
+      value:
+        value: 0.1
+        unit: nA
+    sample_bias_voltmeter:
+      name: XPS sample voltmeter
+      measurement: voltage
+      attached_to: sample
+      type: oscilloscope
+      value:
+        value: 0.0
+        unit: V
+    sample_bias_potentiostat:
+      name: XPS sample potentiostat
+      physical_quantity: voltage
+      type: potentiostat
+      pid:
+        setpoint:
+          value: 0.0
+          unit: V
     POSITIONER[positioner_x]:
       value:
         value: 15.5
@@ -84,6 +134,28 @@ instrument:
       value:
         value: 45
         unit: degree
+  pressure_gauge:
+    name: Atmion
+    measurement: pressure
+    type: hot-filament ionization gauge
+    value:
+      value: 0.000000001
+      unit: mbar
+    value_log:
+      value:
+        value: null
+        unit: null
+  flood_gun:
+    name: FG 22/35
+    physical_quantity: current
+    type: low energy electron source
+    current:
+      value: 0.0
+      unit: A
+    current_log:
+      value:
+        value: null
+        unit: null
 sample:
   chemical_formula: Au
   description: Au foil on standard sample holder