Changeset 1376
- Timestamp:
- Jun 10, 2014 12:15:43 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIIO.py
r1364 r1376 976 976 Azms.append((azms[i+1]+azm)/2.) 977 977 for i,azm in enumerate(azms[:-1]): 978 name +=" Azm= %.2f"%(Azms[i])978 Aname = name+" Azm= %.2f"%(Azms[i]) 979 979 item, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root) 980 980 nOcc = 0 981 981 while item: 982 982 Name = G2frame.PatternTree.GetItemText(item) 983 if name in Name:983 if Aname in Name: 984 984 nOcc += 1 985 985 item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie) 986 986 if nOcc: 987 name += '(%d)'%(nOcc)987 Aname += '(%d)'%(nOcc) 988 988 Sample = G2pdG.SetDefaultSample() 989 989 Sample['Gonio. radius'] = data['distance'] … … 991 991 Sample['Chi'] = data['GonioAngles'][1] 992 992 Sample['Phi'] = data['GonioAngles'][2] 993 if 'PWDR' in name:993 if 'PWDR' in Aname: 994 994 parms = ['PXC',data['wavelength'],0.0,0.99,1.0,-0.10,0.4,0.30,1.0,0.0001,Azms[i]] #set polarization for synchrotron radiation! 995 elif 'SASD' in name:995 elif 'SASD' in Aname: 996 996 Sample['Trans'] = data['SampleAbs'][0] 997 997 parms = ['LXC',data['wavelength'],0.0,Azms[i]] 998 998 Y = G2frame.Integrate[0][i] 999 999 W = np.where(Y>0.,1./Y,1.e-6) #probably not true 1000 Id = G2frame.PatternTree.AppendItem(parent=G2frame.root,text= name)1000 Id = G2frame.PatternTree.AppendItem(parent=G2frame.root,text=Aname) 1001 1001 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Comments'),Comments) 1002 1002 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Limits'),[tuple(Xminmax),Xminmax]) 1003 if 'PWDR' in name:1003 if 'PWDR' in Aname: 1004 1004 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Background'),[['chebyschev',1,3,1.0,0.0,0.0], 1005 1005 {'nDebye':0,'debyeTerms':[],'nPeaks':0,'peaksList':[]}]) … … 1008 1008 inst[0][item] = list(inst[0][item]) 1009 1009 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Instrument Parameters'),inst) 1010 if 'PWDR' in name:1010 if 'PWDR' in Aname: 1011 1011 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Sample Parameters'),Sample) 1012 1012 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Peak List'),[]) … … 1014 1014 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Unit Cells List'),[]) 1015 1015 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Reflection Lists'),{}) 1016 elif 'SASD' in name:1016 elif 'SASD' in Aname: 1017 1017 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Substances'),G2pdG.SetDefaultSubstances()) 1018 1018 G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Sample Parameters'),Sample) -
trunk/GSASIIimgGUI.py
r1375 r1376 290 290 S = File.readline() 291 291 data.update(save) 292 G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy( Data))292 G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data)) 293 293 UpdateImageControls(G2frame,data,masks) 294 294 G2plt.PlotExposedImage(G2frame,event=event)
Note: See TracChangeset
for help on using the changeset viewer.