Changeset 474


Ignore:
Timestamp:
Feb 7, 2012 1:51:14 PM (10 years ago)
Author:
vondreele
Message:

fix to sequential refinement

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstruct.py

    r470 r474  
    24962496                result = so.leastsq(errRefine,values,Dfun=dervRefine,full_output=True,
    24972497                    ftol=Ftol,col_deriv=True,factor=Factor,
    2498                     args=([Histograms,Phases],parmDict,varyList,calcControls,pawleyLookup,dlg))
     2498                    args=([Histo,Phases],parmDict,varyList,calcControls,pawleyLookup,dlg))
    24992499                ncyc = int(result[2]['nfev']/2)
    25002500            elif 'Hessian' in Controls['deriv type']:
    25012501                result = G2mth.HessianLSQ(errRefine,values,Hess=HessRefine,ftol=Ftol,maxcyc=maxCyc,
    2502                     args=([Histograms,Phases],parmDict,varyList,calcControls,pawleyLookup,dlg))
     2502                    args=([Histo,Phases],parmDict,varyList,calcControls,pawleyLookup,dlg))
    25032503                ncyc = result[2]['num cyc']+1                           
    25042504            else:           #'numeric'
    25052505                result = so.leastsq(errRefine,values,full_output=True,ftol=Ftol,epsfcn=1.e-8,factor=Factor,
    2506                     args=([Histograms,Phases],parmDict,varyList,calcControls,pawleyLookup,dlg))
     2506                    args=([Histo,Phases],parmDict,varyList,calcControls,pawleyLookup,dlg))
    25072507                ncyc = int(result[2]['nfev']/len(varyList))
    25082508
Note: See TracChangeset for help on using the changeset viewer.