Merge pull request #23 from FAIRmat-NFDI/22-no-default-attribute-on-n…

…xdata Remove default attributes from fields
FAIRmat-NFDI · Mar 15, 2024 · 6603d86 · 6603d86
2 parents a4d53fb + 97cf12e
commit 6603d86
Show file tree

Hide file tree

Showing 7 changed files with 832 additions and 841 deletions.
diff --git a/pynxtools_xps/config/config_sle_specs.json b/pynxtools_xps/config/config_sle_specs.json
@@ -1,5 +1,5 @@
 {
-  "/@default":"entry",
+  "/@default":"None",
   "/ENTRY[entry]":{
     "@default":"data",
     "definition":"@eln",
@@ -24,6 +24,7 @@
     "email":"@eln"
   },
   "/ENTRY[entry]/INSTRUMENT[instrument]":{
+    "@default": "electronanalyser",
     "device_information":{
       "vendor":"@eln",
       "identifier":"@eln",
@@ -84,7 +85,6 @@
         "resolution/@units":"@xps_token:data/step_size/@units"
       },
       "transmission_function":{
-        "@default":"relative_intensity",
         "@signal":"relative_intensity",
         "@axes":["kinetic_energy"],
         "kinetic_energy":"@xps_token:transmission_function/kinetic_energy",
@@ -171,7 +171,6 @@
         },
         "raw_data":{
           "@signal":"raw",
-          "@default":"raw",
           "raw":"@detector_data:cycles/Cycle_",
           "raw/@units":"@xps_token:detector/raw_data/raw/@units"
         }
@@ -308,7 +307,6 @@
   },
   "/ENTRY[entry]/data":{
     "@signal":"data",
-    "@default":"data",
     "@axes":["energy"],
     "data":"@data:cycle",
     "data/@units":"@xps_token:data/intensity/@units",

diff --git a/pynxtools_xps/config/config_specs_xy.json b/pynxtools_xps/config/config_specs_xy.json
@@ -23,6 +23,7 @@
       "email":"@eln"
     },
     "/ENTRY[entry]/INSTRUMENT[instrument]":{
+      "@default": "electronanalyser",
       "device_information":{
         "vendor":"None",
         "identifier":"None",
@@ -58,7 +59,7 @@
         "associated_source":"@link:/entry/instrument/source_probe"
       },
       "ELECTRONANALYSER[electronanalyser]":{
-        "@default": "None",
+        "@default": "detector0",
         "description":"@eln",
         "name": "@eln",
         "work_function":"@eln",
@@ -122,7 +123,6 @@
           },
           "raw_data":{
             "@signal":"None",
-            "@default":"raw",
             "raw":"@detector_data:cycles/Cycle_",
             "raw/@units":"counts"
           }
@@ -273,7 +273,6 @@
     },
     "/ENTRY[entry]/data":{
       "@signal":"data",
-      "@default":"data",
       "@axes":["energy"],
       "data":"@data:cycle",
       "data/@units":"@xps_token:data/y_units",