Changeset 2773

Timestamp:

Apr 5, 2017 8:21:48 AM (6 years ago)

Author:

vondreele

Message:

avoid DetDep? missing error from old gpx files
speedups in image importers

Location:

trunk

Files:

• GSASIIimage.py (modified) (1 diff)
• imports/G2img_1TIF.py (modified) (3 diffs)
• imports/G2img_GE.py (modified) (6 diffs)

trunk/GSASIIimage.py

@@ -380 +380 @@
     x0 = dist*tand(tilt)
     phi = data['rotation']
-    dep = data['DetDepth']
+    dep = data.get('DetDepth',0.)
     azmthoff = data['azmthOff']
     dx = np.array(x-cent[0],dtype=np.float32)

trunk/imports/G2img_1TIF.py

@@ -208 +208 @@
                 File.seek(8)
                 print 'Read GE-detector tiff file: ',filename
-                image = np.fromfile(File,dtype=np.int16,count=2*Npix)[:Npix]
+                image = np.array(np.frombuffer(File.read(2*Npix),dtype=np.int16),dtype=np.int32)
+#                image = np.fromfile(File,dtype=np.int16,count=2*Npix)[:Npix]
 #                image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
             elif IFD[258][2][0] == 32:
@@ -251 +252 @@
                 print 'Read APS PE-detector tiff file: ',filename
                 if dataType == 5:
-                    image = np.fromfile(File,dtype=np.float32,count=4*Npix)[:Npix]
+                    image = np.array(np.frombuffer(File.read(4*Npix),dtype=np.float32),dtype=np.int32)  #fastest
+#                    image = np.fromfile(File,dtype=np.float32,count=4*Npix)[:Npix]
 #                    image = np.array(ar.array('f',File.read(4*Npix)),dtype=np.int32)
                 else:
@@ -272 +274 @@
             File.seek(4096)
             print 'Read MAR CCD tiff file: ',filename
-            image = np.fromfile(File,dtype=np.int16,count=2*Npix)[:Npix]
+            image = np.array(np.frombuffer(File.read(2*Npix),dtype=np.uint16),dtype=np.int32)
+#            image = np.fromfile(File,dtype=np.int16,count=2*Npix)[:Npix]
 #            image = np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
         elif IFD[273][2][0] == 512:

trunk/imports/G2img_GE.py

@@ -117 +117 @@
     import struct as st
     import cPickle
+    import time
     more = False
+    time0 = time.time()
     File = open(filename,'rb')
     if filename.split('.')[-1] in ['sum',]:
@@ -124 +126 @@
         Npix = sizexy[0]*sizexy[1]
         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 @@
         Npix = sizexy[0]*sizexy[1]
         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',]
@@ -154 +154 @@
         File.seek(pos)
         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))
@@ -164 +163 @@
                 try:
                     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
@@ -183 +181 @@
     data = {'pixelSize':[200,200],'wavelength':0.15,'distance':250.0,'center':[204.8,204.8],'size':sizexy}
     File.close()
+    print 'Image read time %.2fs'%(time.time()-time0)
     if GSASIIpath.GetConfigValue('debug'):
         print 'Read GE file: '+filename+' image #'+'%04d'%(imagenum)