Changeset 3146

Timestamp:

Nov 1, 2017 9:05:28 AM (5 years ago)

Author:

vondreele

Message:

add time to G2img_MAR.py, fix open bug in G2pwd_fxye.py

Location:

trunk/imports

Files:

• G2img_MAR.py (modified) (3 diffs)
• G2pwd_fxye.py (modified) (1 diff)

trunk/imports/G2img_MAR.py

@@ -14 +14 @@
 from __future__ import division, print_function
 import platform
-import sys
-import struct as st
+import time
 import GSASIIobj as G2obj
 import GSASIIpath
@@ -90 +89 @@
     File.seek(pos)
     image = np.zeros(shape=(sizex,sizey),dtype=np.int32)    
+    time0 = time.time()
     if '2' in platform.python_version_tuple()[0]:
         raw = File.read()
@@ -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))
     File.close()
     if imageOnly:

trunk/imports/G2pwd_fxye.py

@@ -271 +271 @@
         title = ''
         comments = None
-        fp = open(filename,'r')
+        fp = open(filename,'Ur')        #needs the 'U' to maintain py 2.7 compatibility
         # reload previously saved values - used for multibank reads
         if self.repeat and rdbuffer is not None: