Changeset 5113
 Timestamp:
 Dec 16, 2021 2:18:39 PM (22 months ago)
 Location:
 trunk
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIpwd.py
r5112 r5113 812 812 on highenergy side 20 are used 813 813 814 :param pos: peak position; energy in keV 814 :param pos: peak position; energy in keV (not used) 815 815 :param sig: Gaussian peak variance in keV^2 816 816 … … 829 829 extended by exponential coeff. 830 830 831 param pos: peak position; TOF in musec 831 param pos: peak position; TOF in musec (not used) 832 832 param alp,bet: TOF peak exponential rise & decay parameters 833 833 param sig: Gaussian peak variance in musec^2 
trunk/GSASIIpwdGUI.py
r5112 r5113 3060 3060 parmSizer = wx.FlexGridSizer(0,2,5,0) 3061 3061 for key,lbl,nDig in parms: 3062 if 'E' in Inst['Type'][0] and key in ['DisplaceX','DisplaceY','Absorption']: 3063 continue 3062 3064 labelLst.append(lbl.strip().strip(':').strip()) 3063 3065 dspLst.append(nDig) … … 7032 7034 return 7033 7035 powId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,data['Sample']['Name']) 7034 limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,powId,'Limits'))[1] 7036 limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,powId,'Limits')) 7037 Xlimits = [limits[1][0],limits[0][1]] #use lower limit but ignore upper limit 7035 7038 inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,powId,'Instrument Parameters'))[0] 7036 auxPlot = G2pwd.CalcPDF(data,inst, limits,xydata)7039 auxPlot = G2pwd.CalcPDF(data,inst,Xlimits,xydata) 7037 7040 data['I(Q)'] = xydata['IofQ'] 7038 7041 data['S(Q)'] = xydata['SofQ'] … … 7053 7056 powName = data['Sample']['Name'] 7054 7057 powId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,powName) 7055 limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,powId,'Limits'))[1] 7058 limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,powId,'Limits')) 7059 Xlimits = [limits[1][0],limits[0][1]] #use lower limit but ignore upper limit 7056 7060 inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,powId,'Instrument Parameters'))[0] 7057 res = G2pwd.OptimizePDF(data,xydata, limits,inst,showFit,maxCycles)7061 res = G2pwd.OptimizePDF(data,xydata,Xlimits,inst,showFit,maxCycles) 7058 7062 return res['success'] 7059 7063
Note: See TracChangeset
for help on using the changeset viewer.