Changeset 2432

Timestamp:

Aug 18, 2016 4:36:19 PM (6 years ago)

Author:

vondreele

Message:

allow cbf file imports

File:

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

trunk/imports/G2img_CBF.py

@@ -15 +15 @@
 import sys
 import os
+import time
 import GSASIIIO as G2IO
 import GSASIIpath
@@ -50 +51 @@
     import cPickle
     
-#    def analyze(stream):
-#        listnpa = []
-#        key16 = "\x80"
-#        key32 = "\x00\x80"
-#        key64 = "\x00\x00\x00\x80"
-#        iBeg = True
-#        st64 = stream.split(key64)
-#        for iA,stA in enumerate(st64):
-#            st32 = stA.split(key32)
-#            for iB,stB in enumerate(st32):
-#                st16 = stB.split(key16)
-#                if not iB:
-#                    listnpa.append(np.fromstring(st16[0], dtype="int32"))
-#                else:
-#                    for iC,stC in enumerate(st16):
-#                        if not iC:
-#                            listnpa.append(np.fromstring(stC, dtype="int8"))
-#                        else:
-#                            listnpa.append(np.fromstring(stC, dtype="int16"))
-                    
-                
-            
-
     def analyse(stream):
         """
@@ -157 +135 @@
     cent = [cent[0]*pixSize[0]/1000.,cent[1]*pixSize[1]/1000.]
     compImage = stream[imageBeg:imageBeg+compImageSize]
-    GSASIIpath.IPyBreak()
+#    GSASIIpath.IPyBreak()
+    time0 = time.time()
     image = np.hstack(analyse(compImage)).cumsum()
     image = np.reshape(image,(sizexy[1],sizexy[0]))
+    print 'import time:',time.time()-time0
     data = {'pixelSize':pixSize,'wavelength':wave,'distance':dist,'center':cent,'size':sizexy}
     Npix = sizexy[0]*sizexy[1]