Resolve conundrum between name and version.

FAIRmat-NFDI · Apr 26, 2024 · 74fdbfd · 74fdbfd
1 parent 1897587
commit 74fdbfd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 29 deletions.
diff --git a/contributed_definitions/NXfabrication.nxdl.xml b/contributed_definitions/NXfabrication.nxdl.xml
@@ -25,29 +25,22 @@
     <doc>
          Details about a component as it is defined by its manufacturer.
     </doc>
-    <field name="name" type="NX_CHAR">
-        <doc>
-             Name of the insturment or compoenent as it is known to the manufacturer or
-             community.
-        </doc>
-    </field>
     <field name="vendor" type="NX_CHAR">
         <doc>
              Company name of the manufacturer.
         </doc>
     </field>
     <field name="model" type="NX_CHAR">
         <doc>
-             Version or model of the component named by the manufacturer. If Version is
-             different from model, use version.
+             Version or model of the component named by the manufacturer. If a model has
+             several version use version attribute.
         </doc>
+        <attribute name="version" type="NX_CHAR">
+            <doc>
+                 Version of the model if a model have different versions.
+            </doc>
+        </attribute>
     </field>
-    <attribute name="version" type="NX_CHAR">
-        <doc>
-             Version of the component or software if version is intended different than model
-             or different version of a model.
-        </doc>
-    </attribute>
     <field name="identifier" type="NX_CHAR">
         <doc>
              Ideally, (globally) unique persistent identifier, i.e.

diff --git a/contributed_definitions/NXsts.nxdl.xml b/contributed_definitions/NXsts.nxdl.xml
@@ -113,11 +113,6 @@ any or specifique 'harware' and 'software'?-->
                      Type of software used in SPM experiments, such as software version serial number, UI and
                      RT probe release method. (e.g. SW Version Generic 5e -- RT Release 10771)
                 </doc>
-                <attribute name="version">
-                    <doc>
-                         Version of the software used in the experiment (e.g. Generic 5e).
-                    </doc>
-                </attribute>
             </group>
             <!--amplification: Current amplifier> factor (V/V): 1E-10
 crosstalk_compensation: Current amplifier> Capacitive cross-talk compensation: Yes/No-->

diff --git a/contributed_definitions/nyaml/NXfabrication.yaml b/contributed_definitions/nyaml/NXfabrication.yaml
@@ -3,18 +3,15 @@ doc: |
   Details about a component as it is defined by its manufacturer.
 type: group
 NXfabrication(NXobject):
-  name(NX_CHAR):
-    doc: |
-      Name of the insturment or compoenent as it is known to the manufacturer or community.
   vendor(NX_CHAR):
     doc: |
       Company name of the manufacturer.
   model(NX_CHAR):
     doc: |
-      Version or model of the component named by the manufacturer. If Version is different from model, use version.
-  \@version(NX_CHAR):
-    doc: |
-      Version of the component or software if version is intended different than model or different version of a model.
+      Version or model of the component named by the manufacturer. If a model has several version use version attribute.
+    \@version(NX_CHAR):
+      doc: |
+        Version of the model if a model have different versions.
       
   identifier(NX_CHAR):
     doc: |

diff --git a/contributed_definitions/nyaml/NXsts.yaml b/contributed_definitions/nyaml/NXsts.yaml
@@ -71,9 +71,6 @@ NXsts(NXsensor_scan):
         doc: |
           Type of software used in SPM experiments, such as software version serial number, UI and
           RT probe release method. (e.g. SW Version Generic 5e -- RT Release 10771)
-        \@version:
-          doc: |
-            Version of the software used in the experiment (e.g. Generic 5e).
       # amplification: Current amplifier> factor (V/V): 1E-10
       # crosstalk_compensation: Current amplifier> Capacitive cross-talk compensation: Yes/No
       current_amplifier(NXamplifier):