Changeset 2905 for branch/2frame/GSASIIphsGUI.py
- Timestamp:
- Jul 4, 2017 12:11:29 PM (6 years ago)
- File:
-
- 1 edited
-
branch/2frame/GSASIIphsGUI.py (modified) (32 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branch/2frame/GSASIIphsGUI.py
r2900 r2905 1087 1087 for reflName in reflNames: 1088 1088 if 'PWDR' in reflName: 1089 PatternId = G2gd.Get PatternTreeItemId(G2frame,G2frame.root, reflName)1090 reflSets = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))1089 PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root, reflName) 1090 reflSets = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Reflection Lists')) 1091 1091 reflData = reflSets[phaseName] 1092 1092 elif 'HKLF' in reflName: 1093 PatternId = G2gd.Get PatternTreeItemId(G2frame,G2frame.root, reflName)1094 reflData = G2frame. PatternTree.GetItemPyData(PatternId)[1]1093 PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root, reflName) 1094 reflData = G2frame.GPXtree.GetItemPyData(PatternId)[1] 1095 1095 if 'Type' not in reflData: 1096 1096 reflData['Type'] = 'SXC' … … 1282 1282 G2frame.G2plotNB.Rename(oldName,generalData['Name']) 1283 1283 G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Phase Data for '+generalData['Name']) 1284 G2frame. PatternTree.SetItemText(Item,generalData['Name'])1284 G2frame.GPXtree.SetItemText(Item,generalData['Name']) 1285 1285 # change phase name key in Reflection Lists for each histogram 1286 1286 for hist in data['Histograms']: 1287 ht = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,hist)1288 rt = G2gd.Get PatternTreeItemId(G2frame,ht,'Reflection Lists')1287 ht = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,hist) 1288 rt = G2gd.GetGPXtreeItemId(G2frame,ht,'Reflection Lists') 1289 1289 if not rt: continue 1290 RfList = G2frame. PatternTree.GetItemPyData(rt)1290 RfList = G2frame.GPXtree.GetItemPyData(rt) 1291 1291 if oldName not in RfList: 1292 1292 print('Warning: '+oldName+' not in Reflection List for '+ … … 2371 2371 UseList[hist]['HStrain'] = [NDij*[0.0,],NDij*[False,]] 2372 2372 newPhase['General']['Map'] = mapDefault.copy() 2373 sub = G2frame. PatternTree.AppendItem(parent=2374 G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Phases'),text=phaseName)2375 G2frame. PatternTree.SetItemPyData(sub,newPhase)2373 sub = G2frame.GPXtree.AppendItem(parent= 2374 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Phases'),text=phaseName) 2375 G2frame.GPXtree.SetItemPyData(sub,newPhase) 2376 2376 newPhase['Drawing'] = [] 2377 2377 … … 2379 2379 G2frame.GetUsedHistogramsAndPhasesfromTree() 2380 2380 G2cnstG.MagConstraints(G2frame,data,newPhase,Trans,Vec,atCodes) #data is old phase 2381 G2frame. PatternTree.SelectItem(sub)2381 G2frame.GPXtree.SelectItem(sub) 2382 2382 2383 2383 ################################################################################ … … 3489 3489 if 'pId' in data: 3490 3490 DisAglData['pId'] = data['pId'] 3491 DisAglData['covData'] = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.root, 'Covariance'))3491 DisAglData['covData'] = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.root, 'Covariance')) 3492 3492 try: 3493 3493 if fp: … … 3544 3544 Histograms,Phases = G2frame.GetUsedHistogramsAndPhasesfromTree() # init for constraint 3545 3545 # make a lookup table for constraints 3546 sub = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Constraints')3547 Constraints = G2frame. PatternTree.GetItemPyData(sub)3546 sub = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Constraints') 3547 Constraints = G2frame.GPXtree.GetItemPyData(sub) 3548 3548 constDict = {} 3549 3549 for item in Constraints: … … 4443 4443 return 4444 4444 dlg.Destroy() 4445 G2frame.PatternId = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,HistName)4446 sample = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(4445 G2frame.PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,HistName) 4446 sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId( 4447 4447 G2frame,G2frame.PatternId, 'Sample Parameters')) 4448 4448 scale = sample['Scale'][0] 4449 background = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(4449 background = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId( 4450 4450 G2frame,G2frame.PatternId, 'Background')) 4451 limits = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(4451 limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId( 4452 4452 G2frame,G2frame.PatternId, 'Limits'))[1] 4453 inst = G2frame. PatternTree.GetItemPyData(4454 G2gd.Get PatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0]4453 inst = G2frame.GPXtree.GetItemPyData( 4454 G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0] 4455 4455 if 'T' in inst['Type'][0]: 4456 4456 wx.MessageBox("Can't simulate neutron TOF patterns yet",caption='Data error',style=wx.ICON_EXCLAMATION) 4457 4457 return 4458 profile = G2frame. PatternTree.GetItemPyData(G2frame.PatternId)[1]4458 profile = G2frame.GPXtree.GetItemPyData(G2frame.PatternId)[1] 4459 4459 G2pwd.CalcStackingPWDR(data['Layers'],scale,background,limits,inst,profile,debug) 4460 4460 if debug: … … 4533 4533 return 4534 4534 dlg.Destroy() 4535 G2frame.PatternId = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,HistName)4536 sample = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(4535 G2frame.PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,HistName) 4536 sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId( 4537 4537 G2frame,G2frame.PatternId, 'Sample Parameters')) 4538 4538 scale = sample['Scale'][0] 4539 background = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(4539 background = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId( 4540 4540 G2frame,G2frame.PatternId, 'Background')) 4541 limits = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(4541 limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId( 4542 4542 G2frame,G2frame.PatternId, 'Limits'))[1] 4543 inst = G2frame. PatternTree.GetItemPyData(4544 G2gd.Get PatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0]4543 inst = G2frame.GPXtree.GetItemPyData( 4544 G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0] 4545 4545 if 'T' in inst['Type'][0]: 4546 4546 wx.MessageBox("Can't simulate neutron TOF patterns yet",caption='Data error',style=wx.ICON_EXCLAMATION) 4547 4547 return 4548 profile = np.copy(G2frame. PatternTree.GetItemPyData(G2frame.PatternId)[1])4548 profile = np.copy(G2frame.GPXtree.GetItemPyData(G2frame.PatternId)[1]) 4549 4549 resultXY2 = [] 4550 4550 resultXY = [np.vstack((profile[0],profile[1])),] #observed data … … 4898 4898 def OnRestraint(event): 4899 4899 indx = drawAtoms.GetSelectedRows() 4900 restData = G2frame. PatternTree.GetItemPyData(4901 G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Restraints'))4900 restData = G2frame.GPXtree.GetItemPyData( 4901 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Restraints')) 4902 4902 drawingData = data['Drawing'] 4903 4903 generalData = data['General'] … … 4947 4947 print '**** ERROR wrong number of atoms selected for this restraint' 4948 4948 return 4949 G2frame. PatternTree.SetItemPyData(4950 G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Restraints'),restData)4949 G2frame.GPXtree.SetItemPyData( 4950 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Restraints'),restData) 4951 4951 4952 4952 def OnDefineRB(event): 4953 4953 indx = drawAtoms.GetSelectedRows() 4954 4954 indx.sort() 4955 RBData = G2frame. PatternTree.GetItemPyData(4956 G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Rigid bodies'))4955 RBData = G2frame.GPXtree.GetItemPyData( 4956 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Rigid bodies')) 4957 4957 drawingData = data['Drawing'] 4958 4958 generalData = data['General'] … … 5689 5689 if 'pId' in data: 5690 5690 DATData['pId'] = data['pId'] 5691 DATData['covData'] = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.root, 'Covariance'))5691 DATData['covData'] = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.root, 'Covariance')) 5692 5692 G2stMn.DisAglTor(DATData) 5693 5693 … … 6482 6482 keyList = data['Histograms'].keys() 6483 6483 TextList = [] 6484 if not G2frame. PatternTree.GetCount():6484 if not G2frame.GPXtree.GetCount(): 6485 6485 return 6486 6486 6487 item, cookie = G2frame. PatternTree.GetFirstChild(G2frame.root)6487 item, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root) 6488 6488 while item: 6489 name = G2frame. PatternTree.GetItemText(item)6489 name = G2frame.GPXtree.GetItemText(item) 6490 6490 if name not in keyList and 'HKLF' in name: 6491 6491 TextList.append(name) 6492 item, cookie = G2frame. PatternTree.GetNextChild(G2frame.root, cookie)6492 item, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie) 6493 6493 if not TextList: 6494 6494 G2G.G2MessageBox(G2frame.dataFrame,'No reflections') … … 6526 6526 for i in result: 6527 6527 histoName = TextList[i] 6528 Id = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,histoName)6529 refDict,reflData = G2frame. PatternTree.GetItemPyData(Id)6528 Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,histoName) 6529 refDict,reflData = G2frame.GPXtree.GetItemPyData(Id) 6530 6530 data['Histograms'][histoName] = {'Histogram':histoName,'Show':False,'Scale':[1.0,True], 6531 6531 'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]}, … … 6566 6566 # def UpdateHKLFdata(histoName): 6567 6567 # generalData = data['General'] 6568 # Id = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,histoName)6569 # refDict,reflData = G2frame. PatternTree.GetItemPyData(Id)6568 # Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,histoName) 6569 # refDict,reflData = G2frame.GPXtree.GetItemPyData(Id) 6570 6570 # SGData = generalData['SGData'] 6571 6571 # Cell = generalData['Cell'][1:7] … … 6585 6585 def UpdateHKLFdata(histoName): 6586 6586 generalData = data['General'] 6587 Id = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,histoName)6588 refDict,reflData = G2frame. PatternTree.GetItemPyData(Id)6587 Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,histoName) 6588 refDict,reflData = G2frame.GPXtree.GetItemPyData(Id) 6589 6589 SGData = generalData['SGData'] 6590 6590 Cell = generalData['Cell'][1:7] … … 6739 6739 keyList = data['Histograms'].keys() 6740 6740 TextList = [] 6741 if G2frame. PatternTree.GetCount():6742 item, cookie = G2frame. PatternTree.GetFirstChild(G2frame.root)6741 if G2frame.GPXtree.GetCount(): 6742 item, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root) 6743 6743 while item: 6744 name = G2frame. PatternTree.GetItemText(item)6744 name = G2frame.GPXtree.GetItemText(item) 6745 6745 if name not in keyList and 'PWDR' in name: 6746 6746 TextList.append(name) 6747 item, cookie = G2frame. PatternTree.GetNextChild(G2frame.root, cookie)6747 item, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie) 6748 6748 if not TextList: 6749 6749 G2G.G2MessageBox(G2frame.dataFrame,'No histograms') … … 6758 6758 newList = TextList[1:] 6759 6759 for histoName in newList: 6760 Id = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,histoName)6760 Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,histoName) 6761 6761 data['Histograms'][histoName] = {'Histogram':histoName,'Show':False,'LeBail':False,'newLeBail':True, 6762 6762 'Scale':[1.0,False],'Pref.Ori.':['MD',1.0,False,[0,0,1],0,{},['',],0.1], … … 6767 6767 'HStrain':[NDij*[0.0,],NDij*[False,]], 6768 6768 'Extinction':[0.0,False],'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]}} 6769 refList = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Reflection Lists'))6769 refList = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id,'Reflection Lists')) 6770 6770 refList[generalData['Name']] = {} 6771 6771 wx.CallAfter(G2ddG.UpdateDData,G2frame,DData,data) … … 7103 7103 AtLookUp = G2mth.FillAtomLookUp(data['Atoms'],cia+8) 7104 7104 Amat,Bmat = G2lat.cell2AB(general['Cell'][1:7]) 7105 Id = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Rigid bodies')7105 Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Rigid bodies') 7106 7106 if not Id: 7107 7107 return 7108 RBData = G2frame. PatternTree.GetItemPyData(Id)7108 RBData = G2frame.GPXtree.GetItemPyData(Id) 7109 7109 Indx = {} 7110 7110 atomStyle = 'balls & sticks' … … 7180 7180 7181 7181 G2frame.GetStatusBar().SetStatusText('') 7182 RBData = G2frame. PatternTree.GetItemPyData(7183 G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Rigid bodies'))7182 RBData = G2frame.GPXtree.GetItemPyData( 7183 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Rigid bodies')) 7184 7184 rbNames = {} 7185 7185 for rbVec in RBData['Vector']: … … 7479 7479 7480 7480 def OnAutoFindResRB(event): 7481 RBData = G2frame. PatternTree.GetItemPyData(7482 G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Rigid bodies'))7481 RBData = G2frame.GPXtree.GetItemPyData( 7482 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Rigid bodies')) 7483 7483 rbKeys = RBData['Residue'].keys() 7484 7484 rbKeys.remove('AtInfo') … … 7567 7567 data['RBModels']['Residue'] = [] 7568 7568 data['RBModels']['Vector'] = [] 7569 RBData = G2frame. PatternTree.GetItemPyData(7570 G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Rigid bodies'))7569 RBData = G2frame.GPXtree.GetItemPyData( 7570 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Rigid bodies')) 7571 7571 for RBType in ['Vector','Residue']: 7572 7572 for rbId in RBData[RBType]: … … 7999 7999 general = data['General'] 8000 8000 Amat,Bmat = G2lat.cell2AB(general['Cell'][1:7]) 8001 Id = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Rigid bodies')8001 Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Rigid bodies') 8002 8002 if not Id: 8003 8003 return 8004 RBData = G2frame. PatternTree.GetItemPyData(Id)8004 RBData = G2frame.GPXtree.GetItemPyData(Id) 8005 8005 Indx = {} 8006 8006 # atomStyle = 'balls & sticks' … … 8082 8082 covData = {} 8083 8083 if 'PWDR' in reflName: 8084 PatternId = G2gd.Get PatternTreeItemId(G2frame,G2frame.root, reflName)8085 reflSets = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))8084 PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root, reflName) 8085 reflSets = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Reflection Lists')) 8086 8086 try: #patch for old reflection data 8087 8087 reflData = reflSets[phaseName]['RefList'] … … 8090 8090 reflType = 'PWDR' 8091 8091 elif 'HKLF' in reflName: 8092 PatternId = G2gd.Get PatternTreeItemId(G2frame,G2frame.root, reflName)8092 PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root, reflName) 8093 8093 try: 8094 reflData = G2frame. PatternTree.GetItemPyData(PatternId)[1]['RefList']8094 reflData = G2frame.GPXtree.GetItemPyData(PatternId)[1]['RefList'] 8095 8095 except TypeError: 8096 reflData = G2frame. PatternTree.GetItemPyData(PatternId)[1]8096 reflData = G2frame.GPXtree.GetItemPyData(PatternId)[1] 8097 8097 reflType = 'HKLF' 8098 8098 elif reflName == 'Pawley reflections': 8099 8099 reflData = data['Pawley ref'] 8100 covData = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.root, 'Covariance'))8100 covData = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.root, 'Covariance')) 8101 8101 reflType = 'Pawley' 8102 8102 else: … … 8105 8105 print 'MC/SA run:' 8106 8106 print 'Reflection type:',reflType,' Total No. reflections: ',len(reflData) 8107 RBdata = G2frame. PatternTree.GetItemPyData(8108 G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Rigid bodies'))8107 RBdata = G2frame.GPXtree.GetItemPyData( 8108 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Rigid bodies')) 8109 8109 MCSAmodels = MCSAdata['Models'] 8110 8110 if not len(MCSAmodels): … … 8164 8164 8165 8165 def OnMCSAaddRB(event): 8166 rbData = G2frame. PatternTree.GetItemPyData(8167 G2gd.Get PatternTreeItemId(G2frame,G2frame.root,'Rigid bodies'))8166 rbData = G2frame.GPXtree.GetItemPyData( 8167 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Rigid bodies')) 8168 8168 rbNames = {} 8169 8169 for rbVec in rbData['Vector']: … … 8363 8363 for hist in histograms: 8364 8364 if 'PWDR' in hist[:4]: 8365 Id = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,hist)8366 inst = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(8365 Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,hist) 8366 inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId( 8367 8367 G2frame,Id, 'Instrument Parameters'))[0] 8368 limits = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Limits'))8368 limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id, 'Limits')) 8369 8369 Tmin = G2lat.Dsp2pos(inst,dmin) 8370 8370 if 'T' in inst['Type'][0]: … … 8419 8419 G2frame.ErrorDialog('Pawley estimate','No histograms defined for this phase') 8420 8420 return 8421 PatternId = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,HistoNames[0]) #only use 1st histogram8422 xdata = G2frame. PatternTree.GetItemPyData(PatternId)[1]8423 Inst = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Instrument Parameters'))[0]8424 Sample = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Sample Parameters'))8421 PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,HistoNames[0]) #only use 1st histogram 8422 xdata = G2frame.GPXtree.GetItemPyData(PatternId)[1] 8423 Inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Instrument Parameters'))[0] 8424 Sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Sample Parameters')) 8425 8425 wave = G2mth.getWave(Inst) 8426 8426 const = 9.e-2/(np.pi*Sample['Gonio. radius']) #shifts in microns … … 8469 8469 return 8470 8470 HistoNames = Histograms.keys() 8471 PatternId = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,HistoNames[0])8472 refData = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame, \8471 PatternId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,HistoNames[0]) 8472 refData = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame, \ 8473 8473 PatternId,'Reflection Lists'))[PhaseName]['RefList'] 8474 8474 im = 0 … … 8890 8890 it = 0 8891 8891 histNames.append(name) 8892 Id = G2gd.Get PatternTreeItemId(G2frame,G2frame.root,name)8893 Inst = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Instrument Parameters'))8894 Sample = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Sample Parameters'))8892 Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,name) 8893 Inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id,'Instrument Parameters')) 8894 Sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id,'Sample Parameters')) 8895 8895 Gangls[name] = copy.copy([Sample[item] for item in['Phi','Chi','Omega','Azimuth']]) 8896 RefDict = G2frame. PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Reflection Lists'))[phaseName]8896 RefDict = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,Id,'Reflection Lists'))[phaseName] 8897 8897 Refs = RefDict['RefList'].T #np.array! 8898 8898 if RefDict['Super']: im = 1 #(3+1) offset for m … … 9156 9156 global rbAtmDict 9157 9157 rbAtmDict = {} 9158 PhaseName = G2frame. PatternTree.GetItemText(Item)9158 PhaseName = G2frame.GPXtree.GetItemText(Item) 9159 9159 G2gd.SetDataMenuBar(G2frame) 9160 9160 G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Phase Data for '+PhaseName)
Note: See TracChangeset
for help on using the changeset viewer.
