Changeset 2438

Timestamp:

Aug 19, 2016 12:29:28 PM (5 years ago)

Author:

vondreele

Message:

new CBF importer with fortran routine to decode image - much, much faster

File:

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

trunk/imports/G2img_CBF.py

@@ -18 +18 @@
 import GSASIIIO as G2IO
 import GSASIIpath
+import unpack_cbf as cbf
 GSASIIpath.SetVersionNumber("$Revision: 2133 $")
 class CBF_ReaderClass(G2IO.ImportImage):
@@ -27 +28 @@
             extensionlist=('.cbf',),
             strictExtension=True,
-            formatName = 'CBF image (Slow!)',
+            formatName = 'CBF image',
             longFormatName = 'CIF Binary Data Format image file (NB: Slow!)'
             )
@@ -137 +138 @@
 #    GSASIIpath.IPyBreak()
     time0 = time.time()
-    image = np.hstack(analyse(compImage)).cumsum()
+    nxy = sizexy[0]*sizexy[1]
+    nimg = len(compImage)
+    image = np.zeros(nxy)
+    image = cbf.unpack_cbf(nimg,compImage,nxy,image)
     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]
     
-    filename = os.path.splitext(filename)[0]+'.G2img'
-    File = open(filename,'wb')
-    cPickle.dump([head,data,Npix,image],File,1)
-    File.close()
-    self.sumfile = filename
-    self.formatName = 'GSAS-II image'
     return head,data,Npix,image