Changeset 1233

Timestamp:

Mar 3, 2014 9:16:53 AM (8 years ago)

Author:

vondreele

Message:

replace wx.Align_CENTER_VERTICAL with WACV in G2pwdGUI & G2phsGUI
start on SASD modelling

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (68 diffs)
• GSASIIpwdGUI.py (modified) (43 diffs)
• GSASIIsasd.py (modified) (1 diff)

trunk/GSASIIphsGUI.py

@@ -56 +56 @@
 WHITE = wx.Colour(255,255,255)
 BLACK = wx.Colour(0,0,0)
+WACV = wx.ALIGN_CENTER_VERTICAL
 mapDefault = {'MapType':'','RefList':'','Resolution':0.5,'Show bonds':True,
                 'rho':[],'rhoMax':0.,'mapSize':10.0,'cutOff':50.,'Flip':False}
@@ -257 +258 @@
                 
             nameSizer = wx.BoxSizer(wx.HORIZONTAL)
-            nameSizer.Add(wx.StaticText(General,-1,' Phase name: '),0,wx.ALIGN_CENTER_VERTICAL)
+            nameSizer.Add(wx.StaticText(General,-1,' Phase name: '),0,WACV)
             NameTxt = wx.TextCtrl(General,-1,value=generalData['Name'],style=wx.TE_PROCESS_ENTER)
             NameTxt.Bind(wx.EVT_TEXT_ENTER,OnPhaseName)
             NameTxt.Bind(wx.EVT_KILL_FOCUS,OnPhaseName)
