Changeset 3136 for trunk/imports/G2img_CBF.py

Timestamp:

Oct 23, 2017 11:39:16 AM (6 years ago)

Author:

vondreele

Message:

make GSAS-II python 3.6 compliant & preserve python 2.7 use;changes:
do from future import division, print_function for all GSAS-II py sources
all menu items revised to be py 2.7/3.6 compliant
all wx.OPEN --> wx.FD_OPEN in file dialogs
all integer divides (typically for image pixel math) made explicit with ; ambiguous ones made floats as appropriate
all print "stuff" --> print (stuff)
all print >> pFile,'stuff' --> pFile.writeCIFtemplate('stuff')
all read file opens made explicit 'r' or 'rb'
all cPickle imports made for py2.7 or 3.6 as cPickle or _pickle; test for '2' platform.version_tuple[0] for py 2.7
define cPickleload to select load(fp) or load(fp,encoding='latin-1') for loading gpx files; provides cross compatibility between py 2.7/3.6 gpx files
make dict.keys() as explicit list(dict.keys()) as needed (NB: possible source of remaining py3.6 bugs)
make zip(a,b) as explicit list(zip(a,b)) as needed (NB: possible source of remaining py3.6 bugs)
select unichr/chr according test for '2' platform.version_tuple[0] for py 2.7 (G2pwdGUI * G2plot) for special characters
select wg.EVT_GRID_CELL_CHANGE (classic) or wg.EVT_GRID_CELL_CHANGED (phoenix) in grid Bind
maxint --> maxsize; used in random number stuff
raise Exception,"stuff" --> raise Exception("stuff")
wx 'classic' sizer.DeleteWindows?() or 'phoenix' sizer.Clear(True)
wx 'classic' SetToolTipString?(text) or 'phoenix' SetToolTip?(wx.ToolTip?(text)); define SetToolTipString?(self,text) to handle the choice in plots
status.SetFields? --> status.SetStatusText?
'classic' AddSimpleTool? or 'phoenix' self.AddTool? for plot toolbar; Bind different as well
define GetItemPydata? as it doesn't exist in wx 'phoenix'
allow python versions 2.7 & 3.6 to run GSAS-II
Bind override commented out - no logging capability (NB: remove all logging code?)
all import ContentsValidator? open filename & test if valid then close; filepointer removed from Reader
binary importers (mostly images) test for 'byte' type & convert as needed to satisfy py 3.6 str/byte rules

File:

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

trunk/imports/G2img_CBF.py

@@ -13 +13 @@
 '''
 
+from __future__ import division, print_function
 import time
 import GSASIIobj as G2obj
@@ -30 +31 @@
             )
 
-    def ContentsValidator(self, filepointer):        
+    def ContentsValidator(self, filename):        
         '''no test used at this time
         '''
         return True
         
-    def Reader(self,filename,filepointer, ParentFrame=None, **unused):
+    def Reader(self,filename, ParentFrame=None, **unused):
         '''Read using Bob's routine :func:`GetCbfData`
         '''
@@ -49 +50 @@
     import numpy as np
     if GSASIIpath.GetConfigValue('debug'):
-        print 'Read cif binary detector data cbf file: ',filename
+        print ('Read cif binary detector data cbf file: '+filename)
     File = open(filename,'rb')
     sizexy = [0,0]
@@ -58 +59 @@
     byteOrd = '<'
     stream = File.read()
-    File.close()
+    if 'bytes' in str(type(stream)):
+        stream = stream.decode('latin-1')
     starter = '\x0c\x1a\x04\xd5'
     imageBeg = stream.find(starter)+4
@@ -97 +99 @@
     image = cbf.unpack_cbf(nimg,compImage,nxy,image)
     image = np.reshape(image,(sizexy[1],sizexy[0]))
-    print 'import time:',time.time()-time0
+    print ('import time: %.3f'%(time.time()-time0))
     data = {'pixelSize':pixSize,'wavelength':wave,'distance':dist,'center':cent,'size':sizexy}
     Npix = sizexy[0]*sizexy[1]