Changeset 246 for trunk/GSASIIIO.py

Timestamp:

Feb 13, 2011 6:20:15 PM (14 years ago)

Author:

vondreele

Message:

fix copy controls for images - needed deepcopy
multi frame GE detector images now automatically summed when read.
also earlier commit - image calibration will compute a "suggested" new wavelength - not imposed however as it may be wrong.

File:

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

trunk/GSASIIIO.py ¶

@@ -467 +467 @@
     
 def GetGEsumData(filename,imageOnly=False):
+    import struct as st
     import array as ar
     if not imageOnly:
@@ -479 +480 @@
     else:
         head = ['GE detector raw data from APS 1-ID',]
+        File.seek(18)
+        size,nframes = st.unpack('<ih',File.read(6))
         sizexy = [2048,2048]
         pos = 8192
@@ -489 +492 @@
     else:
         image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+        while nframes > 1:
+            image += np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+            nframes -= 1
     image = np.reshape(image,(sizexy[1],sizexy[0]))
     data = {'pixelSize':(200,200),'wavelength':0.15,'distance':250.0,'center':[204.8,204.8],'size':sizexy}