rebase-1

FAIRmat-NFDI · Dec 2, 2024 · b95ef92 · b95ef92
1 parent c03ba37
commit b95ef92
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/pynxtools_spm/configs/nanonis_dat_generic_sts.py b/src/pynxtools_spm/configs/nanonis_dat_generic_sts.py
@@ -26,7 +26,7 @@
         "@default": {"raw_path": "@default:current"},
         "definition": {"@version": ""},
         "experiment_instrument": {
-            "LOCKIN[lockin]": {
+            "lockin_amplifier[lockin]": {
                 "modulation_status": {
                     "raw_path": "/Lock-in/Lock-in status/value",
                 },

diff --git a/src/pynxtools_spm/nomad/examples/sts/STSDefaultExample/STS.scheme.archive.yaml b/src/pynxtools_spm/nomad/examples/sts/STSDefaultExample/STS.scheme.archive.yaml
@@ -8,7 +8,7 @@ definitions:
       m_annotations:
         template:
           reader: spm
-          nxdl: NXsts
+          nxdl: NXspm
         eln:
           hide: []
       quantities:

diff --git a/src/pynxtools_spm/reader.py b/src/pynxtools_spm/reader.py
@@ -57,7 +57,11 @@ def manually_filter_data_type(template):
 class SPMReader(BaseReader):
     """Reader for XPS."""
 
+<<<<<<< HEAD
     supported_nxdls = ["NXspm", "NXsts", "NXstm", "NXafm"]
+=======
+    supported_nxdls = ["NXstm", "NXspm", "NXafm", "NXsts"]
+>>>>>>> e1c1cf1 (Prepare nomad examples for sts-1)
 
     def read(
         self,

diff --git a/tests/data/nanonis/sts/version_gen_5e_with_described_nxdata/config.json b/tests/data/nanonis/sts/version_gen_5e_with_described_nxdata/config.json
@@ -5,7 +5,7 @@
         },
         "definition": {"@version": ""},
         "experiment_instrument": {
-            "LOCKIN[lockin]": {
+            "lockin_amplifier[lockin]": {
                 "modulation_status": {
                     "raw_path": "/Lock-in/Lock-in status/value"
                 },