Changeset 4288

Timestamp:

Feb 5, 2020 5:00:20 AM (4 years ago)

Author:

vondreele

Message:

add import of Dectris Eiger 1M tif images

File:

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

trunk/imports/G2img_1TIF.py

@@ -68 +68 @@
         self.Comments,self.Data,self.Npix,self.Image = GetTifData(filename)
         if self.Npix == 0:
-            G2fil.G2Print("GetTifData failed to read "+str(filename)+" Trying SciPy")
-            import scipy.misc
-            self.Image = scipy.misc.imread(filename,flatten=True)
+            G2fil.G2Print("GetTifData failed to read "+str(filename)+" Trying PIL")
+#            import scipy.misc
+#            self.Image = scipy.misc.imread(filename,flatten=True)
+            import PIL.Image as PI
+            self.Image = PI.open(filename,mode='r')
+            
             # for scipy 1.2 & later  scipy.misc.imread will be removed
             # with note to use imageio.imread instead 
@@ -348 +351 @@
         dt = dt.newbyteorder(byteOrd)
         image = np.array(np.frombuffer(File.read(Npix*4),dtype=dt),dtype=np.int32)
+    elif sizexy == [3070,1102]:
+        G2fil.G2Print ('Read Dectris Eiger 1M tiff file: '+filename)
+        pixy = [75.,75.]
+        File.seek(8)
+        dt = np.dtype(np.float32)
+        dt = dt.newbyteorder(byteOrd)
+        image = np.array(np.frombuffer(File.read(Npix*4),dtype=np.uint32),dtype=np.int32)
 #    elif sizexy == [960,960]:
 #        tiftype = 'PE-BE'