Changeset 3848 for trunk/GSASIIpwdGUI.py

Timestamp:

Mar 9, 2019 2:58:21 PM (4 years ago)

Author:

vondreele

Message:

since id is a python routine which could be useful in debugging, replaced id with Id (or pid in one place)

File:

• trunk/GSASIIpwdGUI.py (modified) (17 diffs)

trunk/GSASIIpwdGUI.py

@@ -380 +380 @@
 def GetFileList(G2frame,fileType):
     fileList = []
-    id, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
-    while id:
-        name = G2frame.GPXtree.GetItemText(id)
+    Id, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
+    while Id:
+        name = G2frame.GPXtree.GetItemText(Id)
         if fileType in name.split()[0]:
             fileList.append(name)
-        id, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
+        Id, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
     return fileList
         
@@ -1645 +1645 @@
         excl.Add(wx.StaticText(G2frame.dataWindow,label=' To: '),0,WACV)
         excl.Add(wx.StaticText(G2frame.dataWindow,label=' Delete?: '),0,WACV)
-        for id,item in enumerate(data[2:]):
+        for Id,item in enumerate(data[2:]):
             for i in [0,1]:
                 excl.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,item,i,  \
                     min=data[0][0],max=data[0][1],nDig=(10,4),typeHint=float,OnLeave=AfterChange))
             delExcl = wx.CheckBox(G2frame.dataWindow,label='')
-            Indx[delExcl.GetId()] = id
+            Indx[delExcl.GetId()] = Id
             delExcl.Bind(wx.EVT_CHECKBOX,OnDelExcl)
             excl.Add(delExcl,0,WACV)
@@ -2627 +2627 @@
     def OnMaterial(event):
         Obj = event.GetEventObject()
-        id = Info[Obj.GetId()]
-        data['Materials'][id]['Name'] = Obj.GetValue()
+        Id = Info[Obj.GetId()]
+        data['Materials'][Id]['Name'] = Obj.GetValue()
         wx.CallAfter(UpdateSampleGrid,G2frame,data)
         
     def OnVolFrac(invalid,value,tc):
-        id = Info[tc.GetId()]
-        data['Materials'][not id][key] = 1.-value
+        Id = Info[tc.GetId()]
+        data['Materials'][not Id][key] = 1.-value
         wx.CallAfter(UpdateSampleGrid,G2frame,data)
 
