First set of edits for ESS

https://confluence.esss.lu.se/display/DMSC/Instrument+Geometry+in+NeXus
nexusformat · Aug 12, 2017 · d709db6 · d709db6
1 parent db55a5b
commit d709db6
Showing 1 changed file with 32 additions and 18 deletions.
diff --git a/base_classes/NXdetector.nxdl.xml b/base_classes/NXdetector.nxdl.xml
@@ -82,12 +82,10 @@
   </field>
 
   <field name="detector_number" type="NX_INT">
-    <doc>Identifier for detector</doc>
-
-    <dimensions rank="2">
-      <dim index="1" value="i" />
-      <dim index="2" value="j" />
-    </dimensions>
+    <doc>
+	Identifier for detector (pixels)
+	Can be multidimensional, if needed
+   </doc>
   </field>
 
   <field name="data" type="NX_NUMBER" units="NX_ANY">
@@ -127,15 +125,10 @@
 
   <field name="x_pixel_offset" type="NX_FLOAT" units="NX_LENGTH">
     <doc>
-	Offset from the detector center in x-direction. 
+	Pixel location in x direction given from the location referenced by the depends_on or the detector center if the depends_on is missing.
 	Can be multidimensional when needed.
     </doc>
 
-    <dimensions rank="2">
-      <dim index="1" value="i" />
-      <dim index="2" value="j" />
-    </dimensions>
-
     <attribute name="axis" type="NX_POSINT"
       deprecated="see: https://github.com/nexusformat/definitions/issues/436">
       <enumeration>
@@ -157,15 +150,10 @@
 
   <field name="y_pixel_offset" type="NX_FLOAT" units="NX_LENGTH">
     <doc>
-	Offset from the detector center in the y-direction.
+	Pixel location in y direction given from the location referenced by the depends_on or the detector center if the depends_on is missing.
 	Can be multidimensional when different values are required for each pixel.
     </doc>
 
-    <dimensions rank="2">
-      <dim index="1" value="i" />
-      <dim index="2" value="j" />
-    </dimensions>
-
     <attribute name="axis" type="NX_POSINT"
       deprecated="see: https://github.com/nexusformat/definitions/issues/436">
       <enumeration>
@@ -185,6 +173,32 @@
     </attribute>
   </field>
 
+
+  <field name="z_pixel_offset" type="NX_FLOAT" units="NX_LENGTH">
+    <doc>
+	Pixel location in y direction given from the location referenced by the depends_on or the detector center if the depends_on is missing.
+	Can be multidimensional when different values are required for each pixel.
+    </doc>
+
+    <attribute name="axis" type="NX_POSINT"
+      deprecated="see: https://github.com/nexusformat/definitions/issues/436">
+      <enumeration>
+        <item value="3"/>
+      </enumeration>
+    </attribute>
+
+    <attribute name="primary" type="NX_POSINT"
+      deprecated="see: https://github.com/nexusformat/definitions/issues/436">
+      <enumeration>
+        <item value="1"/>
+      </enumeration>
+    </attribute>
+
+    <attribute name="long_name">
+      <doc>y-axis offset from detector center</doc>
+    </attribute>
+  </field>
+
   <field name="distance" type="NX_FLOAT" units="NX_LENGTH">
     <doc>
       This is the distance to the previous component in the