Changeset 2995

Timestamp:

Aug 11, 2017 9:11:21 AM (6 years ago)

Author:

toby

Message:

fix potential unicode errors in GSASIIdtaGUI; addition parameter definition

Location:

branch/2frame

Files:

• GSASIIdataGUI.py (modified) (33 diffs)
• GSASIIobj.py (modified) (1 diff)

branch/2frame/GSASIIdataGUI.py

@@ -286 +286 @@
                 return
             except:
-                print "Install of '+package+' failed. Please report this information:"
+                print u"Install of '+package+u' failed. Please report this information:"
                 import traceback
                 print traceback.format_exc()
@@ -582 +582 @@
     def PreviewFile(self,filename,fp):
         'confirm we have the right file'
-        rdmsg = 'File '+ filename +' begins:\n\n'
+        rdmsg = u'File '+ filename +u' begins:\n\n'
         try:
             rdmsg += fp.read(80)
@@ -589 +589 @@
             rdmsg = None
         if rdmsg is None or not all([ord(c) < 128 and ord(c) != 0 for c in rdmsg]): # show only if ASCII
-            rdmsg = 'File '+ filename +' is a binary file. Do you want to read this file?'
+            rdmsg = u'File '+ filename +u' is a binary file. Do you want to read this file?'
         # it would be better to use something that
         # would resize better, but this will do for now
@@ -822 +822 @@
             else:
                 if singlereader:
-                    print('The '+ rd.formatName+' reader was not able to read file '+filename+msg)
+                    print(u'The '+ rd.formatName+u' reader was not able to read file '+filename+msg)
                     try:
-                        print('\n\nError message(s):\n\t'+errorReport)
+                        print(u'\n\nError message(s):\n\t'+errorReport)
                     except:
                         pass
@@ -847 +847 @@
         for reader in self.ImportPhaseReaderlist:
             item = submenu.Append(wx.ID_ANY,help=reader.longFormatName,
-                kind=wx.ITEM_NORMAL,text='from '+reader.formatName+' file')
+                kind=wx.ITEM_NORMAL,text=u'from '+reader.formatName+u' file')
             self.ImportMenuId[item.GetId()] = reader
             self.Bind(wx.EVT_MENU, self.OnImportPhase, id=item.GetId())
@@ -1026 +1026 @@
         for reader in self.ImportImageReaderlist:
             item = submenu.Append(wx.ID_ANY,help=reader.longFormatName,
-                kind=wx.ITEM_NORMAL,text='from '+reader.formatName+' file')
+                kind=wx.ITEM_NORMAL,text=u'from '+reader.formatName+u' file')
             self.ImportMenuId[item.GetId()] = reader
             self.Bind(wx.EVT_MENU, self.OnImportImage, id=item.GetId())
@@ -1059 +1059 @@
         for reader in self.ImportSfactReaderlist:
             item = submenu.Append(wx.ID_ANY,help=reader.longFormatName,                
-                kind=wx.ITEM_NORMAL,text='from '+reader.formatName+' file')
+                kind=wx.ITEM_NORMAL,text=u'from '+reader.formatName+u' file')
             self.ImportMenuId[item.GetId()] = reader
             self.Bind(wx.EVT_MENU, self.OnImportSfact, id=item.GetId())
@@ -1109 +1109 @@
                     valuesdict = {'wtFactor':1.0,'Dummy':False,'ranId':ran.randint(0,sys.maxint),}
                     HistName = G2obj.MakeUniqueLabel(HistName,HKLFlist)
-                    print 'Read structure factor table '+HistName+' from file '+self.lastimport
+                    print u'Read structure factor table '+HistName+u' from file '+self.lastimport
                     Id = self.GPXtree.AppendItem(parent=self.root,text=HistName)
                     if not Bank['RefDict'].get('FF'):
@@ -1122 +1122 @@
                 valuesdict = {'wtFactor':1.0,'Dummy':False,'ranId':ran.randint(0,sys.maxint),}
                 HistName = G2obj.MakeUniqueLabel(HistName,HKLFlist)