@@ -2647 +2647 @@
         to a float.
         '''
-        id, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
-        while id:
-            name = G2frame.GPXtree.GetItemText(id)
+        Id, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
+        while Id:
+            name = G2frame.GPXtree.GetItemText(Id)
             if 'PWDR' in name:
-                Comments = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id,'Comments'))
-                Sample =   G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id, 'Sample Parameters'))
+                Comments = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id,'Comments'))
+                Sample =   G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id, 'Sample Parameters'))
                 for i,item in enumerate(Comments):
                     itemSp = item.split('=')
@@ -2661 +2661 @@
                             print('"{}" has an invalid value in Comments from {}'
                                   .format(item.strip(),name))
-            id, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
+            Id, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
         wx.CallLater(100,UpdateSampleGrid,G2frame,data)
         
@@ -2805 +2805 @@
         Substances = G2frame.GPXtree.GetItemPyData(
             G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Substances'))
-        for id,item in enumerate(data['Materials']):
+        for Id,item in enumerate(data['Materials']):
             subSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Material: '),0,WACV)
             matsel = wx.ComboBox(G2frame.dataWindow,value=item['Name'],choices=list(Substances['Substances'].keys()),
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
-            Info[matsel.GetId()] = id
+            Info[matsel.GetId()] = Id
             matsel.Bind(wx.EVT_COMBOBOX,OnMaterial)        
             subSizer.Add(matsel,0,WACV)
@@ -2822 +2822 @@
                 material = Substances['Substances']['vacuum']
             mu += item['VolFrac']*material.get('XAbsorption',0.)
-            rho[id] = material['Scatt density']
-            anomrho[id] = material.get('XAnom density',0.)
+            rho[Id] = material['Scatt density']
+            anomrho[Id] = material.get('XAnom density',0.)
         data['Contrast'] = [(rho[1]-rho[0])**2,(anomrho[1]-anomrho[0])**2]
         mainSizer.Add(subSizer,0)
@@ -6752 +6752 @@
             if newName:
                 data['delt-G(R)'] = copy.deepcopy(data['G(R)'])
-                id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,newName)
-                pId = G2gd.GetGPXtreeItemId(G2frame,id,'PDF Controls')
+                Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,newName)
+                pId = G2gd.GetGPXtreeItemId(G2frame,Id,'PDF Controls')
                 subData = G2frame.GPXtree.GetItemPyData(pId)['G(R)']
                 if subData[1][0][-1] != data['G(R)'][1][0][-1]:
@@ -6767 +6767 @@
         def OnMult(invalid,value,tc):
             if invalid: return
-            id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,data['diffGRname'])
-            pId = G2gd.GetGPXtreeItemId(G2frame,id,'PDF Controls')
+            Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,data['diffGRname'])
+            pId = G2gd.GetGPXtreeItemId(G2frame,Id,'PDF Controls')
             subData = G2frame.GPXtree.GetItemPyData(pId)['G(R)']
             data['delt-G(R)'][1] = np.array([subData[1][0],data['G(R)'][1][1]-data['diffMult']*subData[1][1]])
@@ -6810 +6810 @@
                 PDFlist = [TextList[i] for i in dlg.GetSelections()]
                 for item in PDFlist:
-                    id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,item)
-                    olddata = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id, 'PDF Controls'))
+                    Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,item)
+                    olddata = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id, 'PDF Controls'))
                     if od['value_1']:
                         olddata['Sample Bkg.']['Refine'] = data['Sample Bkg.']['Refine']    #only one flag
@@ -6820 +6820 @@
                         olddata.update(copy.deepcopy(data))
                         olddata['Sample'] = sample
-                    G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id, 'PDF Controls'),olddata)
+                    G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id, 'PDF Controls'),olddata)
                 G2frame.GetStatusBar().SetStatusText('PDF controls copied',1)
         finally:
@@ -6921 +6921 @@
         choices = []
         if G2frame.GPXtree.GetCount():
-            id, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
-            while id:
-                Name = G2frame.GPXtree.GetItemText(id)
+            Id, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
+            while Id:
+                Name = G2frame.GPXtree.GetItemText(Id)
                 if Name.startswith('PDF '):
-                    Data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id,'PDF Controls'))
+                    Data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id,'PDF Controls'))
                     if not Data['ElList']:
                         print('  No chemical formula for {}'.format(Name))
                     else:
                         choices.append(Name)
-                id, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
+                Id, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
         if not choices:
             print('  No PDFs to compute\n')
@@ -6951 +6951 @@
             style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)
         notConverged = 0
-        id, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
+        Id, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
         N = 0
         try:
-            while id:
-                Name = G2frame.GPXtree.GetItemText(id)
+            while Id:
+                Name = G2frame.GPXtree.GetItemText(Id)
                 if Name in Names:
                     N += 1
@@ -6962 +6962 @@
                         pgbar.Destroy()
                         break
-                    pId = G2gd.GetGPXtreeItemId(G2frame,id,'PDF Controls')
+                    pId = G2gd.GetGPXtreeItemId(G2frame,Id,'PDF Controls')
                     Data = G2frame.GPXtree.GetItemPyData(pId)
                     print('  Computing {}'.format(Name))
@@ -6970 +6970 @@
                     computePDF(G2frame,Data)
                     G2frame.GPXtree.SetItemPyData(pId,Data)
-                id, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
+                Id, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
         finally:
             pgbar.Destroy()
@@ -7156 +7156 @@
                 PDFlist = [TextList[i] for i in dlg.GetSelections()]
                 for item in PDFlist:
-                    id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,item)
-                    olddata = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id, 'PDF Peaks'))
+                    Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,item)
+                    olddata = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id, 'PDF Peaks'))
                     if od['value_1']:
                         olddata['Background'][2] = peaks['Background'][2]
@@ -7164 +7164 @@
                     else:
                         olddata.update(copy.deepcopy(peaks))
-                    G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id, 'PDF Peaks'),olddata)
+                    G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id, 'PDF Peaks'),olddata)
                 G2frame.GetStatusBar().SetStatusText('PDF peaks copied',1)
         finally: