Changeset 1273 for trunk/GSASIIpwdGUI.py

Timestamp:

Apr 7, 2014 1:23:59 PM (9 years ago)

Author:

vondreele

Message:

clean up SASD Model plotting
clean up form factor functions

File:

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

trunk/GSASIIpwdGUI.py

@@ -2854 +2854 @@
         
         ffChoices = {'Sphere':{},'Spheroid':{'Aspect ratio':[1.0,False]},
-            'Cylinder':{'Length':[100.,False]},'CylinderD':{'Diameter':[100.,False]},
-            'CylinderAR':{'Aspect ratio':[1.0,False]},'UniSphere':{},
-            'UniRod':{'Length':[100.,False]},'UniRodAR':{'Aspect ratio':[1.0,False]},
-            'UniDisk':{'Thickness':[100.,False]},
-            'UniTube':{'Length':[100.,False],'Thickness':[10.,False]},}
+            'Cylinder':{'Length':[100.,False]},'Cylinder diam':{'Diameter':[100.,False]},
+            'Cylinder AR':{'Aspect ratio':[1.0,False]},'Unified sphere':{},
+            'Unified rod':{'Length':[100.,False]},'Unified rod AR':{'Aspect ratio':[1.0,False]},
+            'Unified disk':{'Thickness':[100.,False]},
+            'Unified tube':{'Length':[100.,False],'Thickness':[10.,False]},}
                 
-        def RefreshPlots(Rbins=[],Dist=[]):
+        def RefreshPlots():
             PlotText = G2frame.G2plotNB.nb.GetPageText(G2frame.G2plotNB.nb.GetSelection())
             if 'Powder' in PlotText:
                 G2plt.PlotPatterns(G2frame,plotType='SASD',newPlot=True)
             elif 'Size' in PlotText:
-                G2plt.PlotSASDSizeDist(G2frame,Rbins,Dist)
+                G2plt.PlotSASDSizeDist(G2frame)
                 
         def OnValue(event):
@@ -2880 +2880 @@
             sldrObj.SetRange(1000.*(np.log10(value)-2),1000.*(np.log10(value)+2))
             sldrObj.SetValue(1000.*np.log10(value))
-            Rbins,Dist = G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)
-            RefreshPlots(Rbins,Dist)
+            G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)
+            RefreshPlots()
             
         def OnSelect(event):
@@ -2890 +2890 @@
                 if 'FormFact' in key:
                     item['FFargs'] = ffChoices[Obj.GetValue()]
+                G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)
+                RefreshPlots()
                 wx.CallAfter(UpdateModelsGrid,G2frame,data)
-                Rbins,Dist = G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)
-                RefreshPlots(Rbins,Dist)
             
         def OnDelLevel(event):
@@ -2899 +2899 @@
             del data['Particle']['Levels'][item]
             wx.CallAfter(UpdateModelsGrid,G2frame,data)
-            Rbins,Dist = G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)
-            RefreshPlots(Rbins,Dist)
+            G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)
+            RefreshPlots()
             
         def OnParmSlider(event):
@@ -2907 +2907 @@
             item[key] = 10.**float(Obj.GetValue()/1000.)
             pvObj.SetValue('%.3g'%(item[key]))
-            Rbins,Dist = G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)
-            RefreshPlots(Rbins,Dist)
+            G2sasd.ModelFxn(Profile,ProfDict,Limits,Substances,Sample,data)
+            RefreshPlots()
             
         def SizeSizer():
@@ -2994 +2994 @@
             FFargs = level['Controls']['FFargs']
             for iparm,parm in enumerate(list(Parms)):
-                parmVar = wx.CheckBox(G2frame.dataDisplay,label='Refine? '+parm) 
+                parmVar = wx.CheckBox(G2frame.dataDisplay,label='Refine? Dist '+parm) 
                 parmVar.SetValue(Parms[parm][1])
                 parmVar.Bind(wx.EVT_CHECKBOX, OnSelect)
@@ -3015 +3015 @@
                 parmSizer.Add(parmSldr,1,wx.EXPAND)
             for parm in list(FFargs):
-                parmVar = wx.CheckBox(G2frame.dataDisplay,label='Refine? '+parm) 
+                parmVar = wx.CheckBox(G2frame.dataDisplay,label='Refine? FF '+parm) 
                 parmVar.SetValue(FFargs[parm][1])
                 Indx[parmVar.GetId()] = [FFargs[parm],1]
@@ -3031 +3031 @@
                 parmSldr = wx.Slider(G2frame.dataDisplay,minValue=1000.*valMinMax[0],
                     maxValue=1000.*valMinMax[1],value=1000.*value)
-                Indx[parmVar.GetId()] = [Parms[parm],parm]
-                Indx[parmValue.GetId()] = [Parms[parm],0,parmSldr]
+                Indx[parmVar.GetId()] = [FFargs[parm],parm]
+                Indx[parmValue.GetId()] = [FFargs[parm],0,parmSldr]
                 Indx[parmSldr.GetId()] = [FFargs[parm],0,parmValue]
                 parmSldr.Bind(wx.EVT_SLIDER,OnParmSlider)