Changeset 2461 for trunk/imports/G2img_GE.py

Timestamp:

Sep 8, 2016 9:09:47 AM (9 years ago)

Author:

vondreele

Message:

magnetic space group determination done

File:

• trunk/imports/G2img_GE.py (modified) (4 diffs)

trunk/imports/G2img_GE.py ¶

@@ -125 +125 @@
         sizexy = [2048,2048]
         Npix = sizexy[0]*sizexy[1]
-        image = np.array(ar.array('f',File.read(4*Npix)),dtype=np.int32)
+        image = np.array(np.frombuffer(File.read(4*Npix),dtype=np.float32),dtype=np.int32)
+#        image = np.array(ar.array('f',File.read(4*Npix)),dtype=np.int32)
     elif filename.split('.')[-1] in ['avg','cor']:
         File.seek(0,2)
@@ -134 +135 @@
         sizexy = [2048,2048]
         Npix = sizexy[0]*sizexy[1]
-        image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+        image = np.array(np.frombuffer(File.read(2*Npix),dtype=np.int16),dtype=np.int32)
+#        image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
     else:
         head = ['GE detector raw data',]
@@ -153 +155 @@
         pos = 8192 + (imagenum-1)*2*Npix
         File.seek(pos)
-        image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+        image = np.array(np.frombuffer(File.read(2*Npix),dtype=np.int16),dtype=np.int32)
+#        image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
         if len(image) != sizexy[1]*sizexy[0]:
             print('not enough images while reading GE file: '+filename+'image #'+str(imagenum))
@@ -162 +165 @@
             while nframes > 1: #OK, this will sum the frames.
                 try:
-                    image += np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
+                    image += np.array(np.frombuffer(File.read(2*Npix),dtype=np.int16),dtype=np.int32)
+#                    image += np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
                 except ValueError:
                     break