-            nameSizer.Add(NameTxt,0,wx.ALIGN_CENTER_VERTICAL)
-            nameSizer.Add(wx.StaticText(General,-1,'  Phase type: '),0,wx.ALIGN_CENTER_VERTICAL)
+            nameSizer.Add(NameTxt,0,WACV)
+            nameSizer.Add(wx.StaticText(General,-1,'  Phase type: '),0,WACV)
             TypeTxt = wx.ComboBox(General,-1,value=generalData['Type'],choices=phaseTypes,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             TypeTxt.Bind(wx.EVT_COMBOBOX, OnPhaseType)
-            nameSizer.Add(TypeTxt,0,wx.ALIGN_CENTER_VERTICAL)
-            nameSizer.Add(wx.StaticText(General,-1,'  Space group: '),0,wx.ALIGN_CENTER_VERTICAL)
+            nameSizer.Add(TypeTxt,0,WACV)
+            nameSizer.Add(wx.StaticText(General,-1,'  Space group: '),0,WACV)
             SGTxt = wx.TextCtrl(General,-1,value=generalData['SGData']['SpGrp'],style=wx.TE_PROCESS_ENTER)
             SGTxt.Bind(wx.EVT_TEXT_ENTER,OnSpaceGroup)
-            nameSizer.Add(SGTxt,0,wx.ALIGN_CENTER_VERTICAL)
+            nameSizer.Add(SGTxt,0,WACV)
             return nameSizer
             
@@ -383 +384 @@
             if PWDR:
                 cellRef = wx.CheckBox(General,-1,label='Refine unit cell:')
-                cellSizer.Add(cellRef,0,wx.ALIGN_CENTER_VERTICAL)
+                cellSizer.Add(cellRef,0,WACV)
                 cellRef.Bind(wx.EVT_CHECKBOX, OnCellRef)
                 cellRef.SetValue(cell[0])
             cellList = []
             for txt,fmt,ifEdit,Id in useGUI[2]:
-                cellSizer.Add(wx.StaticText(General,label=txt),0,wx.ALIGN_CENTER_VERTICAL)
+                cellSizer.Add(wx.StaticText(General,label=txt),0,WACV)
                 if ifEdit:          #a,b,c,etc.
                     cellVal = wx.TextCtrl(General,value=(fmt%(cell[Id+1])),
@@ -394 +395 @@
                     cellVal.Bind(wx.EVT_TEXT_ENTER,OnCellChange)        
                     cellVal.Bind(wx.EVT_KILL_FOCUS,OnCellChange)
-                    cellSizer.Add(cellVal,0,wx.ALIGN_CENTER_VERTICAL)
+                    cellSizer.Add(cellVal,0,WACV)
                     cellList.append(cellVal.GetId())
                 else:               #volume
                     volVal = wx.TextCtrl(General,value=(fmt%(cell[7])),style=wx.TE_READONLY)
                     volVal.SetBackgroundColour(VERY_LIGHT_GREY)
-                    cellSizer.Add(volVal,0,wx.ALIGN_CENTER_VERTICAL)
+                    cellSizer.Add(volVal,0,WACV)
             return cellSizer
             
@@ -417 +418 @@
                 
             elemSizer = wx.FlexGridSizer(8,len(generalData['AtomTypes'])+1,1,1)
-            elemSizer.Add(wx.StaticText(General,label=' Elements'),0,wx.ALIGN_CENTER_VERTICAL)
+            elemSizer.Add(wx.StaticText(General,label=' Elements'),0,WACV)
             for elem in generalData['AtomTypes']:
                 typTxt = wx.TextCtrl(General,value=elem,style=wx.TE_READONLY)
                 typTxt.SetBackgroundColour(VERY_LIGHT_GREY)
-                elemSizer.Add(typTxt,0,wx.ALIGN_CENTER_VERTICAL)
-            elemSizer.Add(wx.StaticText(General,label=' Isotope'),0,wx.ALIGN_CENTER_VERTICAL)
+                elemSizer.Add(typTxt,0,WACV)
+            elemSizer.Add(wx.StaticText(General,label=' Isotope'),0,WACV)
             for elem in generalData['AtomTypes']:
                 choices = generalData['Isotopes'][elem].keys()
@@ -429 +430 @@
                 isoSel.Bind(wx.EVT_COMBOBOX,OnIsotope)
                 Indx[isoSel.GetId()] = elem
-                elemSizer.Add(isoSel,1,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
-            elemSizer.Add(wx.StaticText(General,label=' No. per cell'),0,wx.ALIGN_CENTER_VERTICAL)
+                elemSizer.Add(isoSel,1,WACV|wx.EXPAND)
+            elemSizer.Add(wx.StaticText(General,label=' No. per cell'),0,WACV)
             for elem in generalData['AtomTypes']:
                 numbTxt = wx.TextCtrl(General,value='%.1f'%(generalData['NoAtoms'][elem]),
                     style=wx.TE_READONLY)
                 numbTxt.SetBackgroundColour(VERY_LIGHT_GREY)
-                elemSizer.Add(numbTxt,0,wx.ALIGN_CENTER_VERTICAL)
-            elemSizer.Add(wx.StaticText(General,label=' Atom weight'),0,wx.ALIGN_CENTER_VERTICAL)
+                elemSizer.Add(numbTxt,0,WACV)
+            elemSizer.Add(wx.StaticText(General,label=' Atom weight'),0,WACV)
             for wt in generalData['AtomMass']:
                 wtTxt = wx.TextCtrl(General,value='%.3f'%(wt),style=wx.TE_READONLY)
                 wtTxt.SetBackgroundColour(VERY_LIGHT_GREY)
-                elemSizer.Add(wtTxt,0,wx.ALIGN_CENTER_VERTICAL)
-            elemSizer.Add(wx.StaticText(General,label=' Bond radii'),0,wx.ALIGN_CENTER_VERTICAL)
+                elemSizer.Add(wtTxt,0,WACV)
+            elemSizer.Add(wx.StaticText(General,label=' Bond radii'),0,WACV)
             for rad in generalData['BondRadii']:
                 bondRadii = wx.TextCtrl(General,value='%.2f'%(rad),style=wx.TE_READONLY)
                 bondRadii.SetBackgroundColour(VERY_LIGHT_GREY)
-                elemSizer.Add(bondRadii,0,wx.ALIGN_CENTER_VERTICAL)
-            elemSizer.Add(wx.StaticText(General,label=' Angle radii'),0,wx.ALIGN_CENTER_VERTICAL)
+                elemSizer.Add(bondRadii,0,WACV)
+            elemSizer.Add(wx.StaticText(General,label=' Angle radii'),0,WACV)
             for rad in generalData['AngleRadii']:
                 elemTxt = wx.TextCtrl(General,value='%.2f'%(rad),style=wx.TE_READONLY)
                 elemTxt.SetBackgroundColour(VERY_LIGHT_GREY)
-                elemSizer.Add(elemTxt,0,wx.ALIGN_CENTER_VERTICAL)
-            elemSizer.Add(wx.StaticText(General,label=' van der Waals radii'),0,wx.ALIGN_CENTER_VERTICAL)
+                elemSizer.Add(elemTxt,0,WACV)
+            elemSizer.Add(wx.StaticText(General,label=' van der Waals radii'),0,WACV)
             for rad in generalData['vdWRadii']:
                 elemTxt = wx.TextCtrl(General,value='%.2f'%(rad),style=wx.TE_READONLY)
                 elemTxt.SetBackgroundColour(VERY_LIGHT_GREY)
-                elemSizer.Add(elemTxt,0,wx.ALIGN_CENTER_VERTICAL)
-            elemSizer.Add(wx.StaticText(General,label=' Default color'),0,wx.ALIGN_CENTER_VERTICAL)
+                elemSizer.Add(elemTxt,0,WACV)
+            elemSizer.Add(wx.StaticText(General,label=' Default color'),0,WACV)
             for R,G,B in generalData['Color']:
                 colorTxt = wx.TextCtrl(General,value='',style=wx.TE_READONLY)
                 colorTxt.SetBackgroundColour(wx.Colour(R,G,B))
-                elemSizer.Add(colorTxt,0,wx.ALIGN_CENTER_VERTICAL)
+                elemSizer.Add(colorTxt,0,WACV)
             return elemSizer
         
@@ -468 +469 @@
             density,mattCoeff = G2mth.getDensity(generalData)
             denSizer = wx.BoxSizer(wx.HORIZONTAL)
-            denSizer.Add(wx.StaticText(General,-1,' Density: '),0,wx.ALIGN_CENTER_VERTICAL)
+            denSizer.Add(wx.StaticText(General,-1,' Density: '),0,WACV)
             denTxt = wx.TextCtrl(General,-1,'%.3f'%(density),style=wx.TE_READONLY)
             denTxt.SetBackgroundColour(VERY_LIGHT_GREY)
-            denSizer.Add(denTxt,0,wx.ALIGN_CENTER_VERTICAL)
+            denSizer.Add(denTxt,0,WACV)
             mattTxt = None        
             if generalData['Type'] == 'macromolecular' and mass > 0.0:
                 denSizer.Add(wx.StaticText(General,-1,' Matthews coeff.: '),
-                    0,wx.ALIGN_CENTER_VERTICAL)
+                    0,WACV)
                 mattTxt = wx.TextCtrl(General,-1,'%.3f'%(mattCoeff),style=wx.TE_READONLY)
                 mattTxt.SetBackgroundColour(VERY_LIGHT_GREY)
-                denSizer.Add(mattTxt,0,wx.ALIGN_CENTER_VERTICAL)
+                denSizer.Add(mattTxt,0,WACV)
             return denSizer,denTxt,mattTxt
             
@@ -505 +506 @@
 
             pawleySizer = wx.BoxSizer(wx.HORIZONTAL)
-            pawleySizer.Add(wx.StaticText(General,label=' Pawley controls: '),0,wx.ALIGN_CENTER_VERTICAL)
+            pawleySizer.Add(wx.StaticText(General,label=' Pawley controls: '),0,WACV)
             pawlRef = wx.CheckBox(General,-1,label=' Do Pawley refinement?')
             pawlRef.SetValue(generalData['doPawley'])
             pawlRef.Bind(wx.EVT_CHECKBOX,OnPawleyRef)
-            pawleySizer.Add(pawlRef,0,wx.ALIGN_CENTER_VERTICAL)
-            pawleySizer.Add(wx.StaticText(General,label=' Pawley dmin: '),0,wx.ALIGN_CENTER_VERTICAL)
+            pawleySizer.Add(pawlRef,0,WACV)
+            pawleySizer.Add(wx.StaticText(General,label=' Pawley dmin: '),0,WACV)
             pawlVal = wx.TextCtrl(General,value='%.3f'%(generalData['Pawley dmin']),style=wx.TE_PROCESS_ENTER)
             pawlVal.Bind(wx.EVT_TEXT_ENTER,OnPawleyVal)        
             pawlVal.Bind(wx.EVT_KILL_FOCUS,OnPawleyVal)
-            pawleySizer.Add(pawlVal,0,wx.ALIGN_CENTER_VERTICAL)
-            pawleySizer.Add(wx.StaticText(General,label=' Pawley neg. wt.: '),0,wx.ALIGN_CENTER_VERTICAL)
+            pawleySizer.Add(pawlVal,0,WACV)
+            pawleySizer.Add(wx.StaticText(General,label=' Pawley neg. wt.: '),0,WACV)
             pawlNegWt = wx.TextCtrl(General,value='%.4f'%(generalData['Pawley neg wt']),style=wx.TE_PROCESS_ENTER)
             pawlNegWt.Bind(wx.EVT_TEXT_ENTER,OnPawleyNegWt)        
             pawlNegWt.Bind(wx.EVT_KILL_FOCUS,OnPawleyNegWt)
-            pawleySizer.Add(pawlNegWt,0,wx.ALIGN_CENTER_VERTICAL)
+            pawleySizer.Add(pawlNegWt,0,WACV)
             return pawleySizer
             
@@ -558 +559 @@
             mapSizer = wx.BoxSizer(wx.VERTICAL)
             lineSizer = wx.BoxSizer(wx.HORIZONTAL)
-            lineSizer.Add(wx.StaticText(General,label=' Fourier map controls: Map type: '),0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(wx.StaticText(General,label=' Fourier map controls: Map type: '),0,WACV)
             mapType = wx.ComboBox(General,-1,value=Map['MapType'],choices=mapTypes,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             mapType.Bind(wx.EVT_COMBOBOX,OnMapType)
-            lineSizer.Add(mapType,0,wx.ALIGN_CENTER_VERTICAL)
-            lineSizer.Add(wx.StaticText(General,label=' Reflection set from: '),0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(mapType,0,WACV)
+            lineSizer.Add(wx.StaticText(General,label=' Reflection set from: '),0,WACV)
             refList = wx.ComboBox(General,-1,value=Map['RefList'],choices=refList,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             refList.Bind(wx.EVT_COMBOBOX,OnRefList)
-            lineSizer.Add(refList,0,wx.ALIGN_CENTER_VERTICAL)
-            mapSizer.Add(lineSizer,0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(refList,0,WACV)
+            mapSizer.Add(lineSizer,0,WACV)
             line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
-            line2Sizer.Add(wx.StaticText(General,label=' Resolution: '),0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(wx.StaticText(General,label=' Resolution: '),0,WACV)
             mapRes =  wx.TextCtrl(General,value='%.2f'%(Map['Resolution']),style=wx.TE_PROCESS_ENTER)
             mapRes.Bind(wx.EVT_TEXT_ENTER,OnResVal)        
             mapRes.Bind(wx.EVT_KILL_FOCUS,OnResVal)
-            line2Sizer.Add(mapRes,0,wx.ALIGN_CENTER_VERTICAL)
-            line2Sizer.Add(wx.StaticText(General,label=' Peak cutoff %: '),0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(mapRes,0,WACV)
+            line2Sizer.Add(wx.StaticText(General,label=' Peak cutoff %: '),0,WACV)
             cutOff =  wx.TextCtrl(General,value='%.1f'%(Map['cutOff']),style=wx.TE_PROCESS_ENTER)
             cutOff.Bind(wx.EVT_TEXT_ENTER,OnCutOff)        
             cutOff.Bind(wx.EVT_KILL_FOCUS,OnCutOff)
-            line2Sizer.Add(cutOff,0,wx.ALIGN_CENTER_VERTICAL)
-            mapSizer.Add(line2Sizer,0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(cutOff,0,WACV)
+            mapSizer.Add(line2Sizer,0,WACV)
             return mapSizer
                 
@@ -626 +627 @@
             flipSizer = wx.BoxSizer(wx.VERTICAL)
             lineSizer = wx.BoxSizer(wx.HORIZONTAL)
-            lineSizer.Add(wx.StaticText(General,label=' Charge flip controls: Reflection set from: '),0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(wx.StaticText(General,label=' Charge flip controls: Reflection set from: '),0,WACV)
             refList = wx.ComboBox(General,-1,value=Flip['RefList'],choices=refList,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             refList.Bind(wx.EVT_COMBOBOX,OnRefList)
-            lineSizer.Add(refList,0,wx.ALIGN_CENTER_VERTICAL)
-            lineSizer.Add(wx.StaticText(General,label=' Normalizing element: '),0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(refList,0,WACV)
+            lineSizer.Add(wx.StaticText(General,label=' Normalizing element: '),0,WACV)
             normElem = wx.Button(General,label=Flip['Norm element'],style=wx.TE_READONLY)
             normElem.Bind(wx.EVT_BUTTON,OnNormElem)
-            lineSizer.Add(normElem,0,wx.ALIGN_CENTER_VERTICAL)
-            flipSizer.Add(lineSizer,0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(normElem,0,WACV)
+            flipSizer.Add(lineSizer,0,WACV)
             line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
-            line2Sizer.Add(wx.StaticText(General,label=' Resolution: '),0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(wx.StaticText(General,label=' Resolution: '),0,WACV)
             flipRes =  wx.TextCtrl(General,value='%.2f'%(Flip['Resolution']),style=wx.TE_PROCESS_ENTER)
             flipRes.Bind(wx.EVT_TEXT_ENTER,OnResVal)        
             flipRes.Bind(wx.EVT_KILL_FOCUS,OnResVal)
-            line2Sizer.Add(flipRes,0,wx.ALIGN_CENTER_VERTICAL)
-            line2Sizer.Add(wx.StaticText(General,label=' k-Factor (0.1-1.2): '),0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(flipRes,0,WACV)
+            line2Sizer.Add(wx.StaticText(General,label=' k-Factor (0.1-1.2): '),0,WACV)
             kFactor =  wx.TextCtrl(General,value='%.3f'%(Flip['k-factor']),style=wx.TE_PROCESS_ENTER)
             kFactor.Bind(wx.EVT_TEXT_ENTER,OnkFactor)        
             kFactor.Bind(wx.EVT_KILL_FOCUS,OnkFactor)
-            line2Sizer.Add(kFactor,0,wx.ALIGN_CENTER_VERTICAL)
-            line2Sizer.Add(wx.StaticText(General,label=' k-Max (>=10.0): '),0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(kFactor,0,WACV)
+            line2Sizer.Add(wx.StaticText(General,label=' k-Max (>=10.0): '),0,WACV)
             kMax = wx.TextCtrl(General,value='%.1f'%(Flip['k-Max']),style=wx.TE_PROCESS_ENTER)
             kMax.Bind(wx.EVT_TEXT_ENTER,OnkMax)        
             kMax.Bind(wx.EVT_KILL_FOCUS,OnkMax)
-            line2Sizer.Add(kMax,0,wx.ALIGN_CENTER_VERTICAL)
-            flipSizer.Add(line2Sizer,0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(kMax,0,WACV)
+            flipSizer.Add(line2Sizer,0,WACV)
             return flipSizer
             
@@ -741 +742 @@
             mcsaSizer = wx.BoxSizer(wx.VERTICAL)
             lineSizer = wx.BoxSizer(wx.HORIZONTAL)
-            lineSizer.Add(wx.StaticText(General,label=' Monte Carlo/Simulated Annealing controls: Reflection set from: '),0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(wx.StaticText(General,label=' Monte Carlo/Simulated Annealing controls: Reflection set from: '),0,WACV)
             refList = wx.ComboBox(General,-1,value=MCSAdata['Data source'],choices=refList,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             refList.Bind(wx.EVT_COMBOBOX,OnRefList)
-            lineSizer.Add(refList,0,wx.ALIGN_CENTER_VERTICAL)
-            lineSizer.Add(wx.StaticText(General,label=' d-min: '),0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(refList,0,WACV)
+            lineSizer.Add(wx.StaticText(General,label=' d-min: '),0,WACV)
             dmin = wx.TextCtrl(General,-1,value='%.3f'%(MCSAdata['dmin']),style=wx.TE_PROCESS_ENTER)
             dmin.Bind(wx.EVT_TEXT_ENTER,OnDmin)        
             dmin.Bind(wx.EVT_KILL_FOCUS,OnDmin)
-            lineSizer.Add(dmin,0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(dmin,0,WACV)
             mcsaSizer.Add(lineSizer)
             mcsaSizer.Add((5,5),)
             line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
-            line2Sizer.Add(wx.StaticText(General,label=' MC/SA runs: '),0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(wx.StaticText(General,label=' MC/SA runs: '),0,WACV)
             Cchoice = ['1','2','4','8','16','32','64','128','256']
             cycles = wx.ComboBox(General,-1,value=str(MCSAdata.get('Cycles',1)),choices=Cchoice,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             cycles.Bind(wx.EVT_COMBOBOX,OnCycles)        
-            line2Sizer.Add(cycles,0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(cycles,0,WACV)
             line2Sizer.Add((5,0),)
             ranStart = wx.CheckBox(General,-1,label=' MC/SA Refine at ')
             ranStart.Bind(wx.EVT_CHECKBOX, OnRanStart)
             ranStart.SetValue(MCSAdata.get('ranStart',False))
-            line2Sizer.Add(ranStart,0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(ranStart,0,WACV)
             ranRange = wx.TextCtrl(General,-1,value='%.1f'%(MCSAdata.get('ranRange',0.10)*100),style=wx.TE_PROCESS_ENTER)
             ranRange.Bind(wx.EVT_TEXT_ENTER,OnRanRange)        
             ranRange.Bind(wx.EVT_KILL_FOCUS,OnRanRange)
-            line2Sizer.Add(ranRange,0,wx.ALIGN_CENTER_VERTICAL)
-            line2Sizer.Add(wx.StaticText(General,label='% of ranges. '),0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(ranRange,0,WACV)
+            line2Sizer.Add(wx.StaticText(General,label='% of ranges. '),0,WACV)
 #            autoRan = wx.CheckBox(General,-1,label=' Do auto range reduction? ')
 #            autoRan.Bind(wx.EVT_CHECKBOX, OnAutoRan)
 #            autoRan.SetValue(MCSAdata.get('autoRan',False))
-#            line2Sizer.Add(autoRan,0,wx.ALIGN_CENTER_VERTICAL)
+#            line2Sizer.Add(autoRan,0,WACV)
             mcsaSizer.Add(line2Sizer)
             mcsaSizer.Add((5,5),)
@@ -779 +780 @@
             Achoice = ['log','fast']                #these work
 #            Achoice = ['log','fast','cauchy','boltzmann']
-            line3Sizer.Add(wx.StaticText(General,label=' MC/SA schedule: '),0,wx.ALIGN_CENTER_VERTICAL)
+            line3Sizer.Add(wx.StaticText(General,label=' MC/SA schedule: '),0,WACV)
             Alist = wx.ComboBox(General,-1,value=MCSAdata['Algorithm'],choices=Achoice,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             Alist.Bind(wx.EVT_COMBOBOX,OnAlist)
-            line3Sizer.Add(Alist,0,wx.ALIGN_CENTER_VERTICAL)
+            line3Sizer.Add(Alist,0,WACV)
             if MCSAdata['Algorithm'] in ['fast','boltzmann','cauchy']:
                 Names = [' A-jump: ',' B-jump: ']
@@ -793 +794 @@
                     parms = 'fast parms'
                 for i,name in enumerate(Names):
-                    line3Sizer.Add(wx.StaticText(General,label=name),0,wx.ALIGN_CENTER_VERTICAL)
+                    line3Sizer.Add(wx.StaticText(General,label=name),0,WACV)
                     Ajump =  wx.TextCtrl(General,-1,value='%.3f'%(MCSAdata[parms][i]),style=wx.TE_PROCESS_ENTER)
                     Ajump.Bind(wx.EVT_TEXT_ENTER,OnAjump)        
                     Ajump.Bind(wx.EVT_KILL_FOCUS,OnAjump)
                     Indx[Ajump.GetId()] = [parms,i]
-                    line3Sizer.Add(Ajump,0,wx.ALIGN_CENTER_VERTICAL)
+                    line3Sizer.Add(Ajump,0,WACV)
             elif 'log' in MCSAdata['Algorithm']:
-                line3Sizer.Add(wx.StaticText(General,label=' slope: '),0,wx.ALIGN_CENTER_VERTICAL)
+                line3Sizer.Add(wx.StaticText(General,label=' slope: '),0,WACV)
                 slope =  wx.TextCtrl(General,-1,value='%.3f'%(MCSAdata['log slope']),style=wx.TE_PROCESS_ENTER)
                 slope.Bind(wx.EVT_TEXT_ENTER,OnSlope)        
                 slope.Bind(wx.EVT_KILL_FOCUS,OnSlope)
-                line3Sizer.Add(slope,0,wx.ALIGN_CENTER_VERTICAL)
+                line3Sizer.Add(slope,0,WACV)
             mcsaSizer.Add(line3Sizer)
             mcsaSizer.Add((5,5),)
             line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
-            line3Sizer.Add(wx.StaticText(General,label=' Annealing schedule: '),0,wx.ALIGN_CENTER_VERTICAL)
+            line3Sizer.Add(wx.StaticText(General,label=' Annealing schedule: '),0,WACV)
             names = [' Start temp: ',' Final temp: ',' No. trials: ']
             fmts = ['%.1f','%.5f','%d']
@@ -816 +817 @@
                 else:
                     text = 'None'
-                line3Sizer.Add(wx.StaticText(General,label=name),0,wx.ALIGN_CENTER_VERTICAL)
+                line3Sizer.Add(wx.StaticText(General,label=name),0,WACV)
                 anneal =  wx.TextCtrl(General,-1,value=text,style=wx.TE_PROCESS_ENTER)
                 anneal.Bind(wx.EVT_TEXT_ENTER,OnAnneal)        
                 anneal.Bind(wx.EVT_KILL_FOCUS,OnAnneal)
                 Indx[anneal.GetId()] = [i,fmt]
-                line3Sizer.Add(anneal,0,wx.ALIGN_CENTER_VERTICAL)
+                line3Sizer.Add(anneal,0,WACV)
             mcsaSizer.Add(line3Sizer)            
             return mcsaSizer
@@ -1728 +1729 @@
                 if G2var in constDict:
                     ch = G2gd.HelpButton(panel2,fmtHelp(constDict[G2var],var))
-                    subSizer2.Add(ch,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)
+                    subSizer2.Add(ch,0,wx.LEFT|wx.RIGHT|WACV|wx.ALIGN_CENTER,1)
                 else:
                     subSizer2.Add((-1,-1))
@@ -1762 +1763 @@
                 if G2var in constDict:
                     ch = G2gd.HelpButton(panel2,fmtHelp(constDict[G2var],var))
-                    subSizer2.Add(ch,0,wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_CENTER,1)
+                    subSizer2.Add(ch,0,wx.LEFT|wx.RIGHT|WACV|wx.ALIGN_CENTER,1)
                 else:
                     subSizer2.Add((-1,-1))
@@ -2788 +2789 @@
                 ' Camera Distance: '+'%.2f'%(drawingData['cameraPos']),name='cameraPos')
             G2frame.dataDisplay.cameraPosTxt = cameraPosTxt
-            slideSizer.Add(cameraPosTxt,0,wx.ALIGN_CENTER_VERTICAL)
+            slideSizer.Add(cameraPosTxt,0,WACV)
             cameraPos = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=drawingData['cameraPos'],name='cameraSlider')
             cameraPos.SetRange(10,500)
@@ -2796 +2797 @@
             
             ZclipTxt = wx.StaticText(drawOptions,-1,' Z clipping: '+'%.2fA'%(drawingData['Zclip']*drawingData['cameraPos']/100.))
-            slideSizer.Add(ZclipTxt,0,wx.ALIGN_CENTER_VERTICAL)
+            slideSizer.Add(ZclipTxt,0,WACV)
             Zclip = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=drawingData['Zclip'])
             Zclip.SetRange(1,99)
@@ -2803 +2804 @@
             
             ZstepSizer = wx.BoxSizer(wx.HORIZONTAL)
-            ZstepSizer.Add(wx.StaticText(drawOptions,-1,' Z step:'),0,wx.ALIGN_CENTER_VERTICAL)
+            ZstepSizer.Add(wx.StaticText(drawOptions,-1,' Z step:'),0,WACV)
             Zstep = wx.TextCtrl(drawOptions,value='%.2f'%(drawingData['Zstep']),
                 style=wx.TE_PROCESS_ENTER)
             Zstep.Bind(wx.EVT_TEXT_ENTER,OnZstep)
             Zstep.Bind(wx.EVT_KILL_FOCUS,OnZstep)
-            ZstepSizer.Add(Zstep,0,wx.ALIGN_CENTER_VERTICAL)
+            ZstepSizer.Add(Zstep,0,WACV)
             slideSizer.Add(ZstepSizer)
             MoveSizer = wx.BoxSizer(wx.HORIZONTAL)
-            MoveSizer.Add(wx.StaticText(drawOptions,-1,'   Press to step:'),0,wx.ALIGN_CENTER_VERTICAL)
+            MoveSizer.Add(wx.StaticText(drawOptions,-1,'   Press to step:'),0,WACV)
             MoveZ = wx.SpinButton(drawOptions,style=wx.SP_HORIZONTAL,size=wx.Size(100,20))
             MoveZ.SetValue(0)
@@ -2820 +2821 @@
             
             vdwScaleTxt = wx.StaticText(drawOptions,-1,' van der Waals scale: '+'%.2f'%(drawingData['vdwScale']))
-            slideSizer.Add(vdwScaleTxt,0,wx.ALIGN_CENTER_VERTICAL)
+            slideSizer.Add(vdwScaleTxt,0,WACV)
             vdwScale = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(100*drawingData['vdwScale']))
             vdwScale.Bind(wx.EVT_SLIDER, OnVdWScale)
@@ -2826 +2827 @@
     
             ellipseProbTxt = wx.StaticText(drawOptions,-1,' Ellipsoid probability: '+'%d%%'%(drawingData['ellipseProb']))
-            slideSizer.Add(ellipseProbTxt,0,wx.ALIGN_CENTER_VERTICAL)
+            slideSizer.Add(ellipseProbTxt,0,WACV)
             ellipseProb = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=drawingData['ellipseProb'])
             ellipseProb.SetRange(1,99)
@@ -2833 +2834 @@
     
             ballScaleTxt = wx.StaticText(drawOptions,-1,' Ball scale: '+'%.2f'%(drawingData['ballScale']))
-            slideSizer.Add(ballScaleTxt,0,wx.ALIGN_CENTER_VERTICAL)
+            slideSizer.Add(ballScaleTxt,0,WACV)
             ballScale = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(100*drawingData['ballScale']))
             ballScale.Bind(wx.EVT_SLIDER, OnBallScale)
@@ -2839 +2840 @@
     
             bondRadiusTxt = wx.StaticText(drawOptions,-1,' Bond radius, A: '+'%.2f'%(drawingData['bondRadius']))
-            slideSizer.Add(bondRadiusTxt,0,wx.ALIGN_CENTER_VERTICAL)
+            slideSizer.Add(bondRadiusTxt,0,WACV)
             bondRadius = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(100*drawingData['bondRadius']))
             bondRadius.SetRange(1,25)
@@ -2847 +2848 @@
             if generalData['Map']['rhoMax']:
                 contourLevelTxt = wx.StaticText(drawOptions,-1,' Contour level: '+'%.2f'%(drawingData['contourLevel']*generalData['Map']['rhoMax']))
-                slideSizer.Add(contourLevelTxt,0,wx.ALIGN_CENTER_VERTICAL)
+                slideSizer.Add(contourLevelTxt,0,WACV)
                 contourLevel = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(100*drawingData['contourLevel']))
                 contourLevel.SetRange(1,100)
@@ -2853 +2854 @@
                 slideSizer.Add(contourLevel,1,wx.EXPAND|wx.RIGHT)
                 mapSizeTxt = wx.StaticText(drawOptions,-1,' Map radius, A: '+'%.1f'%(drawingData['mapSize']))
-                slideSizer.Add(mapSizeTxt,0,wx.ALIGN_CENTER_VERTICAL)
+                slideSizer.Add(mapSizeTxt,0,WACV)
                 mapSize = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(10*drawingData['mapSize']))
                 mapSize.SetRange(1,100)
@@ -2923 +2924 @@
             showSizer = wx.BoxSizer(wx.VERTICAL)            
             lineSizer = wx.BoxSizer(wx.HORIZONTAL)
-            lineSizer.Add(wx.StaticText(drawOptions,-1,' Background color:'),0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(wx.StaticText(drawOptions,-1,' Background color:'),0,WACV)
             backColor = wcs.ColourSelect(drawOptions, -1,colour=drawingData['backColor'],size=wx.Size(25,25))
             backColor.Bind(wcs.EVT_COLOURSELECT, OnBackColor)
-            lineSizer.Add(backColor,0,wx.ALIGN_CENTER_VERTICAL)
-            lineSizer.Add(wx.StaticText(drawOptions,-1,' View Dir.:'),0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(backColor,0,WACV)
+            lineSizer.Add(wx.StaticText(drawOptions,-1,' View Dir.:'),0,WACV)
             VD = drawingData['viewDir']
             viewDir = wx.TextCtrl(drawOptions,value='%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]),
@@ -2934 +2935 @@
             viewDir.Bind(wx.EVT_KILL_FOCUS,OnViewDir)
             G2frame.dataDisplay.viewDir = viewDir
-            lineSizer.Add(viewDir,0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(viewDir,0,WACV)
             showSizer.Add(lineSizer)
             showSizer.Add((0,5),0)
@@ -2942 +2943 @@
             showABC.Bind(wx.EVT_CHECKBOX, OnShowABC)
             showABC.SetValue(drawingData['showABC'])
-            lineSizer.Add(showABC,0,wx.ALIGN_CENTER_VERTICAL)
-            lineSizer.Add(wx.StaticText(drawOptions,-1,' View Point:'),0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(showABC,0,WACV)
+            lineSizer.Add(wx.StaticText(drawOptions,-1,' View Point:'),0,WACV)
             VP = drawingData['viewPoint'][0]
             viewPoint = wx.TextCtrl(drawOptions,value='%.3f %.3f %.3f'%(VP[0],VP[1],VP[2]),
@@ -2950 +2951 @@
             viewPoint.Bind(wx.EVT_TEXT_ENTER,OnViewPoint)
             viewPoint.Bind(wx.EVT_KILL_FOCUS,OnViewPoint)
-            lineSizer.Add(viewPoint,0,wx.ALIGN_CENTER_VERTICAL)
+            lineSizer.Add(viewPoint,0,WACV)
             showSizer.Add(lineSizer)
             showSizer.Add((0,5),0)
@@ -2959 +2960 @@
             unitCellBox.Bind(wx.EVT_CHECKBOX, OnShowUnitCell)
             unitCellBox.SetValue(drawingData['unitCellBox'])
-            line2Sizer.Add(unitCellBox,0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(unitCellBox,0,WACV)
     
             showHydrogen = wx.CheckBox(drawOptions,-1,label=' Show hydrogens?')
             showHydrogen.Bind(wx.EVT_CHECKBOX, OnShowHyd)
             showHydrogen.SetValue(drawingData['showHydrogen'])
-            line2Sizer.Add(showHydrogen,0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(showHydrogen,0,WACV)
             
             showRB = wx.CheckBox(drawOptions,-1,label=' Show rigid Bodies?')
             showRB.Bind(wx.EVT_CHECKBOX, OnShowRB)
             showRB.SetValue(drawingData['showRigidBodies'])
-            line2Sizer.Add(showRB,0,wx.ALIGN_CENTER_VERTICAL)
+            line2Sizer.Add(showRB,0,WACV)
             
             showSizer.Add(line2Sizer)
@@ -2996 +2997 @@
             
             radSizer = wx.BoxSizer(wx.HORIZONTAL)
-            radSizer.Add(wx.StaticText(drawOptions,-1,' Hydrogen radius, A:  '),0,wx.ALIGN_CENTER_VERTICAL)
+            radSizer.Add(wx.StaticText(drawOptions,-1,' Hydrogen radius, A:  '),0,WACV)
             sizeH = wx.TextCtrl(drawOptions,-1,value='%.2f'%(drawingData['sizeH']),size=wx.Size(60,20),style=wx.TE_PROCESS_ENTER)
             sizeH.Bind(wx.EVT_TEXT_ENTER,OnSizeHatoms)
             sizeH.Bind(wx.EVT_KILL_FOCUS,OnSizeHatoms)
-            radSizer.Add(sizeH,0,wx.ALIGN_CENTER_VERTICAL)
+            radSizer.Add(sizeH,0,WACV)
     
-            radSizer.Add(wx.StaticText(drawOptions,-1,' Bond search factor:  '),0,wx.ALIGN_CENTER_VERTICAL)
+            radSizer.Add(wx.StaticText(drawOptions,-1,' Bond search factor:  '),0,WACV)
             radFactor = wx.TextCtrl(drawOptions,value='%.2f'%(drawingData['radiusFactor']),size=wx.Size(60,20),style=wx.TE_PROCESS_ENTER)
             radFactor.Bind(wx.EVT_TEXT_ENTER,OnRadFactor)
             radFactor.Bind(wx.EVT_KILL_FOCUS,OnRadFactor)
-            radSizer.Add(radFactor,0,wx.ALIGN_CENTER_VERTICAL)
+            radSizer.Add(radFactor,0,WACV)
             return radSizer
 
@@ -3024 +3025 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(wx.StaticText(drawOptions,-1,' Drawing controls:'),0,wx.ALIGN_CENTER_VERTICAL)
+        mainSizer.Add(wx.StaticText(drawOptions,-1,' Drawing controls:'),0,WACV)
         mainSizer.Add((5,5),0)        
         mainSizer.Add(SlopSizer(),0)
@@ -3158 +3159 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         titleSizer = wx.BoxSizer(wx.HORIZONTAL)
-        titleSizer.Add(wx.StaticText(Texture,-1,'Spherical harmonics texture data for '+PhaseName+':'),0,wx.ALIGN_CENTER_VERTICAL)
+        titleSizer.Add(wx.StaticText(Texture,-1,'Spherical harmonics texture data for '+PhaseName+':'),0,WACV)
         titleSizer.Add(wx.StaticText(Texture,-1,
             ' Texture Index J = %7.3f'%(G2lat.textureIndex(textureData['SH Coeff'][1]))),
-            0,wx.ALIGN_CENTER_VERTICAL)
+            0,WACV)
         mainSizer.Add(titleSizer,0)
         mainSizer.Add((0,5),0)
         shSizer = wx.FlexGridSizer(1,6,5,5)
-        shSizer.Add(wx.StaticText(Texture,-1,'Texture model: '),0,wx.ALIGN_CENTER_VERTICAL)
+        shSizer.Add(wx.StaticText(Texture,-1,'Texture model: '),0,WACV)
         shModel = wx.ComboBox(Texture,-1,value=textureData['Model'],choices=shModels,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         shModel.Bind(wx.EVT_COMBOBOX,OnShModel)
-        shSizer.Add(shModel,0,wx.ALIGN_CENTER_VERTICAL)
-        shSizer.Add(wx.StaticText(Texture,-1,'  Harmonic order: '),0,wx.ALIGN_CENTER_VERTICAL)
+        shSizer.Add(shModel,0,WACV)
+        shSizer.Add(wx.StaticText(Texture,-1,'  Harmonic order: '),0,WACV)
         shOrder = wx.ComboBox(Texture,-1,value=str(textureData['Order']),choices=[str(2*i) for i in range(18)],
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         shOrder.Bind(wx.EVT_COMBOBOX,OnShOrder)
-        shSizer.Add(shOrder,0,wx.ALIGN_CENTER_VERTICAL)
+        shSizer.Add(shOrder,0,WACV)
         shRef = wx.CheckBox(Texture,-1,label=' Refine texture?')
         shRef.SetValue(textureData['SH Coeff'][0])
         shRef.Bind(wx.EVT_CHECKBOX, OnSHRefine)
-        shSizer.Add(shRef,0,wx.ALIGN_CENTER_VERTICAL)
+        shSizer.Add(shRef,0,WACV)
         shShow = wx.CheckBox(Texture,-1,label=' Show coeff.?')
         shShow.SetValue(textureData['SHShow'])
         shShow.Bind(wx.EVT_CHECKBOX, OnSHShow)
-        shSizer.Add(shShow,0,wx.ALIGN_CENTER_VERTICAL)
+        shSizer.Add(shShow,0,WACV)
         mainSizer.Add(shSizer,0,0)
         mainSizer.Add((0,5),0)
         PTSizer = wx.FlexGridSizer(2,4,5,5)
-        PTSizer.Add(wx.StaticText(Texture,-1,' Texture plot type: '),0,wx.ALIGN_CENTER_VERTICAL)
+        PTSizer.Add(wx.StaticText(Texture,-1,' Texture plot type: '),0,WACV)
         choices = ['Axial pole distribution','Pole figure','Inverse pole figure']            
         pfType = wx.ComboBox(Texture,-1,value=str(textureData['PlotType']),choices=choices,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         pfType.Bind(wx.EVT_COMBOBOX,OnPfType)
-        PTSizer.Add(pfType,0,wx.ALIGN_CENTER_VERTICAL)
+        PTSizer.Add(pfType,0,WACV)
         if 'Axial' not in textureData['PlotType']:
-            PTSizer.Add(wx.StaticText(Texture,-1,' Projection type: '),0,wx.ALIGN_CENTER_VERTICAL)
+            PTSizer.Add(wx.StaticText(Texture,-1,' Projection type: '),0,WACV)
             projSel = wx.ComboBox(Texture,-1,value=G2frame.Projection,choices=['equal area','stereographic','3D display'],
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             projSel.Bind(wx.EVT_COMBOBOX,OnProjSel)
-            PTSizer.Add(projSel,0,wx.ALIGN_CENTER_VERTICAL)
+            PTSizer.Add(projSel,0,WACV)
         if textureData['PlotType'] in ['Pole figure','Axial pole distribution']:
-            PTSizer.Add(wx.StaticText(Texture,-1,' Pole figure HKL: '),0,wx.ALIGN_CENTER_VERTICAL)
+            PTSizer.Add(wx.StaticText(Texture,-1,' Pole figure HKL: '),0,WACV)
             PH = textureData['PFhkl']
             pfVal = wx.TextCtrl(Texture,-1,'%d %d %d'%(PH[0],PH[1],PH[2]),style=wx.TE_PROCESS_ENTER)
         else:
-            PTSizer.Add(wx.StaticText(Texture,-1,' Inverse pole figure XYZ: '),0,wx.ALIGN_CENTER_VERTICAL)
+            PTSizer.Add(wx.StaticText(Texture,-1,' Inverse pole figure XYZ: '),0,WACV)
             PX = textureData['PFxyz']
             pfVal = wx.TextCtrl(Texture,-1,'%3.1f %3.1f %3.1f'%(PX[0],PX[1],PX[2]),style=wx.TE_PROCESS_ENTER)
         pfVal.Bind(wx.EVT_TEXT_ENTER,OnPFValue)
         pfVal.Bind(wx.EVT_KILL_FOCUS,OnPFValue)
-        PTSizer.Add(pfVal,0,wx.ALIGN_CENTER_VERTICAL)
+        PTSizer.Add(pfVal,0,WACV)
         if 'Axial' not in textureData['PlotType']:
-            PTSizer.Add(wx.StaticText(Texture,-1,' Color scheme'),0,wx.ALIGN_CENTER_VERTICAL)
+            PTSizer.Add(wx.StaticText(Texture,-1,' Color scheme'),0,WACV)
             choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
             choice.sort()
@@ -3216 +3217 @@
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             colorSel.Bind(wx.EVT_COMBOBOX,OnColorSel)
-            PTSizer.Add(colorSel,0,wx.ALIGN_CENTER_VERTICAL)        
-        mainSizer.Add(PTSizer,0,wx.ALIGN_CENTER_VERTICAL)
+            PTSizer.Add(colorSel,0,WACV)        
+        mainSizer.Add(PTSizer,0,WACV)
         mainSizer.Add((0,5),0)
         if textureData['SHShow']:
-            mainSizer.Add(wx.StaticText(Texture,-1,'Spherical harmonic coefficients: '),0,wx.ALIGN_CENTER_VERTICAL)
+            mainSizer.Add(wx.StaticText(Texture,-1,'Spherical harmonic coefficients: '),0,WACV)
             mainSizer.Add((0,5),0)
             ODFSizer = wx.FlexGridSizer(2,8,2,2)
@@ -3227 +3228 @@
             ODFkeys.sort()
             for item in ODFkeys:
-                ODFSizer.Add(wx.StaticText(Texture,-1,item),0,wx.ALIGN_CENTER_VERTICAL)
+                ODFSizer.Add(wx.StaticText(Texture,-1,item),0,WACV)
                 ODFval = wx.TextCtrl(Texture,wx.ID_ANY,'%8.3f'%(textureData['SH Coeff'][1][item]),style=wx.TE_PROCESS_ENTER)
                 ODFIndx[ODFval.GetId()] = item
                 ODFval.Bind(wx.EVT_TEXT_ENTER,OnODFValue)
                 ODFval.Bind(wx.EVT_KILL_FOCUS,OnODFValue)
-                ODFSizer.Add(ODFval,0,wx.ALIGN_CENTER_VERTICAL)
-            mainSizer.Add(ODFSizer,0,wx.ALIGN_CENTER_VERTICAL)
+                ODFSizer.Add(ODFval,0,WACV)
+            mainSizer.Add(ODFSizer,0,WACV)
             mainSizer.Add((0,5),0)
         mainSizer.Add((0,5),0)
-        mainSizer.Add(wx.StaticText(Texture,-1,'Sample orientation angles: '),0,wx.ALIGN_CENTER_VERTICAL)
+        mainSizer.Add(wx.StaticText(Texture,-1,'Sample orientation angles: '),0,WACV)
         mainSizer.Add((0,5),0)
         angSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -3246 +3247 @@
             angIndx[angRef.GetId()] = item
             angRef.Bind(wx.EVT_CHECKBOX, OnAngRef)
-            angSizer.Add(angRef,0,wx.ALIGN_CENTER_VERTICAL)
+            angSizer.Add(angRef,0,WACV)
             angVal = wx.TextCtrl(Texture,wx.ID_ANY,'%8.2f'%(textureData[item][1]),style=wx.TE_PROCESS_ENTER)
             valIndx[angVal.GetId()] = item
             angVal.Bind(wx.EVT_TEXT_ENTER,OnAngValue)
             angVal.Bind(wx.EVT_KILL_FOCUS,OnAngValue)
-            angSizer.Add(angVal,0,wx.ALIGN_CENTER_VERTICAL)
+            angSizer.Add(angVal,0,WACV)
             angSizer.Add((5,0),0)
-        mainSizer.Add(angSizer,0,wx.ALIGN_CENTER_VERTICAL)
+        mainSizer.Add(angSizer,0,WACV)
         SetPhaseWindow(G2frame.dataFrame,Texture,mainSizer)
 
@@ -3455 +3456 @@
                 names += ['S12','S13','S21','S23','S31','S32','SAA','SBB']
             for i,name in enumerate(names):
-                thermSizer.Add(wx.StaticText(RigidBodies,-1,name+': '),0,wx.ALIGN_CENTER_VERTICAL)
+                thermSizer.Add(wx.StaticText(RigidBodies,-1,name+': '),0,WACV)
                 thermVal = wx.TextCtrl(RigidBodies,-1,value='%8.4f'%(model[1][i]),
                     style=wx.TE_PROCESS_ENTER)
@@ -3466 +3467 @@
                 Tcheck.SetValue(model[2][i])
                 Indx[Tcheck.GetId()] = i
-                thermSizer.Add(Tcheck,0,wx.ALIGN_CENTER_VERTICAL)
+                thermSizer.Add(Tcheck,0,WACV)
             return thermSizer
             
@@ -3524 +3525 @@
             Orien = [Orien,]
             Orien.extend(OrienV/nl.norm(OrienV))
-            topSizer.Add(wx.StaticText(RigidBodies,-1,'Origin x,y,z:'),0,wx.ALIGN_CENTER_VERTICAL)
+            topSizer.Add(wx.StaticText(RigidBodies,-1,'Origin x,y,z:'),0,WACV)
             for ix,x in enumerate(Orig):
                 origX = wx.TextCtrl(RigidBodies,-1,value='%8.5f'%(x),style=wx.TE_PROCESS_ENTER)
@@ -3530 +3531 @@
                 origX.Bind(wx.EVT_KILL_FOCUS,OnOrigX)
                 Indx[origX.GetId()] = ix
-                topSizer.Add(origX,0,wx.ALIGN_CENTER_VERTICAL)
+                topSizer.Add(origX,0,WACV)
             topSizer.Add((5,0),)
             Ocheck = wx.CheckBox(RigidBodies,-1,'Refine?')
             Ocheck.Bind(wx.EVT_CHECKBOX,OnOrigRef)
             Ocheck.SetValue(RBObj['Orig'][1])
-            topSizer.Add(Ocheck,0,wx.ALIGN_CENTER_VERTICAL)
-            topSizer.Add(wx.StaticText(RigidBodies,-1,'Rotation angle, vector:'),0,wx.ALIGN_CENTER_VERTICAL)
+            topSizer.Add(Ocheck,0,WACV)
+            topSizer.Add(wx.StaticText(RigidBodies,-1,'Rotation angle, vector:'),0,WACV)
             for ix,x in enumerate(Orien):
                 orien = wx.TextCtrl(RigidBodies,-1,value='%8.4f'%(x),style=wx.TE_PROCESS_ENTER)
@@ -3542 +3543 @@
                 orien.Bind(wx.EVT_KILL_FOCUS,OnOrien)
                 Indx[orien.GetId()] = ix
-                topSizer.Add(orien,0,wx.ALIGN_CENTER_VERTICAL)
+                topSizer.Add(orien,0,WACV)
             Qcheck = wx.ComboBox(RigidBodies,-1,value='',choices=[' ','A','AV'],
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -3590 +3591 @@
             topLine = wx.BoxSizer(wx.HORIZONTAL)
             topLine.Add(wx.StaticText(RigidBodies,-1,
-                'Name: '+RBObj['RBname']+RBObj['numChain']+'   '),0,wx.ALIGN_CENTER_VERTICAL)
+                'Name: '+RBObj['RBname']+RBObj['numChain']+'   '),0,WACV)
             rbId = RBObj['RBId']
             delRB = wx.CheckBox(RigidBodies,-1,'Delete?')
             delRB.Bind(wx.EVT_CHECKBOX,OnDelResRB)
             Indx[delRB.GetId()] = rbId
-            topLine.Add(delRB,0,wx.ALIGN_CENTER_VERTICAL)
+            topLine.Add(delRB,0,WACV)
             resrbSizer.Add(topLine)
             resrbSizer.Add(LocationSizer(RBObj,'Residue'))
-            resrbSizer.Add(wx.StaticText(RigidBodies,-1,'Torsions:'),0,wx.ALIGN_CENTER_VERTICAL)
+            resrbSizer.Add(wx.StaticText(RigidBodies,-1,'Torsions:'),0,WACV)
             torSizer = wx.FlexGridSizer(1,6,5,5)
             for itors,tors in enumerate(RBObj['Torsions']):
-                torSizer.Add(wx.StaticText(RigidBodies,-1,'Torsion '+'%d'%(itors)),0,wx.ALIGN_CENTER_VERTICAL)
+                torSizer.Add(wx.StaticText(RigidBodies,-1,'Torsion '+'%d'%(itors)),0,WACV)
                 torsTxt = wx.TextCtrl(RigidBodies,-1,value='%.3f'%(tors[0]),style=wx.TE_PROCESS_ENTER)
                 torsTxt.Bind(wx.EVT_TEXT_ENTER,OnTorsion)
@@ -3611 +3612 @@
                 torCheck.SetValue(tors[1])
                 Indx[torCheck.GetId()] = itors
-                torSizer.Add(torCheck,0,wx.ALIGN_CENTER_VERTICAL)
+                torSizer.Add(torCheck,0,WACV)
             resrbSizer.Add(torSizer)
             tchoice = ['None','Uiso','T','TL','TLS']
             thermSizer = wx.BoxSizer(wx.HORIZONTAL)
-            thermSizer.Add(wx.StaticText(RigidBodies,-1,'Rigid body thermal motion model: '),0,wx.ALIGN_CENTER_VERTICAL)
+            thermSizer.Add(wx.StaticText(RigidBodies,-1,'Rigid body thermal motion model: '),0,WACV)
             thermSel = wx.ComboBox(RigidBodies,-1,value=RBObj['ThermalMotion'][0],choices=tchoice,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             Indx[thermSel.GetId()] = RBObj
             thermSel.Bind(wx.EVT_COMBOBOX,OnThermSel)
-            thermSizer.Add(thermSel,0,wx.ALIGN_CENTER_VERTICAL)
-            thermSizer.Add(wx.StaticText(RigidBodies,-1,' Units: T A^2, L deg^2, S deg-A'),0,wx.ALIGN_CENTER_VERTICAL)
+            thermSizer.Add(thermSel,0,WACV)
+            thermSizer.Add(wx.StaticText(RigidBodies,-1,' Units: T A^2, L deg^2, S deg-A'),0,WACV)
             resrbSizer.Add(thermSizer)
             if RBObj['ThermalMotion'][0] != 'None':
@@ -3645 +3646 @@
             topLine = wx.BoxSizer(wx.HORIZONTAL)
             topLine.Add(wx.StaticText(RigidBodies,-1,
-                'Name: '+RBObj['RBname']+'   '),0,wx.ALIGN_CENTER_VERTICAL)
+                'Name: '+RBObj['RBname']+'   '),0,WACV)
             rbId = RBObj['RBId']
             delRB = wx.CheckBox(RigidBodies,-1,'Delete?')
             delRB.Bind(wx.EVT_CHECKBOX,OnDelVecRB)
             Indx[delRB.GetId()] = rbId
-            topLine.Add(delRB,0,wx.ALIGN_CENTER_VERTICAL)
+            topLine.Add(delRB,0,WACV)
             vecrbSizer.Add(topLine)
             vecrbSizer.Add(LocationSizer(RBObj,'Vector'))
             tchoice = ['None','Uiso','T','TL','TLS']
             thermSizer = wx.BoxSizer(wx.HORIZONTAL)
-            thermSizer.Add(wx.StaticText(RigidBodies,-1,'Rigid body thermal motion model: '),0,wx.ALIGN_CENTER_VERTICAL)
+            thermSizer.Add(wx.StaticText(RigidBodies,-1,'Rigid body thermal motion model: '),0,WACV)
             thermSel = wx.ComboBox(RigidBodies,-1,value=RBObj['ThermalMotion'][0],choices=tchoice,
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             Indx[thermSel.GetId()] = RBObj
             thermSel.Bind(wx.EVT_COMBOBOX,OnThermSel)
-            thermSizer.Add(thermSel,0,wx.ALIGN_CENTER_VERTICAL)
-            thermSizer.Add(wx.StaticText(RigidBodies,-1,' Units: T A^2, L deg^2, S deg-A'),0,wx.ALIGN_CENTER_VERTICAL)
+            thermSizer.Add(thermSel,0,WACV)
+            thermSizer.Add(wx.StaticText(RigidBodies,-1,' Units: T A^2, L deg^2, S deg-A'),0,WACV)
             vecrbSizer.Add(thermSizer)
             if RBObj['ThermalMotion'][0] != 'None':
@@ -3684 +3685 @@
         if not data['RBModels']:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(RigidBodies,-1,'No rigid body models:'),0,wx.ALIGN_CENTER_VERTICAL)
+            mainSizer.Add(wx.StaticText(RigidBodies,-1,'No rigid body models:'),0,WACV)
             mainSizer.Add((5,5),0)
         if 'Residue' in data['RBModels']:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(RigidBodies,-1,'Residue rigid bodies:'),0,wx.ALIGN_CENTER_VERTICAL)
+            mainSizer.Add(wx.StaticText(RigidBodies,-1,'Residue rigid bodies:'),0,WACV)
             mainSizer.Add((5,5),0)
             for RBObj in data['RBModels']['Residue']:
@@ -3694 +3695 @@
         if 'Vector' in data['RBModels']:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(RigidBodies,-1,'Vector rigid bodies:'),0,wx.ALIGN_CENTER_VERTICAL)
+            mainSizer.Add(wx.StaticText(RigidBodies,-1,'Vector rigid bodies:'),0,WACV)
             mainSizer.Add((5,5),0)
             for RBObj in data['RBModels']['Vector']:
@@ -3941 +3942 @@
                 atNames = data['testRBObj']['atNames']
                 mainSizer.Add(wx.StaticText(RigidBodies,-1,'Locate rigid body : '+rbName),
-                    0,wx.ALIGN_CENTER_VERTICAL)
+                    0,WACV)
                 mainSizer.Add((5,5),0)
                 OriSizer = wx.FlexGridSizer(1,5,5,5)
-                OriSizer.Add(wx.StaticText(RigidBodies,-1,'Origin x,y,z: '),0,wx.ALIGN_CENTER_VERTICAL)
+                OriSizer.Add(wx.StaticText(RigidBodies,-1,'Origin x,y,z: '),0,WACV)
                 for ix,x in enumerate(Orig):
                     origX = wx.StaticText(RigidBodies,-1,'%10.5f'%(x))
-                    OriSizer.Add(origX,0,wx.ALIGN_CENTER_VERTICAL)
+                    OriSizer.Add(origX,0,WACV)
                     Xsizers.append(origX)
                 OriSizer.Add((5,0),)
@@ -3954 +3955 @@
                     choice.sort()
                     data['testRBObj']['Sizers']['Xsizers'] = Xsizers
-                OriSizer.Add(wx.StaticText(RigidBodies,-1,'Orientation quaternion: '),0,wx.ALIGN_CENTER_VERTICAL)
+                OriSizer.Add(wx.StaticText(RigidBodies,-1,'Orientation quaternion: '),0,WACV)
                 for ix,x in enumerate(Orien):
                     orien = wx.StaticText(RigidBodies,-1,'%10.4f'%(x))
-                    OriSizer.Add(orien,0,wx.ALIGN_CENTER_VERTICAL)
+                    OriSizer.Add(orien,0,WACV)
                     Osizers.append(orien)
                 data['testRBObj']['Sizers']['Osizers'] = Osizers
@@ -3964 +3965 @@
                 RefSizer = wx.FlexGridSizer(1,7,5,5)
                 if len(atomData):
-                    RefSizer.Add(wx.StaticText(RigidBodies,-1,'Location setting: Select match to'),0,wx.ALIGN_CENTER_VERTICAL)
+                    RefSizer.Add(wx.StaticText(RigidBodies,-1,'Location setting: Select match to'),0,WACV)
                     for i in [0,1,2]:
                         choice = ['',]+atNames[i].keys()
                         choice.sort()
-                        RefSizer.Add(wx.StaticText(RigidBodies,-1,' '+refName[i]+': '),0,wx.ALIGN_CENTER_VERTICAL)
+                        RefSizer.Add(wx.StaticText(RigidBodies,-1,' '+refName[i]+': '),0,WACV)
                         atPick = wx.ComboBox(RigidBodies,-1,value='',
                             choices=choice[1:],style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -3976 +3977 @@
                             atPick.Bind(wx.EVT_COMBOBOX, OnAtOrigPick)                            
                         Indx[atPick.GetId()] = i
-                        RefSizer.Add(atPick,0,wx.ALIGN_CENTER_VERTICAL)
+                        RefSizer.Add(atPick,0,WACV)
                 mainSizer.Add(RefSizer)
                 mainSizer.Add((5,5),0)
@@ -3989 +3990 @@
                         for item in [seq[0],seq[1],seq[3][0]]:
                             torName += data['testRBObj']['rbAtTypes'][item]+str(item)+' '
-                        TorSizer.Add(wx.StaticText(RigidBodies,-1,'Side chain torsion for rb seq: '+torName),0,wx.ALIGN_CENTER_VERTICAL)
+                        TorSizer.Add(wx.StaticText(RigidBodies,-1,'Side chain torsion for rb seq: '+torName),0,WACV)
                         torSlide = wx.Slider(RigidBodies,style=wx.SL_HORIZONTAL)
                         torSlide.SetRange(0,3600)
@@ -3995 +3996 @@
                         torSlide.Bind(wx.EVT_SLIDER, OnTorSlide)
                         TorSizer.Add(torSlide,1,wx.EXPAND|wx.RIGHT)
-                        TorSizer.Add(wx.StaticText(RigidBodies,-1,' Angle: '),0,wx.ALIGN_CENTER_VERTICAL)
+                        TorSizer.Add(wx.StaticText(RigidBodies,-1,' Angle: '),0,WACV)
                         ang = wx.TextCtrl(RigidBodies,-1,value='%8.3f'%(torsion[0]),style=wx.TE_PROCESS_ENTER)
                         ang.Bind(wx.EVT_TEXT_ENTER,OnTorAngle)
@@ -4001 +4002 @@
                         Indx[torSlide.GetId()] = [t,ang]
                         Indx[ang.GetId()] = [t,torSlide]
-                        TorSizer.Add(ang,0,wx.ALIGN_CENTER_VERTICAL)                            
+                        TorSizer.Add(ang,0,WACV)                            
                     mainSizer.Add(TorSizer,1,wx.EXPAND|wx.RIGHT)
                 else:
-                    mainSizer.Add(wx.StaticText(RigidBodies,-1,'No side chain torsions'),0,wx.ALIGN_CENTER_VERTICAL)
+                    mainSizer.Add(wx.StaticText(RigidBodies,-1,'No side chain torsions'),0,WACV)
             else:
-                mainSizer.Add(wx.StaticText(RigidBodies,-1,'Assign rigid body:'),0,wx.ALIGN_CENTER_VERTICAL)
+                mainSizer.Add(wx.StaticText(RigidBodies,-1,'Assign rigid body:'),0,WACV)
                 mainSizer.Add((5,5),0)
                 topSizer = wx.BoxSizer(wx.HORIZONTAL)
-                topSizer.Add(wx.StaticText(RigidBodies,-1,'Select rigid body model'),0,wx.ALIGN_CENTER_VERTICAL)
+                topSizer.Add(wx.StaticText(RigidBodies,-1,'Select rigid body model'),0,WACV)
                 rbSel = wx.ComboBox(RigidBodies,-1,value='',choices=rbNames.keys(),
                     style=wx.CB_READONLY|wx.CB_DROPDOWN)
                 rbSel.Bind(wx.EVT_COMBOBOX, OnRBSel)
                 topSizer.Add((5,5),0)
-                topSizer.Add(rbSel,0,wx.ALIGN_CENTER_VERTICAL)
+                topSizer.Add(rbSel,0,WACV)
                 mainSizer.Add(topSizer)                
                 
@@ -4256 +4257 @@
             
             atomsizer = wx.FlexGridSizer(1,7,5,5)
-            atomsizer.Add(wx.StaticText(MCSA,-1,' Atom: '+model['name']+': '),0,wx.ALIGN_CENTER_VERTICAL)
+            atomsizer.Add(wx.StaticText(MCSA,-1,' Atom: '+model['name']+': '),0,WACV)
             for ix,item in enumerate(['x','y','z']):
                 posRef = wx.CheckBox(MCSA,-1,label=item+': ')
@@ -4262 +4263 @@
                 posRef.Bind(wx.EVT_CHECKBOX,OnPosRef)
                 Indx[posRef.GetId()] = [model,'Pos',ix]
-                atomsizer.Add(posRef,0,wx.ALIGN_CENTER_VERTICAL)
+                atomsizer.Add(posRef,0,WACV)
                 posVal = wx.TextCtrl(MCSA,-1,'%.4f'%(model['Pos'][0][ix]),style=wx.TE_PROCESS_ENTER)
                 posVal.Bind(wx.EVT_TEXT_ENTER,OnPosVal)
                 posVal.Bind(wx.EVT_KILL_FOCUS,OnPosVal)
                 Indx[posVal.GetId()] = [model,'Pos',ix]
-                atomsizer.Add(posVal,0,wx.ALIGN_CENTER_VERTICAL)
+                atomsizer.Add(posVal,0,WACV)
             atomsizer.Add((5,5),0)
             for ix,item in enumerate(['x','y','z']):
-                atomsizer.Add(wx.StaticText(MCSA,-1,' Range: '),0,wx.ALIGN_CENTER_VERTICAL)
+                atomsizer.Add(wx.StaticText(MCSA,-1,' Range: '),0,WACV)
                 rmin,rmax = model['Pos'][2][ix]
                 posRange = wx.TextCtrl(MCSA,-1,'%.3f %.3f'%(rmin,rmax),style=wx.TE_PROCESS_ENTER)
@@ -4276 +4277 @@
                 posRange.Bind(wx.EVT_TEXT_ENTER,OnPosRange)
                 posRange.Bind(wx.EVT_KILL_FOCUS,OnPosRange)
-                atomsizer.Add(posRange,0,wx.ALIGN_CENTER_VERTICAL)
+                atomsizer.Add(posRange,0,WACV)
             return atomsizer
             
@@ -4328 +4329 @@
             rbsizer = wx.BoxSizer(wx.VERTICAL)
             rbsizer1 = wx.FlexGridSizer(1,7,5,5)
-            rbsizer1.Add(wx.StaticText(MCSA,-1,model['Type']+': '+model['name']+': '),0,wx.ALIGN_CENTER_VERTICAL)
+            rbsizer1.Add(wx.StaticText(MCSA,-1,model['Type']+': '+model['name']+': '),0,WACV)
             for ix,item in enumerate(['x','y','z']):
                 posRef = wx.CheckBox(MCSA,-1,label=item+': ')
@@ -4334 +4335 @@
                 posRef.Bind(wx.EVT_CHECKBOX,OnPosRef)
                 Indx[posRef.GetId()] = [model,'Pos',ix]
-                rbsizer1.Add(posRef,0,wx.ALIGN_CENTER_VERTICAL)
+                rbsizer1.Add(posRef,0,WACV)
                 posVal = wx.TextCtrl(MCSA,-1,'%.4f'%(model['Pos'][0][ix]),style=wx.TE_PROCESS_ENTER)
                 posVal.Bind(wx.EVT_TEXT_ENTER,OnPosVal)
                 posVal.Bind(wx.EVT_KILL_FOCUS,OnPosVal)
                 Indx[posVal.GetId()] = [model,'Pos',ix]
-                rbsizer1.Add(posVal,0,wx.ALIGN_CENTER_VERTICAL)
+                rbsizer1.Add(posVal,0,WACV)
             molcent = wx.CheckBox(MCSA,-1,label=' Use mol. center? ')
             molcent.SetValue(model['MolCent'][1])
             molcent.Bind(wx.EVT_CHECKBOX,OnMolCent)
             Indx[molcent.GetId()] = model
-            rbsizer1.Add(molcent,0,wx.ALIGN_CENTER_VERTICAL)
+            rbsizer1.Add(molcent,0,WACV)
             for ix,item in enumerate(['x','y','z']):
-                rbsizer1.Add(wx.StaticText(MCSA,-1,' Range: '),0,wx.ALIGN_CENTER_VERTICAL)
+                rbsizer1.Add(wx.StaticText(MCSA,-1,' Range: '),0,WACV)
                 rmin,rmax = model['Pos'][2][ix]
                 posRange = wx.TextCtrl(MCSA,-1,'%.3f %.3f'%(rmin,rmax),style=wx.TE_PROCESS_ENTER)
@@ -4352 +4353 @@
                 posRange.Bind(wx.EVT_TEXT_ENTER,OnPosRange)
                 posRange.Bind(wx.EVT_KILL_FOCUS,OnPosRange)
-                rbsizer1.Add(posRange,0,wx.ALIGN_CENTER_VERTICAL)
+                rbsizer1.Add(posRange,0,WACV)
                 
             rbsizer2 = wx.FlexGridSizer(1,6,5,5)
             Ori = model['Ori'][0]
-            rbsizer2.Add(wx.StaticText(MCSA,-1,'Oa: '),0,wx.ALIGN_CENTER_VERTICAL)
+            rbsizer2.Add(wx.StaticText(MCSA,-1,'Oa: '),0,WACV)
             angVal = wx.TextCtrl(MCSA,-1,'%.5f'%(Ori[0]),style=wx.TE_PROCESS_ENTER)
             angVal.Bind(wx.EVT_TEXT_ENTER,OnOriVal)
             angVal.Bind(wx.EVT_KILL_FOCUS,OnOriVal)
-            rbsizer2.Add(angVal,0,wx.ALIGN_CENTER_VERTICAL)
-            rbsizer2.Add(wx.StaticText(MCSA,-1,'Oi,Oj,Ok: '),0,wx.ALIGN_CENTER_VERTICAL)
+            rbsizer2.Add(angVal,0,WACV)
+            rbsizer2.Add(wx.StaticText(MCSA,-1,'Oi,Oj,Ok: '),0,WACV)
             vecVal = wx.TextCtrl(MCSA,-1,'%.3f %.3f %.3f'%(Ori[1],Ori[2],Ori[3]),style=wx.TE_PROCESS_ENTER)
             vecVal.Bind(wx.EVT_TEXT_ENTER,OnOriVal)
@@ -4367 +4368 @@
             Indx[angVal.GetId()] = [model,0,angVal,vecVal]
             Indx[vecVal.GetId()] = [model,1,angVal,vecVal]
-            rbsizer2.Add(vecVal,0,wx.ALIGN_CENTER_VERTICAL)
-            rbsizer2.Add(wx.StaticText(MCSA,-1,' Vary? '),0,wx.ALIGN_CENTER_VERTICAL)
+            rbsizer2.Add(vecVal,0,WACV)
+            rbsizer2.Add(wx.StaticText(MCSA,-1,' Vary? '),0,WACV)
             choice = [' ','A','AV']
             orvar = wx.ComboBox(MCSA,-1,value=model['Ovar'],choices=choice,
@@ -4374 +4375 @@
             orvar.Bind(wx.EVT_COMBOBOX, OnOrVar)
             Indx[orvar.GetId()] = model
-            rbsizer2.Add(orvar,0,wx.ALIGN_CENTER_VERTICAL)
-            rbsizer2.Add(wx.StaticText(MCSA,-1,' Range: Oa: '),0,wx.ALIGN_CENTER_VERTICAL)
+            rbsizer2.Add(orvar,0,WACV)
+            rbsizer2.Add(wx.StaticText(MCSA,-1,' Range: Oa: '),0,WACV)
             Rge = model['Ori'][2]
             angRange = wx.TextCtrl(MCSA,-1,'%.3f %.3f'%(Rge[0][0],Rge[0][1]),style=wx.TE_PROCESS_ENTER)
@@ -4381 +4382 @@
             angRange.Bind(wx.EVT_TEXT_ENTER,OnPosRange)
             angRange.Bind(wx.EVT_KILL_FOCUS,OnPosRange)
-            rbsizer2.Add(angRange,0,wx.ALIGN_CENTER_VERTICAL)
-            rbsizer2.Add(wx.StaticText(MCSA,-1,'Oi,Oj,Ok: '),0,wx.ALIGN_CENTER_VERTICAL)
+            rbsizer2.Add(angRange,0,WACV)
+            rbsizer2.Add(wx.StaticText(MCSA,-1,'Oi,Oj,Ok: '),0,WACV)
             for io,item in enumerate(['Oi','Oj','Ok']):
                 rmin,rmax = Rge[io+1]
@@ -4389 +4390 @@
                 vecRange.Bind(wx.EVT_TEXT_ENTER,OnPosRange)
                 vecRange.Bind(wx.EVT_KILL_FOCUS,OnPosRange)
-                rbsizer2.Add(vecRange,0,wx.ALIGN_CENTER_VERTICAL)
+                rbsizer2.Add(vecRange,0,WACV)
             rbsizer.Add(rbsizer1)    
             rbsizer.Add(rbsizer2)    
             if model['Type'] == 'Residue':
                 atNames = RBData['Residue'][model['RBId']]['atNames']
-                rbsizer.Add(wx.StaticText(MCSA,-1,'Torsions:'),0,wx.ALIGN_CENTER_VERTICAL)
+                rbsizer.Add(wx.StaticText(MCSA,-1,'Torsions:'),0,WACV)
                 rbsizer3 = wx.FlexGridSizer(1,8,5,5)
                 for it,tor in enumerate(model['Tor'][0]):
@@ -4403 +4404 @@
                     torRef.Bind(wx.EVT_CHECKBOX,OnPosRef)
                     Indx[torRef.GetId()] = [model,'Tor',it]
-                    rbsizer3.Add(torRef,0,wx.ALIGN_CENTER_VERTICAL)
+                    rbsizer3.Add(torRef,0,WACV)
                     torVal = wx.TextCtrl(MCSA,-1,'%.4f'%(tor),style=wx.TE_PROCESS_ENTER)
                     torVal.Bind(wx.EVT_TEXT_ENTER,OnPosVal)
                     torVal.Bind(wx.EVT_KILL_FOCUS,OnPosVal)
                     Indx[torVal.GetId()] = [model,'Tor',it]
-                    rbsizer3.Add(torVal,0,wx.ALIGN_CENTER_VERTICAL)
-                    rbsizer3.Add(wx.StaticText(MCSA,-1,' Range: '),0,wx.ALIGN_CENTER_VERTICAL)
+                    rbsizer3.Add(torVal,0,WACV)
+                    rbsizer3.Add(wx.StaticText(MCSA,-1,' Range: '),0,WACV)
                     rmin,rmax = model['Tor'][2][it]
                     torRange = wx.TextCtrl(MCSA,-1,'%.3f %.3f'%(rmin,rmax),style=wx.TE_PROCESS_ENTER)
@@ -4415 +4416 @@
                     torRange.Bind(wx.EVT_TEXT_ENTER,OnPosRange)
                     torRange.Bind(wx.EVT_KILL_FOCUS,OnPosRange)
-                    rbsizer3.Add(torRange,0,wx.ALIGN_CENTER_VERTICAL)
+                    rbsizer3.Add(torRange,0,WACV)
                 rbsizer.Add(rbsizer3)
                 
@@ -4463 +4464 @@
             poRef.SetValue(POData['Coef'][1])
             poRef.Bind(wx.EVT_CHECKBOX,OnPORef)
-            poSizer.Add(poRef,0,wx.ALIGN_CENTER_VERTICAL)
+            poSizer.Add(poRef,0,WACV)
             poVal = wx.TextCtrl(MCSA,-1,'%.3f'%(POData['Coef'][0]),style=wx.TE_PROCESS_ENTER)
             poVal.Bind(wx.EVT_TEXT_ENTER,OnPOVal)
             poVal.Bind(wx.EVT_KILL_FOCUS,OnPOVal)
-            poSizer.Add(poVal,0,wx.ALIGN_CENTER_VERTICAL)
-            poSizer.Add(wx.StaticText(MCSA,-1,' Range: '),0,wx.ALIGN_CENTER_VERTICAL)
+            poSizer.Add(poVal,0,WACV)
+            poSizer.Add(wx.StaticText(MCSA,-1,' Range: '),0,WACV)
             rmin,rmax = POData['Coef'][2]
             poRange = wx.TextCtrl(MCSA,-1,'%.3f %.3f'%(rmin,rmax),style=wx.TE_PROCESS_ENTER)
             poRange.Bind(wx.EVT_TEXT_ENTER,OnPORange)
             poRange.Bind(wx.EVT_KILL_FOCUS,OnPORange)
-            poSizer.Add(poRange,0,wx.ALIGN_CENTER_VERTICAL)                       
-            poSizer.Add(wx.StaticText(MCSA,-1,' Unique axis, H K L: '),0,wx.ALIGN_CENTER_VERTICAL)
+            poSizer.Add(poRange,0,WACV)                       
+            poSizer.Add(wx.StaticText(MCSA,-1,' Unique axis, H K L: '),0,WACV)
             h,k,l = POData['axis']
             poAxis = wx.TextCtrl(MCSA,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)
             poAxis.Bind(wx.EVT_TEXT_ENTER,OnPOAxis)
             poAxis.Bind(wx.EVT_KILL_FOCUS,OnPOAxis)
-            poSizer.Add(poAxis,0,wx.ALIGN_CENTER_VERTICAL)
+            poSizer.Add(poAxis,0,WACV)
             return poSizer
             
@@ -4546 +4547 @@
         if not data['MCSA']['Models']:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(MCSA,-1,'No MC/SA models:'),0,wx.ALIGN_CENTER_VERTICAL)
+            mainSizer.Add(wx.StaticText(MCSA,-1,'No MC/SA models:'),0,WACV)
             mainSizer.Add((5,5),0)
         else:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(MCSA,-1,'MC/SA models:'),0,wx.ALIGN_CENTER_VERTICAL)
+            mainSizer.Add(wx.StaticText(MCSA,-1,'MC/SA models:'),0,WACV)
             mainSizer.Add((5,5),0)
             for model in data['MCSA']['Models']:
@@ -4568 +4569 @@
         if not data['MCSA']['Results']:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(MCSA,-1,'No MC/SA results:'),0,wx.ALIGN_CENTER_VERTICAL)
+            mainSizer.Add(wx.StaticText(MCSA,-1,'No MC/SA results:'),0,WACV)
             mainSizer.Add((5,5),0)
         else:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(MCSA,-1,'MC/SA results:'),0,wx.ALIGN_CENTER_VERTICAL)
+            mainSizer.Add(wx.StaticText(MCSA,-1,'MC/SA results:'),0,WACV)
             mainSizer.Add((5,5),0)
             Results = data['MCSA']['Results']

trunk/GSASIIpwdGUI.py

@@ -40 +40 @@
 import GSASIIElemGUI as G2elemGUI
 import GSASIIElem as G2elem
+import GSASIIsasd as G2sasd
 VERY_LIGHT_GREY = wx.Colour(235,235,235)
+WACV = wx.ALIGN_CENTER_VERTICAL
 # trig functions in degrees
 sind = lambda x: math.sin(x*math.pi/180.)
@@ -81 +83 @@
 def SetDefaultSASDModel():
     'Fills in default items for the SASD Models dictionary'    
-    return {'Back':[0.0,False],'Size':{'MinMaxDiam':[50.,10000.],'Nbins':100,
-        'Method':'MaxEnt','Distribution':[],
+    return {'Back':[0.0,False],'Size':{'MinDiam':50,'MaxDiam':10000,'Nbins':100,
+        'logBins':True,'Method':'MaxEnt','Distribution':[],
         'Shape':['Spheroid',1.0],'MaxEnt':{'Niter':100,'Precision':0.01,'Sky':1e-6},
         'IPG':{'Niter':100,'Approach':0.8},'Reg':{},},            
         'Unified':{'Levels':[],},            
         'Particle':{'Levels':[],},
+        'Current':'Size dist.',
         }
         
@@ -459 +462 @@
         backSizer = wx.BoxSizer(wx.VERTICAL)
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
-        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Background function: '),0,wx.ALIGN_CENTER_VERTICAL)
+        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Background function: '),0,WACV)
         bakType = wx.ComboBox(G2frame.dataDisplay,value=data[0][0],
                 choices=Choices,style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -468 +471 @@
         bakRef.SetValue(bool(data[0][1]))
         bakRef.Bind(wx.EVT_CHECKBOX, OnBakRef)
-        topSizer.Add(bakRef,0,wx.ALIGN_CENTER_VERTICAL)
-        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' No. coeff.: '),0,wx.ALIGN_CENTER_VERTICAL)
+        topSizer.Add(bakRef,0,WACV)
+        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' No. coeff.: '),0,WACV)
         bakTerms = wx.ComboBox(G2frame.dataDisplay,-1,value=str(data[0][2]),choices=[str(i+1) for i in range(36)],
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         bakTerms.Bind(wx.EVT_COMBOBOX,OnBakTerms)
-        topSizer.Add(bakTerms,0,wx.ALIGN_CENTER_VERTICAL)
+        topSizer.Add(bakTerms,0,WACV)
         topSizer.Add((5,0),0)
         backSizer.Add(topSizer)
-        backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Background coefficients:'),0,wx.ALIGN_CENTER_VERTICAL)
+        backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Background coefficients:'),0,WACV)
         bakSizer = wx.FlexGridSizer(1,5,5,5)
         for i,value in enumerate(data[0][3:]):
             bakVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,'%10.4f'%(value),style=wx.TE_PROCESS_ENTER)
-            bakSizer.Add(bakVal,0,wx.ALIGN_CENTER_VERTICAL)
+            bakSizer.Add(bakVal,0,WACV)
             ValObj[bakVal.GetId()] = [i+3]
             bakVal.Bind(wx.EVT_TEXT_ENTER,OnBakVal)
@@ -522 +525 @@
         debSizer = wx.BoxSizer(wx.VERTICAL)
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
-        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Debye scattering: '),0,wx.ALIGN_CENTER_VERTICAL)
-        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' No. coeff.: '),0,wx.ALIGN_CENTER_VERTICAL)
+        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Debye scattering: '),0,WACV)
+        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' No. coeff.: '),0,WACV)
         debTerms = wx.ComboBox(G2frame.dataDisplay,-1,value=str(data[1]['nDebye']),choices=[str(i) for i in range(12)],
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         debTerms.Bind(wx.EVT_COMBOBOX,OnDebTerms)
-        topSizer.Add(debTerms,0,wx.ALIGN_CENTER_VERTICAL)
+        topSizer.Add(debTerms,0,WACV)
         topSizer.Add((5,0),0)
         debSizer.Add(topSizer)
         if data[1]['nDebye']:
-            debSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Debye diffuse terms:'),0,wx.ALIGN_CENTER_VERTICAL)       
+            debSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Debye diffuse terms:'),0,WACV)       
             rowLabels = []
             for i in range(len(data[1]['debyeTerms'])): rowLabels.append(str(i))
@@ -580 +583 @@
         peaksSizer = wx.BoxSizer(wx.VERTICAL)
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
-        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Peaks in background: '),0,wx.ALIGN_CENTER_VERTICAL)
-        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' No. peaks: '),0,wx.ALIGN_CENTER_VERTICAL)
+        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Peaks in background: '),0,WACV)
+        topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' No. peaks: '),0,WACV)
         peaks = wx.ComboBox(G2frame.dataDisplay,-1,value=str(data[1]['nPeaks']),choices=[str(i) for i in range(12)],
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         peaks.Bind(wx.EVT_COMBOBOX,OnPeaks)
-        topSizer.Add(peaks,0,wx.ALIGN_CENTER_VERTICAL)
+        topSizer.Add(peaks,0,WACV)
         topSizer.Add((5,0),0)
         peaksSizer.Add(topSizer)
         if data[1]['nPeaks']:
-            peaksSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Peak list:'),0,wx.ALIGN_CENTER_VERTICAL)       
+            peaksSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Peak list:'),0,WACV)       
             rowLabels = []
             for i in range(len(data[1]['peaksList'])): rowLabels.append(str(i))
@@ -964 +967 @@
     topSizer = wx.FlexGridSizer(1,6,5,5)
     instSizer = wx.FlexGridSizer(2,6,5,5)
-    topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Histogram Type: '+insVal['Type']),0,wx.ALIGN_CENTER_VERTICAL)
+    topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Histogram Type: '+insVal['Type']),0,WACV)
 #    topSizer.Add((5,5),0)
     if 'P' in insVal['Type']:                   #powder data
@@ -983 +986 @@
                 insRef['Azimuth'] = False
             #end of patch
-            topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'  Azimuth: %7.2f'%(insVal['Azimuth'])),0,wx.ALIGN_CENTER_VERTICAL)
+            topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'  Azimuth: %7.2f'%(insVal['Azimuth'])),0,WACV)
             if 'Lam1' in insVal:
                 topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'  Ka1/Ka2:'),
-                        0,wx.ALIGN_CENTER_VERTICAL)
+                        0,WACV)
                 topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,u'  %8.6f/%8.6f\xc5'%(insVal['Lam1'],insVal['Lam2'])),
-                        0,wx.ALIGN_CENTER_VERTICAL)
+                        0,WACV)
                 waveSizer = wx.BoxSizer(wx.HORIZONTAL)
-                waveSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'  Select: '),0,wx.ALIGN_CENTER_VERTICAL)
+                waveSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'  Select: '),0,WACV)
                 choice = ['TiKa','CrKa','FeKa','CoKa','CuKa','MoKa','AgKa']
                 lamPick = wx.ComboBox(G2frame.dataDisplay,value=' ',choices=choice,style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -997 +1000 @@
                 topSizer.Add(waveSizer,0)
                 instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' I(L2)/I(L1): (%10.4f)'%(insDef['I(L2)/I(L1)'])),
-                        0,wx.ALIGN_CENTER_VERTICAL)
+                        0,WACV)
                 ratVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,'%10.4f'%(insVal['I(L2)/I(L1)']),style=wx.TE_PROCESS_ENTER)
                 ratVal.Bind(wx.EVT_TEXT_ENTER,OnRatValue)