-                print 'Read structure factor table '+HistName+' from file '+self.lastimport
+                print u'Read structure factor table '+HistName+u' from file '+self.lastimport
                 if not rd.RefDict.get('FF'):
                     rd.RefDict['FF'] = {}
@@ -1209 +1209 @@
         for reader in self.ImportPowderReaderlist:
             item = submenu.Append(wx.ID_ANY,help=reader.longFormatName,
-                kind=wx.ITEM_NORMAL,text='from '+reader.formatName+' file')
+                kind=wx.ITEM_NORMAL,text=u'from '+reader.formatName+u' file')
             self.ImportMenuId[item.GetId()] = reader
             self.Bind(wx.EVT_MENU, self.OnImportPowder, id=item.GetId())
@@ -1366 +1366 @@
             bank = 1 + G2IO.BlockSelector(
                 choices, self,
-                title='Select an instrument parameter bank for '+
-                os.path.split(rd.powderentry[0])[1]+' BANK '+str(bank)+
-                '\nOr use Cancel to select from the default parameter sets',
+                title=u'Select an instrument parameter bank for '+
+                os.path.split(rd.powderentry[0])[1]+u' BANK '+str(bank)+
+                u'\nOr use Cancel to select from the default parameter sets',
                 header='Block Selector')
         if bank is None: return {}
@@ -1515 +1515 @@
                     return GetDefaultParms(self,rd)
             else:
-                self.ErrorDialog('Open Error',u'Error opening instrument parameter file '   \
-                    +'{} requested by file '.format(instfile,filename))
+                self.ErrorDialog('Open Error',u'Error opening instrument parameter file '
+                    +u'{} requested by file '.format(instfile,filename))
         #Finally - ask user for Instrument parametrs file - seems it can't be in a zip file
         while True: # loop until we get a file that works or we get a cancel
@@ -1523 +1523 @@
             if not pth: pth = '.'
             dlg = wx.FileDialog(self,
-                'Choose inst. param file for "'+rd.idstring+'" (or Cancel for default)',
+                u'Choose inst. param file for "'+rd.idstring+u'" (or Cancel for default)',
                 pth, '',
                 'GSAS iparm file (*.prm,*.inst,*.ins)|*.prm;*.inst;*.ins|'
@@ -1964 +1964 @@
         for reader in self.ImportSmallAngleReaderlist:
             item = submenu.Append(wx.ID_ANY,help=reader.longFormatName,
-                kind=wx.ITEM_NORMAL,text='from '+reader.formatName+' file')
+                kind=wx.ITEM_NORMAL,text=u'from '+reader.formatName+u' file')
             self.ImportMenuId[item.GetId()] = reader
             self.Bind(wx.EVT_MENU, self.OnImportSmallAngle, id=item.GetId())
@@ -2079 +2079 @@
         for reader in self.ImportReflectometryReaderlist:
             item = submenu.Append(wx.ID_ANY,help=reader.longFormatName,
-                kind=wx.ITEM_NORMAL,text='from '+reader.formatName+' file')
+                kind=wx.ITEM_NORMAL,text=u'from '+reader.formatName+u' file')
             self.ImportMenuId[item.GetId()] = reader
             self.Bind(wx.EVT_MENU, self.OnImportReflectometry, id=item.GetId())
@@ -2196 +2196 @@
         for reader in self.ImportPDFReaderlist:
             item = submenu.Append(wx.ID_ANY,help=reader.longFormatName,
-                kind=wx.ITEM_NORMAL,text='from '+reader.formatName+' file')
+                kind=wx.ITEM_NORMAL,text=u'from '+reader.formatName+u' file')
             self.ImportMenuId[item.GetId()] = reader
             self.Bind(wx.EVT_MENU, self.OnImportPDF, id=item.GetId())
