Changeset 1156 for trunk/GSASIIIO.py

Timestamp:

Nov 27, 2013 10:01:41 AM (9 years ago)

Author:

vondreele

Message:

Read 32-bit CHESS tiff files?

File:

• trunk/GSASIIIO.py (modified) (3 diffs)

trunk/GSASIIIO.py

@@ -244 +244 @@
     if dType == 'UnsignedShort':        
         image = np.array(ar.array('H',File.read(imSize)),dtype=np.int32)
+    elif dType == 'UnsignedInt':
+        image = np.array(ar.array('L',File.read(imSize)),dtype=np.int32)        
     image = np.reshape(image,(sizexy[1],sizexy[0]))
     data = {'pixelSize':pixSize,'wavelength':wave,'distance':dist,'center':cent,'size':sizexy}
@@ -455 +457 @@
             Value = st.unpack(byteOrd+nVal*'f',File.read(nVal*4))
         IFD[Tag] = [Type,nVal,Value]
-        #print Tag,IFD[Tag]
+        print Tag,IFD[Tag]
     sizexy = [IFD[256][2][0],IFD[257][2][0]]
     [nx,ny] = sizexy
@@ -501 +503 @@
                     print 'Read GE-detector tiff file: ',filename
                 image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+            elif IFD[258][2][0] == 32:
+                print sizexy
+                tifType = 'CHESS'
+                pixy = (200,200)
+                File.seek(8)
+                if not imageOnly:
+                    print 'Read CHESS-detector tiff file: ',filename
+                image = np.array(ar.array('L',File.read(4*Npix)),dtype=np.int32)
             
     elif 262 in IFD and IFD[262][2][0] > 4: