Changeset 1273
- Timestamp:
- Apr 7, 2014 1:23:59 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
GSASIIplot.py (modified) (2 diffs)
-
GSASIIpwdGUI.py (modified) (8 diffs)
-
GSASIIsasd.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r1272 r1273 1415 1415 ################################################################################ 1416 1416 1417 def PlotSASDSizeDist(G2frame ,Rbins=[],Dist=[]):1417 def PlotSASDSizeDist(G2frame): 1418 1418 1419 1419 def OnPageChanged(event): … … 1422 1422 PlotPatterns(G2frame,plotType='SASD',newPlot=True) 1423 1423 elif 'Size' in PlotText: 1424 PlotSASDSizeDist(G2frame ,Rbins,Dist)1424 PlotSASDSizeDist(G2frame) 1425 1425 1426 1426 def OnMotion(event): -
trunk/GSASIIpwdGUI.py
r1269 r1273 2854 2854 2855 2855 ffChoices = {'Sphere':{},'Spheroid':{'Aspect ratio':[1.0,False]}, 2856 'Cylinder':{'Length':[100.,False]},'Cylinder D':{'Diameter':[100.,False]},2857 'Cylinder AR':{'Aspect ratio':[1.0,False]},'UniSphere':{},2858 'Uni Rod':{'Length':[100.,False]},'UniRodAR':{'Aspect ratio':[1.0,False]},2859 'Uni Disk':{'Thickness':[100.,False]},2860 'Uni Tube':{'Length':[100.,False],'Thickness':[10.,False]},}2856 'Cylinder':{'Length':[100.,False]},'Cylinder diam':{'Diameter':[100.,False]}, 2857 'Cylinder AR':{'Aspect ratio':[1.0,False]},'Unified sphere':{}, 2858 'Unified rod':{'Length':[100.,False]},'Unified rod AR':{'Aspect ratio':[1.0,False]}, 2859 'Unified disk':{'Thickness':[100.,False]}, 2860 'Unified tube':{'Length':[100.,False],'Thickness':[10.,False]},} 2861 2861 2862 def RefreshPlots( Rbins=[],Dist=[]):2862 def RefreshPlots(): 2863 2863 PlotText = G2frame.G2plotNB.nb.GetPageText(G2frame.G2plotNB.nb.GetSelection()) 2864 2864 if 'Powder' in PlotText: 2865 2865 G2plt.PlotPatterns(G2frame,plotType='SASD',newPlot=True) 2866 2866 elif 'Size' in PlotText: 2867 G2plt.PlotSASDSizeDist(G2frame ,Rbins,Dist)2867 G2plt.PlotSASDSizeDist(G2frame) 2868 2868 2869 2869 def OnValue(event): … … 2880 2880 sldrObj.SetRange(1000.*(np.log10(value)-2),1000.*(np.log10(value)+2)) 2881 2881 sldrObj.SetValue(1000.*np.log10(value)) 2882 Rbins,Dist =G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)2883 RefreshPlots( Rbins,Dist)2882 G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data) 2883 RefreshPlots() 2884 2884 2885 2885 def OnSelect(event): … … 2890 2890 if 'FormFact' in key: 2891 2891 item['FFargs'] = ffChoices[Obj.GetValue()] 2892 G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data) 2893 RefreshPlots() 2892 2894 wx.CallAfter(UpdateModelsGrid,G2frame,data) 2893 Rbins,Dist = G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)2894 RefreshPlots(Rbins,Dist)2895 2895 2896 2896 def OnDelLevel(event): … … 2899 2899 del data['Particle']['Levels'][item] 2900 2900 wx.CallAfter(UpdateModelsGrid,G2frame,data) 2901 Rbins,Dist =G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)2902 RefreshPlots( Rbins,Dist)2901 G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data) 2902 RefreshPlots() 2903 2903 2904 2904 def OnParmSlider(event): … … 2907 2907 item[key] = 10.**float(Obj.GetValue()/1000.) 2908 2908 pvObj.SetValue('%.3g'%(item[key])) 2909 Rbins,Dist =G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)2910 RefreshPlots( Rbins,Dist)2909 G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data) 2910 RefreshPlots() 2911 2911 2912 2912 def SizeSizer(): … … 2994 2994 FFargs = level['Controls']['FFargs'] 2995 2995 for iparm,parm in enumerate(list(Parms)): 2996 parmVar = wx.CheckBox(G2frame.dataDisplay,label='Refine? '+parm)2996 parmVar = wx.CheckBox(G2frame.dataDisplay,label='Refine? Dist '+parm) 2997 2997 parmVar.SetValue(Parms[parm][1]) 2998 2998 parmVar.Bind(wx.EVT_CHECKBOX, OnSelect) … … 3015 3015 parmSizer.Add(parmSldr,1,wx.EXPAND) 3016 3016 for parm in list(FFargs): 3017 parmVar = wx.CheckBox(G2frame.dataDisplay,label='Refine? '+parm)3017 parmVar = wx.CheckBox(G2frame.dataDisplay,label='Refine? FF '+parm) 3018 3018 parmVar.SetValue(FFargs[parm][1]) 3019 3019 Indx[parmVar.GetId()] = [FFargs[parm],1] … … 3031 3031 parmSldr = wx.Slider(G2frame.dataDisplay,minValue=1000.*valMinMax[0], 3032 3032 maxValue=1000.*valMinMax[1],value=1000.*value) 3033 Indx[parmVar.GetId()] = [ Parms[parm],parm]3034 Indx[parmValue.GetId()] = [ Parms[parm],0,parmSldr]3033 Indx[parmVar.GetId()] = [FFargs[parm],parm] 3034 Indx[parmValue.GetId()] = [FFargs[parm],0,parmSldr] 3035 3035 Indx[parmSldr.GetId()] = [FFargs[parm],0,parmValue] 3036 3036 parmSldr.Bind(wx.EVT_SLIDER,OnParmSlider) -
trunk/GSASIIsasd.py
r1272 r1273 167 167 ''' 168 168 AR = args[0] 169 return UniRodFF(Q,R,args=[ AR*R,])169 return UniRodFF(Q,R,args=[2.*AR*R,]) 170 170 171 171 def UniDiskFF(Q,R,args): … … 313 313 returns float: volume (A^3) of tube wall 314 314 ''' 315 L,T = arg [:2]315 L,T = args[:2] 316 316 return CylinderVol(R,[L,])-CylinderVol(R-T,[L,]) 317 317 … … 868 868 'Cylinder AR':[CylinderARFF,CylinderARVol],'Unified sphere':[UniSphereFF,UniSphereVol], 869 869 'Unified rod':[UniRodFF,UniRodVol],'Unified rod AR':[UniRodARFF,UniRodARVol], 870 'Unified disk':[UniDiskFF,UniDiskVol]} 870 'Unified disk':[UniDiskFF,UniDiskVol],'Sphere':[SphereFF,SphereVol], 871 'Cylinder diam':[CylinderDFF,CylinderDVol]} 871 872 Shape = data['Size']['Shape'][0] 872 873 Parms = data['Size']['Shape'][1:] … … 933 934 'Cylinder AR':[CylinderARFF,CylinderARVol],'Unified sphere':[UniSphereFF,UniSphereVol], 934 935 'Unified rod':[UniRodFF,UniRodVol],'Unified rod AR':[UniRodARFF,UniRodARVol], 935 'Unified disk':[UniDiskFF,UniDiskVol],'Sphere':[SphereFF,SphereVol]} 936 'Unified disk':[UniDiskFF,UniDiskVol],'Sphere':[SphereFF,SphereVol], 937 'Unified tube':[UniTubeFF,UniTubeVol],'Cylinder diam':[CylinderDFF,CylinderDVol]} 936 938 # pdb.set_trace() 937 939 partData = sasdData['Particle'] … … 970 972 Dist.append(dist) 971 973 sasdData['Size Calc'] = [Rbins,Dist] 972 return Rbins,Dist973 974 974 975 def MakeDiamDist(DistName,nPoints,cutoff,parmDict):
Note: See TracChangeset
for help on using the changeset viewer.