@@ -2318 +2318 @@
             defnam = os.path.splitext(
                 os.path.split(self.GSASprojectfile)[1]
-                )[0]+'.gcmd'
+                )[0]+u'.gcmd'
             dlg = wx.FileDialog(self,
                 'Choose an file to save past actions', '.', defnam, 
@@ -2328 +2328 @@
                     filename = dlg.GetPath()
                     # make sure extension is correct
-                    filename = os.path.splitext(filename)[0]+'.gcmd'
+                    filename = os.path.splitext(filename)[0]+u'.gcmd'
                 else:
                     filename = None
@@ -2349 +2349 @@
             defnam = os.path.splitext(
                 os.path.split(self.GSASprojectfile)[1]
-                )[0]+'.gcmd'
+                )[0]+u'.gcmd'
             dlg = wx.FileDialog(self,
                 'Choose an file to read saved actions', '.', defnam, 
@@ -2359 +2359 @@
                     filename = dlg.GetPath()
                     # make sure extension is correct
-                    filename = os.path.splitext(filename)[0]+'.gcmd'
+                    filename = os.path.splitext(filename)[0]+u'.gcmd'
                 else:
                     filename = None
@@ -2771 +2771 @@
         arg = sys.argv
         if len(arg) > 1 and arg[1]:
-            self.GSASprojectfile = os.path.splitext(arg[1])[0]+'.gpx'
+            self.GSASprojectfile = os.path.splitext(arg[1])[0]+u'.gpx'
             self.dirname = os.path.abspath(os.path.dirname(arg[1]))
             if self.dirname: os.chdir(self.dirname)
@@ -3166 +3166 @@
                     if lenX:
                         if lenX != len(x):
-                            self.ErrorDialog('Data length error','Data to be summed must have same number of points'+ \
-                                '\nExpected:'+str(lenX)+ \
+                            self.ErrorDialog('Data length error','Data to be summed must have same number of points'+
+                                '\nExpected:'+str(lenX)+
                                 '\nFound:   '+str(len(x))+'\nfor '+name)
                             self.OnCancel(event)
@@ -3174 +3174 @@
                     if Xminmax[1]:
                         if Xminmax != [x[0],x[-1]]:
-                            self.ErrorDialog('Data range error','Data to be summed must span same range'+ \
-                                '\nExpected:'+str(Xminmax[0])+' '+str(Xminmax[1])+ \
+                            self.ErrorDialog('Data range error','Data to be summed must span same range'+
+                                '\nExpected:'+str(Xminmax[0])+' '+str(Xminmax[1])+
                                 '\nFound:   '+str(x[0])+' '+str(x[-1])+'\nfor '+name)
                             self.OnCancel(event)
@@ -3528 +3528 @@
                     TextList.remove('PWDR'+pdfName[4:])
                 except ValueError:
-                    print 'PWDR'+pdfName[4:]+' for '+pdfName+' not found'
+                    print u'PWDR'+pdfName[4:]+u' for '+pdfName+u' not found'
             dlg = G2G.G2MultiChoiceDialog(self, 'Which data to delete?', 'Delete data', TextList, wx.CHOICEDLG_STYLE)
             try:
@@ -3613 +3613 @@
             GetGPX()
         else:
-            self.GSASprojectfile = os.path.splitext(filename)[0]+'.gpx'
+            self.GSASprojectfile = os.path.splitext(filename)[0]+u'.gpx'
             self.dirname = os.path.split(filename)[0]
 
@@ -4153 +4153 @@
                             Histograms[hist]['hId'] = hId
                         else: # would happen if a referenced histogram were renamed or deleted
-                            print('For phase "'+phase+
-                                  '" unresolved reference to histogram "'+hist+'"')
+                            print(u'For phase "'+phase+
+                                  u'" unresolved reference to histogram "'+hist+u'"')
         #G2obj.IndexAllIds(Histograms=Histograms,Phases=Phases)
         G2obj.IndexAllIds(Histograms=Histograms,Phases=phaseData)
@@ -4293 +4293 @@
             lamMax = Msg.get('lamMax',0.001)
             lst = os.path.splitext(os.path.abspath(self.GSASprojectfile))[0]
-            text = u'Detailed results are in '+lst+'.lst\n\nLoad new result?'
+            text = u'Detailed results are in ' + lst + u'.lst\n\nLoad new result?'
             if lamMax >= 10.:
                 text += '\nWARNING: Steepest descents dominates;'+   \
@@ -4390 +4390 @@
             return
         if warnmsg:
-            print('Conflict between refinment flag settings and constraints:\n'+
-                  warnmsg+'\nRefinement not possible')
+            print(u'Conflict between refinment flag settings and constraints:\n'+
+                  warnmsg+u'\nRefinement not possible')
             self.ErrorDialog('Refinement Flag Error',
-                             'Conflict between refinment flag settings and constraints:\n'+
-                             warnmsg+'\nRefinement not possible')
+                             u'Conflict between refinment flag settings and constraints:\n'+
+                             warnmsg+u'\nRefinement not possible')
             return
         self.GPXtree.SaveExposedItems()        
@@ -6033 +6033 @@
                 ave = ma.mean(ma.compressed(info))
                 sig = ma.std(ma.compressed(info))
-                print ' Average for '+G2frame.SeqTable.GetColLabelValue(col)+': '+'%.6g'%(ave)+' +/- '+'%.6g'%(sig)
+                print u' Average for '+G2frame.SeqTable.GetColLabelValue(col)+u': '+'%.6g'%(ave)+u' +/- '+u'%.6g'%(sig)
         else:
             G2frame.ErrorDialog('Select columns',
@@ -6540 +6540 @@
             obj.UpdateVariedVars(varyList,values)
             ind = '      '
-            print('  '+obj.GetDepVar()+' = '+obj.expression)
+            print(u'  '+obj.GetDepVar()+u' = '+obj.expression)
             for var in obj.assgnVars:
-                print(ind+var+' = '+obj.assgnVars[var])
+                print(ind+var+u' = '+obj.assgnVars[var])
             for var in obj.freeVars:
                 avar = "::"+obj.freeVars[var][0]
                 val = obj.freeVars[var][1]
                 if obj.freeVars[var][2]:
-                    print(ind+var+' = '+avar + " = " + G2mth.ValEsd(val,esdDict[avar]))
+                    print(ind+var+u' = '+avar + " = " + G2mth.ValEsd(val,esdDict[avar]))
                 else:
-                    print(ind+var+' = '+avar + " =" + G2mth.ValEsd(val,0))
+                    print(ind+var+u' = '+avar + u" =" + G2mth.ValEsd(val,0))
         # create a plot for each parametric variable
         for fitnum,obj in enumerate(eqObjList):
@@ -7325 +7325 @@
             print 'nothing to merge for %s reflections'%(mergeRef.shape[0])
         HKLFlist = []
-        newName = Name+' '+Laue
+        newName = Name+u' '+Laue
         if G2frame.GPXtree.GetCount():
             item, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
@@ -7439 +7439 @@
                 if 'SS' in value:
                     mainSizer.Add((5,5),)
-                    mainSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' For incommensurate phase '+name+':'))
+                    mainSizer.Add(wx.StaticText(G2frame.dataWindow,-1,u' For incommensurate phase '+name+u':'))
                     for m,(Rf2,Rf,Nobs) in enumerate(zip(data[0][pfx+'Rf^2'],data[0][pfx+'Rf'],data[0][value])):
                         mainSizer.Add(wx.StaticText(G2frame.dataWindow,-1,
@@ -7446 +7446 @@
                 else:
                     mainSizer.Add((5,5),)
-                    mainSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' For phase '+name+':'))
+                    mainSizer.Add(wx.StaticText(G2frame.dataWindow,-1,u' For phase '+name+u':'))
                     mainSizer.Add(wx.StaticText(G2frame.dataWindow,-1,
                         u' Unweighted phase residuals RF\u00b2: %.3f%%, RF: %.3f%% on %d reflections  '% \

branch/2frame/GSASIIobj.py

@@ -1532 +1532 @@
         'int$': 'peak intensity',
         'WgtFrac':'phase weight fraction',
+        'C\([0-9]*,[0-9]*\)' : 'spherical harmonics preferred orientation coef.',
         }.items():
         VarDesc[key] = value