@@ -1005 +1008 @@
                 ratRef.SetValue(bool(insRef['I(L2)/I(L1)']))
                 ratRef.Bind(wx.EVT_CHECKBOX, OnRatRef)
-                instSizer.Add(ratRef,0,wx.ALIGN_CENTER_VERTICAL)
+                instSizer.Add(ratRef,0,WACV)
                 
             else:
                 topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,u' Lam (\xc5): (%10.6f)'%(insDef['Lam'])),
-                    0,wx.ALIGN_CENTER_VERTICAL)
+                    0,WACV)
                 waveVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,'%10.6f'%(insVal['Lam']),style=wx.TE_PROCESS_ENTER)
                 waveVal.Bind(wx.EVT_TEXT_ENTER,OnWaveValue)
                 waveVal.Bind(wx.EVT_KILL_FOCUS,OnWaveValue)
-                topSizer.Add(waveVal,0,wx.ALIGN_CENTER_VERTICAL)
+                topSizer.Add(waveVal,0,WACV)
                 if ifHisto:
                     waveRef = wx.CheckBox(G2frame.dataDisplay,label=' Refine?')
                     waveRef.SetValue(bool(insRef['Lam']))
                     waveRef.Bind(wx.EVT_CHECKBOX, OnWaveRef)
-                    topSizer.Add(waveRef,0,wx.ALIGN_CENTER_VERTICAL)
+                    topSizer.Add(waveRef,0,WACV)
             for item in ['Zero','Polariz.']:
                 fmt = '%10.4f'
