Changeset 2347 for trunk/imports/G2img_1TIF.py

Timestamp:

Jun 27, 2016 9:48:51 AM (7 years ago)

Author:

vondreele

Message:

implement Steven Weigand's fixes for Pilatus 'I' for 'L'
do a 'fix' for powderCif files with value(esd) for powder profile points
add a couple of comments for tutorial stuff

File:

• trunk/imports/G2img_1TIF.py (modified) (3 diffs)

trunk/imports/G2img_1TIF.py

@@ -164 +164 @@
 # extract resonable distance from header
         distance = (marFrame.startXtalToDetector+marFrame.endXtalToDetector)*5e-4
-        distance = (distance <= 0) and marFrame.xtalToDetector*1e-3 or distance
+        distance = (distance <= marFrame.startXtalToDetector*5e-4) and marFrame.xtalToDetector*1e-3 or distance
         distance = (distance <= 0) and None or distance
 # extract resonable center from header
@@ -197 +197 @@
             File.seek(4096)
             print 'Read Pilatus tiff file: ',filename
-            image = ar.array('L',File.read(4*Npix))
+            image = ar.array('I',File.read(4*Npix))
             image = np.array(np.asarray(image),dtype=np.int32)
         else:
@@ -211 +211 @@
                 File.seek(8)
                 print 'Read CHESS-detector tiff file: ',filename
-                image = np.array(ar.array('L',File.read(4*Npix)),dtype=np.int32)
+                image = np.array(ar.array('I',File.read(4*Npix)),dtype=np.int32)
     elif 270 in IFD:
         File.seek(IFD[270][2][0])