Changeset 2774 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Apr 7, 2017 4:05:51 PM (5 years ago)
Author:
vondreele
Message:

implement MC/SA for reflectometry
more image importer speed ups

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r2772 r2774  
    225225        {'Name':'vacuum','Rough':[0.,False],'Penetration':[0.,False],'DenMul':[1.0,False],}],   #bottom layer
    226226        'Scale':[1.0,False],'FltBack':[0.0,False],'Zero':'Top',                                 #globals
    227         'Minimizer':'LMLS','Resolution':[0.,'Const dq/q'],'Recomb':0.5,'Toler':0.001,           #minimizer controls
     227        'Minimizer':'LMLS','Resolution':[0.,'Const dq/q'],'Recomb':0.5,'Toler':0.5,           #minimizer controls
    228228        'DualFitFiles':['',],'DualFltBacks':[[0.0,False],],'DualScales':[[1.0,False],]}         #optional stuff for multidat fits?
    229229       
     
    48534853        resol = wx.BoxSizer(wx.HORIZONTAL)
    48544854        resol.Add(wx.StaticText(G2frame.dataDisplay,label=' Instrument resolution (%'+GkDelta+'Q/Q): '),0,WACV)
    4855         resol.Add(G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data['Resolution'],0,nDig=(10,2),typeHint=float),0,WACV)
     4855        resol.Add(G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data['Resolution'],0,nDig=(10,2),min=0.,max=0.2),0,WACV)
    48564856        resol.Add(wx.StaticText(G2frame.dataDisplay,label=' Zero position location: '),0,WACV)
    48574857        poslist = ['Top','Bottom']
     
    48634863        minimiz = wx.BoxSizer(wx.HORIZONTAL)
    48644864        minimiz.Add(wx.StaticText(G2frame.dataDisplay,label=' Minimizer: '),0,WACV)
    4865         minlist = ['LMLS','Global','L-BFGS-B',]
     4865        minlist = ['LMLS','Basin Hopping','MC/SA Anneal','L-BFGS-B',]
    48664866        minSel = wx.ComboBox(G2frame.dataDisplay,value=data['Minimizer'],choices=minlist,
    48674867            style=wx.CB_READONLY|wx.CB_DROPDOWN)
    48684868        minSel.Bind(wx.EVT_COMBOBOX, OnMinSel)
    48694869        minimiz.Add(minSel,0,WACV)
    4870         minimiz.Add(wx.StaticText(G2frame.dataDisplay,label=' Tolerance: '),0,WACV)
    4871         minimiz.Add(G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'Toler',nDig=(10,1,'g'),typeHint=float),0,WACV)
     4870        minimiz.Add(wx.StaticText(G2frame.dataDisplay,label=' Bounds factor: '),0,WACV)
     4871        minimiz.Add(G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data,'Toler',nDig=(10,2),max=0.99,min=0.1),0,WACV)
    48724872        weight = wx.CheckBox(G2frame.dataDisplay,label='Use 2% sig. weights')
    48734873        weight.SetValue(data.get('2% weight',False))
Note: See TracChangeset for help on using the changeset viewer.