@@ -1024 +1027 @@
                 if item in insDef:
                     instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,Fmt%(item,insDef[item])),
-                            0,wx.ALIGN_CENTER_VERTICAL)
+                            0,WACV)
                     itemVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,fmt%(insVal[item]),style=wx.TE_PROCESS_ENTER)
                     ValObj[itemVal.GetId()] = [item,fmt]
                     itemVal.Bind(wx.EVT_TEXT_ENTER,OnItemValue)
                     itemVal.Bind(wx.EVT_KILL_FOCUS,OnItemValue)
-                    instSizer.Add(itemVal,0,wx.ALIGN_CENTER_VERTICAL)
+                    instSizer.Add(itemVal,0,WACV)
                     if ifHisto:
                         itemRef = wx.CheckBox(G2frame.dataDisplay,wx.ID_ANY,label=' Refine?')
@@ -1035 +1038 @@
                         RefObj[itemRef.GetId()] = item
                         itemRef.Bind(wx.EVT_CHECKBOX, OnItemRef)
-                        instSizer.Add(itemRef,0,wx.ALIGN_CENTER_VERTICAL)
+                        instSizer.Add(itemRef,0,WACV)
                     else:
                         instSizer.Add((5,5),0)
@@ -1048 +1051 @@
                 Fmt = ' %s: ('+fmt+')'
                 instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,Fmt%(item,insDef[item])),
