Changeset 944

Timestamp:

Jun 5, 2013 4:13:00 PM (9 years ago)

Author:

vondreele

Message:

fix l/r u/d issues in some images (MAR mostly)

File:

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

trunk/GSASIIIO.py

@@ -379 +379 @@
     File.close()
     image = np.zeros(shape=(size,size),dtype=np.int32)
-    image = pf.pack_f(len(raw),raw,size,image)
+    image = np.flipud(pf.pack_f(len(raw),raw,size,image).T)  #transpose to get it right way around & flip
     if imageOnly:
-        return image.T              #transpose to get it right way around
+        return image
     else:
-        return head,data,Npix,image.T
+        return head,data,Npix,image
 
 def GetTifData(filename,imageOnly=False):
@@ -444 +444 @@
         if not imageOnly:
             print 'Read MAR CCD tiff file: ',filename
-        marFrame = rmf.marFrame(File,byteOrd,IFD)
-        image = np.array(np.asarray(marFrame.image),dtype=np.int32)
-        tifType = marFrame.filetitle
-        pixy = (marFrame.pixelsizeX/1000.0,marFrame.pixelsizeY/1000.0)
-        head = marFrame.outputHead()
+        marFrame = rmf.marFrame(File,byteOrd,IFD)
+        image = np.flipud(np.array(np.asarray(marFrame.image),dtype=np.int32))
+        tifType = marFrame.filetitle
+        pixy = (marFrame.pixelsizeX/1000.0,marFrame.pixelsizeY/1000.0)
+        head = marFrame.outputHead()
     elif 272 in IFD:
         ifd = IFD[272]