Changeset 3144 for trunk/imports/G2img_CBF.py

Timestamp:

Oct 30, 2017 3:39:15 PM (5 years ago)

Author:

vondreele

Message:

fix MAR345 & CBF importers to work for python 3.6 as well as python 2.7; revised importers & new fortran decompression routines for py3.

File:

• trunk/imports/G2img_CBF.py (modified) (3 diffs)

trunk/imports/G2img_CBF.py

@@ -17 +17 @@
 import GSASIIobj as G2obj
 import GSASIIpath
+import struct as st
+import numpy as np
 import unpack_cbf as cbf
 GSASIIpath.SetVersionNumber("$Revision: 2133 $")
@@ -48 +50 @@
     'Read cif binarydetector data cbf file'
     
-    import numpy as np
     if GSASIIpath.GetConfigValue('debug'):
         print ('Read cif binary detector data cbf file: '+filename)
@@ -95 +96 @@
     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)
     time0 = time.time()
-#    GSASIIpath.IPyBreak()
-    image = cbf.unpack_cbf(nimg,img,nxy,image)
+    if 'bytes' in str(type(img)):
+        img = np.frombuffer(img,dtype=np.uint8)
+        image = cbf.unpack_cbf3(nimg,img,nxy,image)
+    else:
+        image = cbf.unpack_cbf(nimg,img,nxy,image)
     image = np.reshape(image,(sizexy[1],sizexy[0]))
     print ('import time: %.3f'%(time.time()-time0))