Merge pull request #542 from nexusformat/NXmx_multimodule_and_dectris…

…_changes Nxmx multimodule and dectris changes
nexusformat · Mar 9, 2017 · a1b97e9 · a1b97e9
2 parents 433fb8f + 6cb9723
commit a1b97e9
Show file tree

Hide file tree

Showing 5 changed files with 639 additions and 391 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ manual/source/classes/contributed_definitions/canSAS
 manual/makelog.txt
 build
 impatient-guide/_build
+.DS_Store
diff --git a/applications/NXcanSAS.nxdl.xml b/applications/NXcanSAS.nxdl.xml
@@ -891,8 +891,10 @@
             Position of the beam center on the detector.
 
             This is the x position where the direct beam would hit the detector plane.
-            This is a length, not a pixel position, and can be outside of the actual
-            detector.  The value can any real number (positive, zero, or negative).
+            This is a length and can be outside of the actual
+	    detector.  The length can be in physical units or pixels
+	    as documented by the units attribute. The value can be any
+            real number (positive, zero, or negative).
           </doc>
         </field>
 
@@ -901,8 +903,10 @@
             Position of the beam center on the detector.
 
             This is the y position where the direct beam would hit the detector plane.
-            This is a length, not a pixel position, and can be outside of the actual
-            detector.  The value can any real number (positive, zero, or negative).
+            This is a length and can be outside of the actual
+	    detector.  The length can be in physical units or pixels
+	    as documented by the units attribute. The value can be any
+            real number (positive, zero, or negative).
           </doc>
         </field>