bugfix leap model heuristics

FAIRmat-NFDI · Jan 30, 2025 · 3fee393 · 3fee393
1 parent 94dc834
commit 3fee393
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,13 +11,18 @@
             "cwd": "${workspaceFolder}",
             "program": "../../.py3.11.11/bin/dataconverter",
             "args": [//workflow files str.str, hits.hits, root.root should be created via touch str.str ...
-                     "../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/001.0.c4b1b412f46833ef7b72164858f3fa2daea60de212b2a62cd7121c07a92d5837.rhit.CRunHeader.dat.Parsed.cameca",
+                     //"../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/001.0.c4b1b412f46833ef7b72164858f3fa2daea60de212b2a62cd7121c07a92d5837.rhit.CRunHeader.dat.Parsed.cameca",
                      //"../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/019.0.8d12016f3d152ce8a02194b126bd6c896f517928dada673864e93e4dfc418738.root.CAnalysis.dat.Parsed.cameca",
+                     //"../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/091.0.638c14a699bce8644b1df4690c86b5f0d2fdc60fc4cbfdeb8bc89def735193b6.rhit.CRunHeader.dat.Parsed.cameca",
+                     //"../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/091.0.68466f6cc6a751a23126c82f8a5a04c9c91f1c7e03bb44e6d2c2c9375e07a624.root.CAnalysis.dat.Parsed.cameca",
+                     "../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/008.1.1f7a63e5a16239bcaebe71c8ac2812b5f6cdb1175f1a4618db7c9435c3ead06c.rhit.CRunHeader.dat.Parsed.cameca",
                      "--reader",
                      "apm",
                      "--nxdl",
                      "NXapm",
-                     "--output=tests/prod/out_recon.nxs"]
+                     "--output=tests/prod/aus_sydney_ceguerra_al.008.1.nxs",
+                     //"--output=tests/prod/usa_portland_grimm.091.0.nxs"]
+                     //"--output=tests/prod/out_recon.nxs"]
                      //"--output=tests/prod/out_range.nxs"]
         }
     ]

diff --git a/src/pynxtools_apm/utils/oasis_apsuite_reader.py b/src/pynxtools_apm/utils/oasis_apsuite_reader.py
@@ -156,7 +156,7 @@ def assume_leap_model_enum_for_rdm(self, template: dict) -> dict:
                 ("16", "LEAP 5000 XR"),
                 ("17", "LEAP INVIZO"),
             ]:
-                if fleap_model == self.yml[f"LeapModel"]:
+                if fleap_model == self.yml[f"fLeapModel"]:
                     template[
                         f"/ENTRY[entry{self.entry_id}]/measurement/instrument/type"
                     ] = enum_value