Changeset 4920

Timestamp:

Jun 3, 2021 8:12:01 PM (2 years ago)

Author:

vondreele

Message:

fix import of 2nd type of Pilatus images.

File:

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

trunk/imports/G2img_1TIF.py

@@ -112 +112 @@
         IFD = int(st.unpack(byteOrd+'i',File.read(4))[0])        
     else:
-#        print (tag)
         lines = ['not a detector tiff file',]
         return lines,0,0,0
@@ -215 +214 @@
         File.seek(IFD[270][2][0])
         S = File.read(IFD[273][2][0]-IFD[270][2][0])
-        if b'ImageJ' in S:
+        if b'Pilatus3' in S:
+            tifType = 'Pilatus3'
+            dataType = 0
+            pixy = [172.,172.]
+            File.seek(IFD[273][2][0])
+            G2fil.G2Print ('Read Pilatus3 tiff file: '+filename)
+            image = np.array(np.frombuffer(File.read(4*Npix),dtype=np.int32),dtype=np.int32)
+        elif b'ImageJ' in S:
             tifType = 'ImageJ'
             dataType = 0