-                        0,wx.ALIGN_CENTER_VERTICAL)
+                        0,WACV)
                 itemVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,fmt%(insVal[item]),style=wx.TE_PROCESS_ENTER)
                 ValObj[itemVal.GetId()] = [item,fmt]
                 itemVal.Bind(wx.EVT_TEXT_ENTER,OnItemValue)
                 itemVal.Bind(wx.EVT_KILL_FOCUS,OnItemValue)
-                instSizer.Add(itemVal,0,wx.ALIGN_CENTER_VERTICAL)
+                instSizer.Add(itemVal,0,WACV)
                 itemRef = wx.CheckBox(G2frame.dataDisplay,wx.ID_ANY,label=' Refine?')
                 itemRef.SetValue(bool(insRef[item]))
                 RefObj[itemRef.GetId()] = item
                 itemRef.Bind(wx.EVT_CHECKBOX, OnItemRef)
-                instSizer.Add(itemRef,0,wx.ALIGN_CENTER_VERTICAL)
+                instSizer.Add(itemRef,0,WACV)
         else:                                   #time of flight (neutrons)
-            topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Azimuth: %7.2f'%(insVal['Azimuth'])),0,wx.ALIGN_CENTER_VERTICAL)
-            topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' 2-theta: %7.2f'%(insVal['2-theta'])),0,wx.ALIGN_CENTER_VERTICAL)
+            topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Azimuth: %7.2f'%(insVal['Azimuth'])),0,WACV)
+            topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' 2-theta: %7.2f'%(insVal['2-theta'])),0,WACV)
             if 'Pdabc' in Inst2:
                 Items = ['sig-0','sig-1','X','Y']
