Changeset 4112

Timestamp:

Aug 26, 2019 7:27:07 AM (4 years ago)

Author:

vondreele

Message:

subject image read time messages to debug control

Location:

trunk/imports

Files:

• G2img_1TIF.py (modified) (1 diff)
• G2img_GE.py (modified) (1 diff)
• G2img_MAR.py (modified) (1 diff)

trunk/imports/G2img_1TIF.py

@@ -363 +363 @@
         lines = ['not a known detector tiff file',]
         return lines,0,0,0
-    G2fil.G2Print ('image read time: %.3f'%(time.time()-time0))
+    if GSASIIpath.GetConfigValue('debug'):
+        G2fil.G2Print ('image read time: %.3f'%(time.time()-time0))
     image = np.reshape(image,(sizexy[1],sizexy[0]))
     center = (not center[0]) and [pixy[0]*sizexy[0]/2000,pixy[1]*sizexy[1]/2000] or center

trunk/imports/G2img_GE.py

@@ -197 +197 @@
     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 ('Image read time %.2fs'%(time.time()-time0))
         print ('Read GE file: '+filename+' image #'+'%04d'%(imagenum))
     return head,data,Npix,image,more

trunk/imports/G2img_MAR.py

@@ -96 +96 @@
         raw = np.frombuffer(File.read(),dtype=np.uint8)
         image = np.flipud(pf.pack_f3(len(raw),raw,sizex,sizey,image).T)  #transpose to get it right way around & flip
-    print ('image read time: %.3f'%(time.time()-time0))
+    if GSASIIpath.GetConfigValue('debug'):
+        print ('image read time: %.3f'%(time.time()-time0))
     File.close()
     if imageOnly: