Changeset 1551


Ignore:
Timestamp:
Oct 31, 2014 7:08:24 AM (7 years ago)
Author:
vondreele
Message:

fixes to calibration

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwd.py

    r1515 r1551  
    12251225        begin = time.time()
    12261226        values =  np.array(Dict2Values(parmDict, varyList))
    1227         result = so.leastsq(errPeakPos,values,full_output=True,ftol=0.0001,
     1227        result = so.leastsq(errPeakPos,values,full_output=True,ftol=0.000001,
    12281228            args=(peakDsp,peakPos,peakWt,dataType,parmDict,varyList))
    12291229        ncyc = int(result[2]['nfev']/2)
     
    12421242        except ValueError:          #result[1] is None on singular matrix
    12431243            print '**** Refinement failed - singular matrix ****'
    1244     return True
    12451244       
    12461245    sigDict = dict(zip(varyList,sig))
    12471246    GetInstParms(parmDict,Inst,varyList)
    12481247    InstPrint(Inst,sigDict)
     1248    return True
    12491249           
    12501250def DoPeakFit(FitPgm,Peaks,Background,Limits,Inst,Inst2,data,prevVaryList=[],oneCycle=False,controls=None,dlg=None):
  • trunk/GSASIIpwdGUI.py

    r1549 r1551  
    23242324        spc = controls[13]
    23252325        SGData = G2spc.SpcGroup(spc)[1]
    2326         if ssopt['Use']:
     2326        if ssopt.get('Use',False):
    23272327            print ssopt
    23282328            SSGData = G2spc.SSpcGroup(SGData,ssopt['ssSymb'])
     
    26222622    littleSizer.Add(zeroVar,0,WACV)
    26232623    SSopt = wx.CheckBox(G2frame.dataDisplay,label="Super lattice?")
    2624     SSopt.SetValue(ssopt['Use'])
     2624    SSopt.SetValue(ssopt.get('Use',False))
    26252625    SSopt.Bind(wx.EVT_CHECKBOX,OnSSopt)
    26262626    littleSizer.Add(SSopt,0,WACV)
     
    26602660            littleSizer.Add(volVal,0,WACV)
    26612661    mainSizer.Add(littleSizer,0)
    2662     if ssopt['Use']:        #super lattice display
     2662    if ssopt.get('Use',False):        #super lattice display
    26632663        indChoice = ['1','2','3','4',]
    26642664        SpSg = controls[13]
Note: See TracChangeset for help on using the changeset viewer.