-                topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' difC: %8.2f'%(insVal['difC'])),0,wx.ALIGN_CENTER_VERTICAL)
-                topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' alpha, beta: fixed by table'),0,wx.ALIGN_CENTER_VERTICAL)
+                topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' difC: %8.2f'%(insVal['difC'])),0,WACV)
+                topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' alpha, beta: fixed by table'),0,WACV)
             else:
                 Items = ['difC','difA','Zero','alpha','beta-0','beta-1','beta-q','sig-0','sig-1','sig-q','X','Y']
@@ -1074 +1077 @@
                 Fmt = ' %s: ('+fmt+')'
                 instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,Fmt%(item,insDef[item])),
-                        0,wx.ALIGN_CENTER_VERTICAL)
+                        0,WACV)
                 itemVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,fmt%(insVal[item]),style=wx.TE_PROCESS_ENTER)
                 ValObj[itemVal.GetId()] = [item,fmt]
                 itemVal.Bind(wx.EVT_TEXT_ENTER,OnItemValue)
                 itemVal.Bind(wx.EVT_KILL_FOCUS,OnItemValue)
-                instSizer.Add(itemVal,0,wx.ALIGN_CENTER_VERTICAL)
+                instSizer.Add(itemVal,0,WACV)
                 if not ifHisto and item in ['difC','difA','Zero',]:
                     instSizer.Add((5,5),0)
@@ -1087 +1090 @@
                     RefObj[itemRef.GetId()] = item
                     itemRef.Bind(wx.EVT_CHECKBOX, OnItemRef)
-                    instSizer.Add(itemRef,0,wx.ALIGN_CENTER_VERTICAL)
+                    instSizer.Add(itemRef,0,WACV)
         
     elif 'S' in insVal['Type']:                       #single crystal data
         if 'C' in insVal['Type']:               #constant wavelength
             instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,u' Lam (\xc5): (%10.6f)'%(insDef['Lam'])),
-                0,wx.ALIGN_CENTER_VERTICAL)
+                0,WACV)
             waveVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,'%10.6f'%(insVal['Lam']),style=wx.TE_PROCESS_ENTER)
             waveVal.Bind(wx.EVT_TEXT_ENTER,OnWaveValue)
             waveVal.Bind(wx.EVT_KILL_FOCUS,OnWaveValue)
-            instSizer.Add(waveVal,0,wx.ALIGN_CENTER_VERTICAL)
+            instSizer.Add(waveVal,0,WACV)
         else:                                   #time of flight (neutrons)
             pass                                #for now
@@ -1102 +1105 @@
         if 'C' in insVal['Type']:        
             instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,u' Lam (\xc5): (%10.6f)'%(insDef['Lam'])),
-                0,wx.ALIGN_CENTER_VERTICAL)
+                0,WACV)
             waveVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,'%10.6f'%(insVal['Lam']),style=wx.TE_PROCESS_ENTER)
             waveVal.Bind(wx.EVT_TEXT_ENTER,OnWaveValue)
             waveVal.Bind(wx.EVT_KILL_FOCUS,OnWaveValue)
-            instSizer.Add(waveVal,0,wx.ALIGN_CENTER_VERTICAL)
-            instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'  Azimuth: %7.2f'%(insVal['Azimuth'])),0,wx.ALIGN_CENTER_VERTICAL)
+            instSizer.Add(waveVal,0,WACV)
+            instSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'  Azimuth: %7.2f'%(insVal['Azimuth'])),0,WACV)
         else:                                   #time of flight (neutrons)
             pass                                #for now
@@ -1391 +1394 @@
     nameSizer = wx.BoxSizer(wx.HORIZONTAL)
     nameSizer.Add(wx.StaticText(G2frame.dataDisplay,wx.ID_ANY,' Instrument Name'),
-                0,wx.ALIGN_CENTER_VERTICAL)
+                0,WACV)
     nameSizer.Add((-1,-1),1,wx.EXPAND,1)
     instNameVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,data.get('InstrName',''),
@@ -1403 +1406 @@
         nameSizer = wx.BoxSizer(wx.HORIZONTAL)
         nameSizer.Add(wx.StaticText(G2frame.dataDisplay,wx.ID_ANY,' Diffractometer type: '),
-                    0,wx.ALIGN_CENTER_VERTICAL)
+                    0,WACV)
         choices = ['Debye-Scherrer','Bragg-Brentano',]
         histoType = wx.ComboBox(G2frame.dataDisplay,wx.ID_ANY,value=data['Type'],choices=choices,
@@ -1416 +1419 @@
         if 'list' in str(type(data[key])):
             parmRef = G2gd.G2CheckBox(G2frame.dataDisplay,' '+lbl,data[key],1)
-            parmSizer.Add(parmRef,0,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
+            parmSizer.Add(parmRef,0,WACV|wx.EXPAND)
             parmVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,data[key],0,
                 nDig=nDig,typeHint=float,OnLeave=AfterChange)
         else:
             parmSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' '+lbl),
-                0,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
+                0,WACV|wx.EXPAND)
             parmVal = G2gd.ValidatedTxtCtrl(G2frame.dataDisplay,data,key,
                 typeHint=float,OnLeave=AfterChange)
@@ -1444 +1447 @@
             G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Substances'))
         for id,item in enumerate(data['Materials']):
