Changeset 3141 for trunk/imports/G2img_CBF.py

Timestamp:

Oct 26, 2017 1:59:53 PM (6 years ago)

Author:

vondreele

Message:

fix bug in AutoIntegrate? (for py 2.7)
remove a debug print in tif importer
work on cbf image importer - ok for py 2.7 not 3.6

File:

• trunk/imports/G2img_CBF.py (modified) (1 diff)

trunk/imports/G2img_CBF.py

@@ -91 +91 @@
             Npix = int(fields[1])
     nxy = sizexy[0]*sizexy[1]
+    cent = [cent[0]*pixSize[0]/1000.,cent[1]*pixSize[1]/1000.]
+    File.seek(0)
+    img = File.read()[imageBeg:imageBeg+compImageSize]
+    nimg = len(img)
+    if 'bytes' in str(type(img)):
+        img = np.array(img,dtype='a')
     image = np.zeros(nxy,dtype=np.int32)
-    cent = [cent[0]*pixSize[0]/1000.,cent[1]*pixSize[1]/1000.]
-    compImage = stream[imageBeg:imageBeg+compImageSize]
+    time0 = time.time()
 #    GSASIIpath.IPyBreak()
-    time0 = time.time()
-    nimg = len(compImage)
-    image = cbf.unpack_cbf(nimg,compImage,nxy,image)
+    image = cbf.unpack_cbf(nimg,img,nxy,image)
     image = np.reshape(image,(sizexy[1],sizexy[0]))
     print ('import time: %.3f'%(time.time()-time0))