Last changes before switching to refactored NXapm, which might break …

…some paths in the parser as apm-specific base classes were heavily reassessed in preparation for NIAC revision of NXapm to become accepted in the standard
FAIRmat-NFDI · Jan 31, 2025 · ffea6b0 · ffea6b0
1 parent 3fee393
commit ffea6b0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,16 +11,17 @@
             "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/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",
+                     //"../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/cameca/001.0.c4b1b412f46833ef7b72164858f3fa2daea60de212b2a62cd7121c07a92d5837.rhit.CRunHeader.dat.Parsed.cameca",
+                     //"../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/cameca/019.0.8d12016f3d152ce8a02194b126bd6c896f517928dada673864e93e4dfc418738.root.CAnalysis.dat.Parsed.cameca",
+                     //"../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/cameca/091.0.638c14a699bce8644b1df4690c86b5f0d2fdc60fc4cbfdeb8bc89def735193b6.rhit.CRunHeader.dat.Parsed.cameca",
+                     //"../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/cameca/091.0.68466f6cc6a751a23126c82f8a5a04c9c91f1c7e03bb44e6d2c2c9375e07a624.root.CAnalysis.dat.Parsed.cameca",
+                     //"../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/cameca/008.1.1f7a63e5a16239bcaebe71c8ac2812b5f6cdb1175f1a4618db7c9435c3ead06c.rhit.CRunHeader.dat.Parsed.cameca",
+                     "../../../../paper_paper_paper/scidat_nomad_apt/bb_analysis/analysis/harvest_examples/data/production/cameca/088.44.1444afcbc8114aa6832716877ea9dc3360968458ce1ce74bb4c9ea21f4fe8678.rhit.CRunHeader.dat.Parsed.cameca",
                      "--reader",
                      "apm",
                      "--nxdl",
                      "NXapm",
-                     "--output=tests/prod/aus_sydney_ceguerra_al.008.1.nxs",
+                     "--output=tests/prod/usa_idaho_boise.088.44.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/configurations/cameca_cfg.py b/src/pynxtools_apm/configurations/cameca_cfg.py
@@ -49,8 +49,8 @@
         ("specimen/description", "fSpecimenCondition"),
         ("specimen/alias", "fSpecimenName"),
         ("start_time", "fStartISO8601"),
-        ("run_number", "fRunNumber"),
     ],
+    "map_to_u4": [("run_number", "fRunNumber")],
     "map_to_f8": [
         ("atom_probe/reconstruction/efficiency", "fEfficiency"),
         (

diff --git a/src/pynxtools_apm/utils/oasis_apsuite_reader.py b/src/pynxtools_apm/utils/oasis_apsuite_reader.py
@@ -148,13 +148,13 @@ def assume_leap_model_enum_for_rdm(self, template: dict) -> dict:
         #  "Modular AP", "Titanium APT", "Extreme UV APT", "unknown"]
         if "fLeapModel" in self.yml:
             for fleap_model, enum_value in [
-                ("10", "LEAP 4000X Si"),
-                ("11", "LEAP 4000 HR"),
-                ("12", "LEAP 4000X HR"),
-                ("14", "LEAP 5000 XS"),
-                ("15", "LEAP 4000 XHR"),
-                ("16", "LEAP 5000 XR"),
-                ("17", "LEAP INVIZO"),
+                (10, "LEAP 4000X Si"),
+                (11, "LEAP 4000 HR"),
+                (12, "LEAP 4000X HR"),
+                (14, "LEAP 5000 XS"),
+                (15, "LEAP 4000 XHR"),
+                (16, "LEAP 5000 XR"),
+                (17, "LEAP INVIZO"),
             ]:
                 if fleap_model == self.yml[f"fLeapModel"]:
                     template[