-            subSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Material: '),0,wx.ALIGN_CENTER_VERTICAL)
+            subSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Material: '),0,WACV)
             matsel = wx.ComboBox(G2frame.dataDisplay,value=item['Name'],choices=Substances['Substances'].keys(),
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             Info[matsel.GetId()] = [id,'Name']
             matsel.Bind(wx.EVT_COMBOBOX,OnMaterial)        
-            subSizer.Add(matsel,0,wx.ALIGN_CENTER_VERTICAL)
-            subSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Volume fraction: '),0,wx.ALIGN_CENTER_VERTICAL)
+            subSizer.Add(matsel,0,WACV)
+            subSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Volume fraction: '),0,WACV)
             volfrac = wx.TextCtrl(G2frame.dataDisplay,value=str('%.3f'%(item['VolFrac'])),style=wx.TE_PROCESS_ENTER)
             Info[volfrac.GetId()] = [id,'VolFrac']
             volfrac.Bind(wx.EVT_TEXT_ENTER,OnMaterial)
             volfrac.Bind(wx.EVT_KILL_FOCUS,OnMaterial)
-            subSizer.Add(volfrac,0,wx.ALIGN_CENTER_VERTICAL)
+            subSizer.Add(volfrac,0,WACV)
             material = Substances['Substances'][item['Name']]
             mu += item['VolFrac']*material.get('XAbsorption',0.)
@@ -1463 +1466 @@
         mainSizer.Add(subSizer,0)
         conSizer = wx.BoxSizer(wx.HORIZONTAL)
-        conSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Contrast: %10.2f '%(data['Contrast'][0])),0,wx.ALIGN_CENTER_VERTICAL)
-        conSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Anom. Contrast: %10.2f '%(data['Contrast'][1])),0,wx.ALIGN_CENTER_VERTICAL)
+        conSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Contrast: %10.2f '%(data['Contrast'][0])),0,WACV)
+        conSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Anom. Contrast: %10.2f '%(data['Contrast'][1])),0,WACV)
         mut =  mu*data['Thick']
-        conSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Transmission (calc): %10.3f  '%(np.exp(-mut))),0,wx.ALIGN_CENTER_VERTICAL)
+        conSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Transmission (calc): %10.3f  '%(np.exp(-mut))),0,WACV)
         mainSizer.Add(conSizer,0)
     
@@ -1935 +1938 @@
         G2frame.dataFrame.MakeNewPhase.Enable(True)        
     mainSizer = wx.BoxSizer(wx.VERTICAL)
-    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Indexing controls: '),0,wx.ALIGN_CENTER_VERTICAL)
+    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Indexing controls: '),0,WACV)
     mainSizer.Add((5,5),0)
     littleSizer = wx.FlexGridSizer(2,5,5,5)
-    littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Max Nc/Nobs '),0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Max Nc/Nobs '),0,WACV)
     NcNo = wx.SpinCtrl(G2frame.dataDisplay)
     NcNo.SetRange(1,6)
     NcNo.SetValue(controls[2])
     NcNo.Bind(wx.EVT_SPINCTRL,OnNcNo)
-    littleSizer.Add(NcNo,0,wx.ALIGN_CENTER_VERTICAL)
-    littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Start Volume '),0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(NcNo,0,WACV)
+    littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Start Volume '),0,WACV)
     startVol = wx.TextCtrl(G2frame.dataDisplay,value=str('%d'%(controls[3])),style=wx.TE_PROCESS_ENTER)
     startVol.Bind(wx.EVT_TEXT_ENTER,OnStartVol)
     startVol.Bind(wx.EVT_KILL_FOCUS,OnStartVol)
-    littleSizer.Add(startVol,0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(startVol,0,WACV)
     mainSizer.Add(littleSizer,0)
     mainSizer.Add((5,5),0)
     mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Select Bravais Lattices for indexing: '),
-        0,wx.ALIGN_CENTER_VERTICAL)
+        0,WACV)
     mainSizer.Add((5,5),0)
     littleSizer = wx.FlexGridSizer(2,7,5,5)
@@ -1962 +1965 @@
         bravCk.SetValue(brav)
         bravCk.Bind(wx.EVT_CHECKBOX,OnBravais)
-        littleSizer.Add(bravCk,0,wx.ALIGN_CENTER_VERTICAL)
+        littleSizer.Add(bravCk,0,WACV)
     mainSizer.Add(littleSizer,0)
     mainSizer.Add((5,5),0)
     
-    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Cell Refinement: '),0,wx.ALIGN_CENTER_VERTICAL)
+    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Cell Refinement: '),0,WACV)
     mainSizer.Add((5,5),0)
     littleSizer = wx.BoxSizer(wx.HORIZONTAL)
-    littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label=" Bravais lattice "),0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label=" Bravais lattice "),0,WACV)
     bravSel = wx.Choice(G2frame.dataDisplay,choices=bravaisSymb)
     bravSel.SetSelection(bravaisSymb.index(controls[5]))
     bravSel.Bind(wx.EVT_CHOICE,OnBravSel)
-    littleSizer.Add(bravSel,0,wx.ALIGN_CENTER_VERTICAL)
-    littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label=" Space group "),0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(bravSel,0,WACV)
+    littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label=" Space group "),0,WACV)
     spcSel = wx.Choice(G2frame.dataDisplay,choices=SPGlist[controls[5]])
     spcSel.SetSelection(SPGlist[controls[5]].index(controls[13]))
     spcSel.Bind(wx.EVT_CHOICE,OnSpcSel)
-    littleSizer.Add(spcSel,0,wx.ALIGN_CENTER_VERTICAL)
-    littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label=" Zero offset"),0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(spcSel,0,WACV)
+    littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label=" Zero offset"),0,WACV)
     zero = wx.TextCtrl(G2frame.dataDisplay,value="%.4f"%(controls[1]),style=wx.TE_PROCESS_ENTER)
     zero.Bind(wx.EVT_TEXT_ENTER,OnZero)
     zero.Bind(wx.EVT_KILL_FOCUS,OnZero)
-    littleSizer.Add(zero,0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(zero,0,WACV)
     zeroVar = wx.CheckBox(G2frame.dataDisplay,label="Refine?")
     zeroVar.SetValue(controls[0])
     zeroVar.Bind(wx.EVT_CHECKBOX,OnZeroVar)
-    littleSizer.Add(zeroVar,0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(zeroVar,0,WACV)
     hklShow = wx.Button(G2frame.dataDisplay,label="Show hkl positions")
     hklShow.Bind(wx.EVT_BUTTON,OnHklShow)
-    littleSizer.Add(hklShow,0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(hklShow,0,WACV)
     mainSizer.Add(littleSizer,0)
     
@@ -2001 +2004 @@
     littleSizer = wx.FlexGridSizer(2,useGUI[1],5,5)
     for txt,fmt,ifEdit,Id in useGUI[2]:
-        littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label=txt),0,wx.ALIGN_CENTER_VERTICAL)
+        littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label=txt),0,WACV)
         if ifEdit:          #a,b,c,etc.
             cellVal = wx.TextCtrl(G2frame.dataDisplay,value=(fmt%(controls[6+Id])),style=wx.TE_PROCESS_ENTER)
             cellVal.Bind(wx.EVT_TEXT_ENTER,OnCellChange)        
             cellVal.Bind(wx.EVT_KILL_FOCUS,OnCellChange)
-            littleSizer.Add(cellVal,0,wx.ALIGN_CENTER_VERTICAL)
+            littleSizer.Add(cellVal,0,WACV)
             cellList.append(cellVal.GetId())
         else:               #volume
             volVal = wx.TextCtrl(G2frame.dataDisplay,value=(fmt%(controls[12])),style=wx.TE_READONLY)
             volVal.SetBackgroundColour(VERY_LIGHT_GREY)
-            littleSizer.Add(volVal,0,wx.ALIGN_CENTER_VERTICAL)
+            littleSizer.Add(volVal,0,WACV)
     mainSizer.Add(littleSizer,0)
         
@@ -2345 +2348 @@
         substSizer = wx.BoxSizer(wx.VERTICAL)
         substSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Substance list: wavelength: %.5fA'%(wave)),
-            0,wx.ALIGN_CENTER_VERTICAL)
+            0,WACV)
         for name in data['Substances']:
             G2gd.HorizontalLine(substSizer,G2frame.dataDisplay)    
             substSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Data for '+name+':'),
-                0,wx.ALIGN_CENTER_VERTICAL)
+                0,WACV)
             if name == 'vacuum':
                 substSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='        Not applicable'),
-                    0,wx.ALIGN_CENTER_VERTICAL)
+                    0,WACV)
             else:    
                 elSizer = wx.FlexGridSizer(1,6,5,5)
@@ -2359 +2362 @@
                 for El in Elems:
                     elSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' '+El+': '),
-                        0,wx.ALIGN_CENTER_VERTICAL)
+                        0,WACV)
                     num = wx.TextCtrl(G2frame.dataDisplay,value='%.2f'%(Elems[El]['Num']),style=wx.TE_PROCESS_ENTER)
                     Indx[num.GetId()] = [name,El,'Num']
                     num.Bind(wx.EVT_TEXT_ENTER,OnValueChange)        
                     num.Bind(wx.EVT_KILL_FOCUS,OnValueChange)
-                    elSizer.Add(num,0,wx.ALIGN_CENTER_VERTICAL)
+                    elSizer.Add(num,0,WACV)
                 substSizer.Add(elSizer,0)
                 vdsSizer = wx.FlexGridSizer(1,4,5,5)
                 vdsSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Volume: '),
-                    0,wx.ALIGN_CENTER_VERTICAL)
+                    0,WACV)
                 vol = wx.TextCtrl(G2frame.dataDisplay,value='%.3f'%(Substance['Volume']),style=wx.TE_PROCESS_ENTER)
                 Indx[vol.GetId()] = [name,'Volume']
                 vol.Bind(wx.EVT_TEXT_ENTER,OnValueChange)        
                 vol.Bind(wx.EVT_KILL_FOCUS,OnValueChange)
-                vdsSizer.Add(vol,0,wx.ALIGN_CENTER_VERTICAL)                
+                vdsSizer.Add(vol,0,WACV)                
                 vdsSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Density: '),
-                    0,wx.ALIGN_CENTER_VERTICAL)
+                    0,WACV)
                 den = wx.TextCtrl(G2frame.dataDisplay,value='%.3f'%(Substance['Density']),style=wx.TE_PROCESS_ENTER)
                 Indx[den.GetId()] = [name,'Density']
                 den.Bind(wx.EVT_TEXT_ENTER,OnValueChange)        
                 den.Bind(wx.EVT_KILL_FOCUS,OnValueChange)
-                vdsSizer.Add(den,0,wx.ALIGN_CENTER_VERTICAL)
+                vdsSizer.Add(den,0,WACV)
                 substSizer.Add(vdsSizer,0)
                 substSizer.Add(wx.StaticText(G2frame.dataDisplay,
                     label=' Scattering density  : %.2f *10%scm%s'%(Substance['Scatt density'],Pwr10,Pwrm2)),
-                    0,wx.ALIGN_CENTER_VERTICAL)                
+                    0,WACV)                
                 substSizer.Add(wx.StaticText(G2frame.dataDisplay,
                     label=' Anomalous density : %.2f *10%scm%s'%(Substance['XAnom density'],Pwr10,Pwrm2)),
-                    0,wx.ALIGN_CENTER_VERTICAL)                
+                    0,WACV)                
                 substSizer.Add(wx.StaticText(G2frame.dataDisplay,
                     label=' X-ray absorption   : %.2f cm%s'%(Substance['XAbsorption'],Pwrm1)),
-                    0,wx.ALIGN_CENTER_VERTICAL)                
+                    0,WACV)                
         return substSizer
             
@@ -2427 +2430 @@
     '''respond to selection of SASD Models data tree item.
     '''
+    #patches
+    if 'Current' not in data:
+        data['Current'] = 'Size dist.'
+    if 'logBins' not in data['Size']:
+        data['Size']['logBins'] = True
+    if 'MinMaxDiam' in data['Size']:
+        data['Size']['MinDiam'] = 50
+        data['Size']['MaxDiam'] = 10000
+        del data['Size']['MinMaxDiam']
+    #end patches
     
     def OnCopyModel(event):
@@ -2433 +2446 @@
         
     def OnFitModel(event):
-        print 'fit model'
-        
+        print 'fit model for '+data['Current']
+        if data['Current'] == 'Size dist.':
+            G2sasd.SizeDistribution(Profile,Limits,Substances,Sample,data)
+        
+    def OnSelectFit(event):
+        data['Current'] = fitSel.GetValue()
+        wx.CallAfter(UpdateModelsGrid,G2frame,data)
+        
+    def OnValueChange(event):
+        Obj = event.GetEventObject()
+        itemKey,ind,fmt = Indx[Obj.GetId()]
+        try:
+            value = float(Obj.GetValue())
+        except ValueError:
+            value = 0.0
+        Obj.SetValue(fmt%(value))
+        data[itemKey][ind] = value
+        
+    def OnCheckBox(event):
+        Obj = event.GetEventObject()
+        itemKey,ind = Indx[Obj.GetId()]
+        data[itemKey][ind] = Obj.GetValue()
+        
+    def OnIntVal(event):
+        Obj = event.GetEventObject()
+        item,ind = Indx[Obj.GetId()]
+        item[ind] = int(Obj.GetValue())
+        
+    def SizeSizer():
+        
+        def OnShape(event):
+            data['Size']['Shape'][0] = partsh.GetValue()
+            wx.CallAfter(UpdateModelsGrid,G2frame,data)
+            
+        def OnMethod(event):
+            data['Size']['Method'] = method.GetValue()
+            wx.CallAfter(UpdateModelsGrid,G2frame,data)
+            
+        def OnPartVal(event):
+            try:
+                val = max(0.0,float(partprm.GetValue()))
+            except ValueError:
+                val = 1
+            data['Size']['Shape'][1] = val
+            partprm.SetValue('%.3f'%(val))
+            
+        for item in data['Size']: print item,data['Size'][item]
+        sizeSizer = wx.BoxSizer(wx.VERTICAL)
+        sizeSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Size distribution parameters: '),0,WACV)
+        binSizer = wx.FlexGridSizer(1,7,5,5)
+        binSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' No. size bins: '),0,WACV)
+        bins = ['50','100','150','200']
+        nbins = wx.ComboBox(G2frame.dataDisplay,value=str(data['Size']['Nbins']),choices=bins,
+            style=wx.CB_READONLY|wx.CB_DROPDOWN)
+        Indx[nbins.GetId()] = [data['Size'],'Nbins']
+        nbins.Bind(wx.EVT_COMBOBOX,OnIntVal)        
+        binSizer.Add(nbins,0,WACV)
+        binSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Min diam.: '),0,WACV)
+        minDias = ['10','25','50','100','150','200']
+        mindiam = wx.ComboBox(G2frame.dataDisplay,value=str(data['Size']['MinDiam']),choices=minDias,
+            style=wx.CB_READONLY|wx.CB_DROPDOWN)
+        mindiam.Bind(wx.EVT_COMBOBOX,OnIntVal)        
+        Indx[mindiam.GetId()] = [data['Size'],'MinDiam']
+        binSizer.Add(mindiam,0,WACV)
+        binSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Max diam.: '),0,WACV)
+        maxDias = [str(1000*(i+1)) for i in range(10)]
+        maxdiam = wx.ComboBox(G2frame.dataDisplay,value=str(data['Size']['MaxDiam']),choices=maxDias,
+            style=wx.CB_READONLY|wx.CB_DROPDOWN)
+        maxdiam.Bind(wx.EVT_COMBOBOX,OnIntVal)        
+        Indx[maxdiam.GetId()] = [data['Size'],'MaxDiam']
+        binSizer.Add(maxdiam,0,WACV)
+        logbins = wx.CheckBox(G2frame.dataDisplay,label='Log bins?')
+        Indx[logbins.GetId()] = ['Size','logBins']
+        logbins.SetValue(data['Size']['logBins'])
+        logbins.Bind(wx.EVT_CHECKBOX, OnCheckBox)
+        binSizer.Add(logbins,0,WACV)
+        sizeSizer.Add(binSizer,0)
+        sizeSizer.Add((5,5),0)
+        partSizer = wx.BoxSizer(wx.HORIZONTAL)
+        partSizer.Add(wx.StaticText(G2frame.dataDisplay,label='Particle description: '),0,WACV)
+        shapes = {'Spheroid':' Aspect ratio: ','Cylinder Diam.':' Diameter ','Cylinder AR':' Aspect ratio: ',
+            'Unified sphere':'','Unified rod':' Diameter: ','Unified rod AR':' Aspect ratio: ',
+            'Unified disk':' Thickness: '}
+        partsh = wx.ComboBox(G2frame.dataDisplay,value=str(data['Size']['Shape'][0]),choices=shapes.keys(),
+            style=wx.CB_READONLY|wx.CB_DROPDOWN)
+        partsh.Bind(wx.EVT_COMBOBOX,OnShape)        
+        partSizer.Add(partsh,0,WACV)
+        if data['Size']['Shape'][0] not in ['Unified sphere',]:
+            partSizer.Add(wx.StaticText(G2frame.dataDisplay,label=shapes[data['Size']['Shape'][0]]),0,WACV)
+            partprm = wx.TextCtrl(G2frame.dataDisplay,value='%.3f'%(data['Size']['Shape'][1]),
+                style=wx.TE_PROCESS_ENTER)
+            partprm.Bind(wx.EVT_TEXT_ENTER,OnPartVal)        
+            partprm.Bind(wx.EVT_KILL_FOCUS,OnPartVal)
+            partSizer.Add(partprm,0,WACV)
+        sizeSizer.Add(partSizer,0)
+        sizeSizer.Add((5,5),0)
+        fitSizer = wx.BoxSizer(wx.HORIZONTAL)
+        methods = ['MaxEnt','IPG',]
+        fitSizer.Add(wx.StaticText(G2frame.dataDisplay,label='Fitting method: '),0,WACV)
+        method = wx.ComboBox(G2frame.dataDisplay,value=data['Size']['Method'],choices=methods,
+            style=wx.CB_READONLY|wx.CB_DROPDOWN)
+        method.Bind(wx.EVT_COMBOBOX,OnMethod)
+        fitSizer.Add(method,0,WACV)
+        iters = ['10','25','50','100','150','200']        
+        fitSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' No. iterations: '),0,WACV)
+        Method = data['Size']['Method']
+        iter = wx.ComboBox(G2frame.dataDisplay,value=str(data['Size'][Method]['Niter']),choices=iters,
+            style=wx.CB_READONLY|wx.CB_DROPDOWN)
+        Indx[iter.GetId()] = [data['Size'][Method],'Niter']
+        iter.Bind(wx.EVT_COMBOBOX,OnIntVal)
+        fitSizer.Add(iter,0,WACV)
+        
+        sizeSizer.Add(fitSizer,0)
+
+        return sizeSizer
+        
+    def PartSizer():
+        for item in data['Particle']: print item,data['Particle'][item]
+        partSizer = wx.BoxSizer(wx.VERTICAL)
+        partSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Particle fit parameters: '),0,WACV)
+        return partSizer
+        
+    def UnifSizer():
+        for item in data['Unified']: print item,data['Unified'][item]
+        unifSizer = wx.BoxSizer(wx.VERTICAL)
+        unifSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Unified fit parameters: '),0,WACV)
+        return unifSizer
+        
+    Sample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Sample Parameters'))
+    Limits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Limits'))
+    Inst = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
+    Substances = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Substances'))
+    Profile = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)[1]
+
+    if G2frame.dataDisplay:
+        G2frame.dataFrame.DestroyChildren()
     G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.ModelMenu)
     if not G2frame.dataFrame.GetStatusBar():
