Changeset 2774 for trunk/GSASIIpwdGUI.py

Timestamp:

Apr 7, 2017 4:05:51 PM (6 years ago)

Author:

vondreele

Message:

implement MC/SA for reflectometry
more image importer speed ups

File:

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

trunk/GSASIIpwdGUI.py

@@ -225 +225 @@
         {'Name':'vacuum','Rough':[0.,False],'Penetration':[0.,False],'DenMul':[1.0,False],}],   #bottom layer
         'Scale':[1.0,False],'FltBack':[0.0,False],'Zero':'Top',                                 #globals
-        'Minimizer':'LMLS','Resolution':[0.,'Const dq/q'],'Recomb':0.5,'Toler':0.001,           #minimizer controls
+        'Minimizer':'LMLS','Resolution':[0.,'Const dq/q'],'Recomb':0.5,'Toler':0.5,           #minimizer controls
         'DualFitFiles':['',],'DualFltBacks':[[0.0,False],],'DualScales':[[1.0,False],]}         #optional stuff for multidat fits?
         
@@ -4853 +4853 @@
         resol = wx.BoxSizer(wx.HORIZONTAL)
         resol.Add(wx.StaticText(G2frame.dataDisplay,label=' Instrument resolution (%'+GkDelta+'Q/Q): '),0,WACV)
-        resol.Add(G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data['Resolution'],0,nDig=(10,2),typeHint=float),0,WACV)
+        resol.Add(G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data['Resolution'],0,nDig=(10,2),min=0.,max=0.2),0,WACV)
         resol.Add(wx.StaticText(G2frame.dataDisplay,label=' Zero position location: '),0,WACV)
         poslist = ['Top','Bottom']
@@ -4863 +4863 @@
         minimiz = wx.BoxSizer(wx.HORIZONTAL)
         minimiz.Add(wx.StaticText(G2frame.dataDisplay,label=' Minimizer: '),0,WACV)
-        minlist = ['LMLS','Global','L-BFGS-B',]
+        minlist = ['LMLS','Basin Hopping','MC/SA Anneal','L-BFGS-B',]
         minSel = wx.ComboBox(G2frame.dataDisplay,value=data['Minimizer'],choices=minlist,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         minSel.Bind(wx.EVT_COMBOBOX, OnMinSel)
         minimiz.Add(minSel,0,WACV)
-        minimiz.Add(wx.StaticText(G2frame.dataDisplay,label=' Tolerance: '),0,WACV)
-        minimiz.Add(G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'Toler',nDig=(10,1,'g'),typeHint=float),0,WACV)
+        minimiz.Add(wx.StaticText(G2frame.dataDisplay,label=' Bounds factor: '),0,WACV)
+        minimiz.Add(G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'Toler',nDig=(10,2),max=0.99,min=0.1),0,WACV)
         weight = wx.CheckBox(G2frame.dataDisplay,label='Use 2% sig. weights')
         weight.SetValue(data.get('2% weight',False))