Changeset 226

Timestamp:

Jan 6, 2011 4:29:27 PM (13 years ago)

Author:

vondreele

Message:

can read APS Gold tif files

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (2 diffs)

trunk/GSASII.py

@@ -751 +751 @@
                             Comments.append("%10.3f %s" % (scale,' * '+name))
                             size,imagefile = data
-                            image = G2IO.GetImageData(imagefile,imageOnly=True)
+                            image = G2IO.GetImageData(self,imagefile,imageOnly=True)
                             if First:
                                 newImage = np.zeros_like(image)

trunk/GSASIIIO.py

@@ -623 +623 @@
         finalSize = origSize
     if Ityp == 0:
-        tifType = 'Pilatus'
-        pixy = (172*sizeScale,172*sizeScale)
-        pos = 4096
-        if not imageOnly:
-            print 'Read Pilatus tiff file: ',filename
+        print finalSize
+        if finalSize == 1207975936:
+            finalSize = origSize = 1536
+            sizeScale = 1
+            tifType = 'Gold'
+            pixy = (150,150)
+            pos = 64
+            if not imageOnly:
+                print 'Read Gold tiff file:',filename
+        else:
+            tifType = 'Pilatus'
+            pixy = (172*sizeScale,172*sizeScale)
+            pos = 4096
+            if not imageOnly:
+                print 'Read Pilatus tiff file: ',filename
     elif Ityp == 1:
         tifType = 'PE'
@@ -653 +663 @@
                 line = ar.array('l',File.read(4*finalSize))
             pos += 4*finalSize
-        elif 'MAR' in tifType:
+        elif 'MAR' in tifType or 'Gold' in tifType:
             line = ar.array('H',File.read(2*finalSize))
             pos += 2*finalSize