@@ -2442 +2589 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnCopyModel, id=G2gd.wxID_MODELCOPY)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnFitModel, id=G2gd.wxID_MODELFIT)
+    Indx = {}
     mainSizer = wx.BoxSizer(wx.VERTICAL)
-    print data
+    topSizer = wx.BoxSizer(wx.HORIZONTAL)
+    models = ['Size dist.','Unified fit','Particle fit']
+    topSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Modeling by: '),0,WACV)
+    fitSel = wx.ComboBox(G2frame.dataDisplay,value=data['Current'],choices=models,
+        style=wx.CB_READONLY|wx.CB_DROPDOWN)
+    fitSel.Bind(wx.EVT_COMBOBOX,OnSelectFit)        
+    topSizer.Add(fitSel,0,WACV)
+    mainSizer.Add(topSizer)
+    G2gd.HorizontalLine(mainSizer,G2frame.dataDisplay)
+    if 'Size' in data['Current']:
+        mainSizer.Add(SizeSizer())        
+    elif 'Particle' in data['Current']:
+        mainSizer.Add(PartSizer())
+    elif 'Unified' in data['Current']:
+        mainSizer.Add(UnifSizer())
+    G2gd.HorizontalLine(mainSizer,G2frame.dataDisplay)    
+    backSizer = wx.BoxSizer(wx.HORIZONTAL)
+    backSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Background:'),0,WACV)
+    backVal = wx.TextCtrl(G2frame.dataDisplay,value='%.3f'%(data['Back'][0]),style=wx.TE_PROCESS_ENTER)
+    Indx[backVal.GetId()] = ['Back',0,'%.3f']
+    backVal.Bind(wx.EVT_TEXT_ENTER,OnValueChange)        
+    backVal.Bind(wx.EVT_KILL_FOCUS,OnValueChange)
+    backSizer.Add(backVal,0,WACV)
+    backVar = wx.CheckBox(G2frame.dataDisplay,label='Apply?')
+    Indx[backVar.GetId()] = ['Back',1]
+    backVar.SetValue(data['Back'][1])
+    backVar.Bind(wx.EVT_CHECKBOX, OnCheckBox)
+    backSizer.Add(backVar,0,WACV)
+    mainSizer.Add(backSizer)
 
     mainSizer.Layout()    
@@ -2510 +2686 @@
         item = data[key]
         fileList = np.array(GetFileList('PWDR')).T[1]
-        fileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' '+key+' file:'),0,wx.ALIGN_CENTER_VERTICAL)
+        fileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' '+key+' file:'),0,WACV)
         fileName = wx.ComboBox(G2frame.dataDisplay,value=item['Name'],choices=fileList,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -2516 +2692 @@
         fileName.Bind(wx.EVT_COMBOBOX,OnSelectFile)        
         fileSizer.Add(fileName,0,)
-        fileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='Multiplier:'),0,wx.ALIGN_CENTER_VERTICAL)
+        fileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='Multiplier:'),0,WACV)
         mult = wx.TextCtrl(G2frame.dataDisplay,value='%.3f'%(item['Mult']),style=wx.TE_PROCESS_ENTER)
         itemDict[mult.GetId()] = [key,'Mult','%.3f']
@@ -2522 +2698 @@
         mult.Bind(wx.EVT_KILL_FOCUS,OnValueChange)
         fileSizer.Add(mult,0,)
-        fileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='Add:'),0,wx.ALIGN_CENTER_VERTICAL)
+        fileSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='Add:'),0,WACV)
         add = wx.TextCtrl(G2frame.dataDisplay,value='%.0f'%(item['Add']),style=wx.TE_PROCESS_ENTER)
         itemDict[add.GetId()] = [key,'Add','%.0f']
@@ -2555 +2731 @@
         
         elemSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,
-            label=' Element: '+'%2s'%(ElData['Symbol'])+' * '),0,wx.ALIGN_CENTER_VERTICAL)
+            label=' Element: '+'%2s'%(ElData['Symbol'])+' * '),0,WACV)
         num = wx.TextCtrl(G2frame.dataDisplay,value='%.3f'%(ElData['FormulaNo']),style=wx.TE_PROCESS_ENTER)
         num.Bind(wx.EVT_TEXT_ENTER,OnFractionChange)        
         num.Bind(wx.EVT_KILL_FOCUS,OnFractionChange)
-        elemSizer.Add(num,0,wx.ALIGN_CENTER_VERTICAL)
+        elemSizer.Add(num,0,WACV)
         elemSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,
             label="f': %.3f"%(ElData['fp'])+' f": %.3f'%(ElData['fpp'])+' mu: %.2f barns'%(ElData['mu']) ),
-            0,wx.ALIGN_CENTER_VERTICAL)
+            0,WACV)
             
     def OnGeometry(event):
@@ -2852 +3028 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnComputeAllPDF, id=G2gd.wxID_PDFCOMPUTEALL)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
-    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' PDF data files: '),0,wx.ALIGN_CENTER_VERTICAL)
+    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' PDF data files: '),0,WACV)
     mainSizer.Add((5,5),0)
     str = ' Sample file: PWDR %s   Wavelength, A: %.5f  Energy, keV: %.3f  Polariz.: %.2f '%(dataFile[3:],wave,keV,polariz)
-    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=str),0,wx.ALIGN_CENTER_VERTICAL)
+    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=str),0,WACV)
 #    dataSizer = wx.BoxSizer(wx.HORIZONTAL)
-#    dataSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='Azimuth'),0,wx.ALIGN_CENTER_VERTICAL)
+#    dataSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='Azimuth'),0,WACV)
 #    azimVal = wx.TextCtrl(G2frame.dataDisplay,value='%.2f'%(inst['Azimuth']))
 #    azimVal.Bind(wx.EVT_TEXT_ENTER,OnAzimVal)        
 #    azimVal.Bind(wx.EVT_KILL_FOCUS,OnAzimVal)
 #    dataSizer.Add(azimVal,0)    
-#    dataSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='Polarization'),0,wx.ALIGN_CENTER_VERTICAL)
+#    dataSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label='Polarization'),0,WACV)
 #    polaVal = wx.TextCtrl(G2frame.dataDisplay,value='%.2f'%(inst['Polariz.']))
 #    polaVal.Bind(wx.EVT_TEXT_ENTER,OnPolaVal)        
@@ -2877 +3053 @@
     mainSizer.Add(fileSizer,0)
     mainSizer.Add((5,5),0)
-    mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Sample information: '),0,wx.ALIGN_CENTER_VERTICAL)
+    mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Sample information: '),0,WACV)
     mainSizer.Add((5,5),0)    
 
@@ -2889 +3065 @@
     mainSizer.Add((5,5),0)    
     midSizer = wx.BoxSizer(wx.HORIZONTAL)
-    midSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Formula volume: '),0,wx.ALIGN_CENTER_VERTICAL)
+    midSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Formula volume: '),0,WACV)
     formVol = wx.TextCtrl(G2frame.dataDisplay,value='%.2f'%(data['Form Vol']))
     formVol.Bind(wx.EVT_TEXT_ENTER,OnFormVol)        
@@ -2896 +3072 @@
     midSizer.Add(wx.StaticText(G2frame.dataDisplay,
         label=' Theoretical absorption: %.4f cm-1 Sample absorption: %.4f cm-1'%(Abs,Abs*data['Pack'])),
-        0,wx.ALIGN_CENTER_VERTICAL)
+        0,WACV)
     mainSizer.Add(midSizer,0)
     mainSizer.Add((5,5),0)    
 
     geoBox = wx.BoxSizer(wx.HORIZONTAL)
-    geoBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Sample geometry: '),0,wx.ALIGN_CENTER_VERTICAL)
+    geoBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Sample geometry: '),0,WACV)
     choice = ['Cylinder','Bragg-Brentano','Tilting flat plate in transmission','Fixed flat plate']
     geometry = wx.ComboBox(G2frame.dataDisplay,value=data['Geometry'],choices=choice,
@@ -2907 +3083 @@
     geometry.Bind(wx.EVT_COMBOBOX, OnGeometry)
     geoBox.Add(geometry,0)
-    geoBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Sample diameter/thickness, mm: '),0,wx.ALIGN_CENTER_VERTICAL)
+    geoBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Sample diameter/thickness, mm: '),0,WACV)
     diam = wx.TextCtrl(G2frame.dataDisplay,value='%.3f'%(data['Diam']))
     diam.Bind(wx.EVT_TEXT_ENTER,OnDiameter)        
@@ -2916 +3092 @@
     mainSizer.Add((5,5),0)    
     geoBox = wx.BoxSizer(wx.HORIZONTAL)
-    geoBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Packing: '),0,wx.ALIGN_CENTER_VERTICAL)
+    geoBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Packing: '),0,WACV)
     pack = wx.TextCtrl(G2frame.dataDisplay,value='%.2f'%(data['Pack']))
     pack.Bind(wx.EVT_TEXT_ENTER,OnPacking)        
     pack.Bind(wx.EVT_KILL_FOCUS,OnPacking)
     geoBox.Add(pack,0)
-    geoBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Sample transmission: %.3f %%'%(Trans)),0,wx.ALIGN_CENTER_VERTICAL)    
+    geoBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Sample transmission: %.3f %%'%(Trans)),0,WACV)    
     mainSizer.Add(geoBox,0)
     mainSizer.Add((5,5),0)    
         
-    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' S(Q)->F(Q)->G(R) controls: '),0,wx.ALIGN_CENTER_VERTICAL)
+    mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' S(Q)->F(Q)->G(R) controls: '),0,WACV)
     mainSizer.Add((5,5),0)
     sqBox = wx.BoxSizer(wx.HORIZONTAL)
-    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Detector type: '),0,wx.ALIGN_CENTER_VERTICAL)
+    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Detector type: '),0,WACV)
     choice = ['Image plate','Point detector']
     detType = wx.ComboBox(G2frame.dataDisplay,value=data['DetType'],choices=choice,
@@ -2935 +3111 @@
     sqBox.Add(detType,0)
     if data['DetType'] == 'Image plate':
-        sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' IP transmission coeff.: '),0,wx.ALIGN_CENTER_VERTICAL)
+        sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' IP transmission coeff.: '),0,WACV)
         obliqCoeff = wx.TextCtrl(G2frame.dataDisplay,value='%.3f'%(data['ObliqCoeff']))
         obliqCoeff.Bind(wx.EVT_TEXT_ENTER,OnObliqCoeff)        
@@ -2943 +3119 @@
         
     sqBox = wx.BoxSizer(wx.HORIZONTAL)
-    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Ruland width: '),0,wx.ALIGN_CENTER_VERTICAL)    
+    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Ruland width: '),0,WACV)    
     rulandSldr = wx.Slider(parent=G2frame.dataDisplay,style=wx.SL_HORIZONTAL,
         value=int(1000*data['Ruland']))
@@ -2951 +3127 @@
     rulandWdt.Bind(wx.EVT_TEXT_ENTER,OnRulandWdt)        
     rulandWdt.Bind(wx.EVT_KILL_FOCUS,OnRulandWdt)
-    sqBox.Add(rulandWdt,0,wx.ALIGN_CENTER_VERTICAL)    
+    sqBox.Add(rulandWdt,0,WACV)    
     mainSizer.Add(sqBox,0,wx.ALIGN_LEFT|wx.EXPAND)
     
@@ -2958 +3134 @@
     lorch.SetValue(data['Lorch'])
     lorch.Bind(wx.EVT_CHECKBOX, OnLorch)
-    sqBox.Add(lorch,0,wx.ALIGN_CENTER_VERTICAL)
-    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Scaling q-range: '),0,wx.ALIGN_CENTER_VERTICAL)
+    sqBox.Add(lorch,0,WACV)
+    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Scaling q-range: '),0,WACV)
     SQmin = wx.TextCtrl(G2frame.dataDisplay,value='%.1f'%(data['QScaleLim'][0]))
     SQmin.Bind(wx.EVT_TEXT_ENTER,OnSQmin)        
     SQmin.Bind(wx.EVT_KILL_FOCUS,OnSQmin)    
     sqBox.Add(SQmin,0)
-    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' to '),0,wx.ALIGN_CENTER_VERTICAL)
+    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' to '),0,WACV)
     SQmax = wx.TextCtrl(G2frame.dataDisplay,value='%.1f'%(data['QScaleLim'][1]))
     SQmax.Bind(wx.EVT_TEXT_ENTER,OnSQmax)        

trunk/GSASIIsasd.py

@@ -55 +55 @@
 npT2q = lambda tth,wave: 2.0*np.pi*npT2stl(tth,wave)
     
+###############################################################################
+#### Particle form factors & volumes
+###############################################################################
+
+def SpheroidFF(Q,R,AR):
+    '''
+    '''
+    QR = Q*R
+    if 0.98 < AR < 1.02:
+        return (3./(QR**3))*(np.sin(QR)-(QR*np.cos(QR)))
+        
+    
+def SpheroidVol(R,AR):
+    ''' Compute volume of cylindrically symmetric ellipsoid (spheroid) 
+    - can use numpy arrays for R & AR; will return corresponding numpy array
+    param float R: radius along 2 axes of spheroid
+    param float AR: aspect ratio so 3rd axis = R*AR
+    returns float: volume
+    '''
+    return AR*(4./3.)*np.pi*R**3
+    
+def SizeDistribution(Profile,Limits,Substances,Sample,data):
+    print data['Size']
+#    print Limits
+#    print Substances
+#    print Sample
+#    print Profile
+