Changeset 4107


Ignore:
Timestamp:
Aug 21, 2019 4:00:10 PM (2 years ago)
Author:
vondreele
Message:

put covar matrix in Covariance from multi-dist recalibrate

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r4104 r4107  
    202202        P = 2.*R0**2*zdis*npcosd(phi0-phi)
    203203        Rcalc = (P+Q)/R
    204         M = (Robs-Rcalc)*10.        #why 10? does make "chi**2" more reasonable
     204        M = (Robs-Rcalc)*25.        #why 25? does make "chi**2" more reasonable
    205205        return M
    206206       
     
    334334        P = 2.*R0**2*zdis*npcosd(phi0-phi)
    335335        Rcalc = (P+Q)/R
    336         return (Robs-Rcalc)*10.        #why 10? does make "chi**2" more reasonable
     336        return (Robs-Rcalc)*25.        #why 25? does make "chi**2" more reasonable
    337337       
    338338    p0 = [parmDict[key] for key in varyList]
  • trunk/GSASIIimgGUI.py

    r4105 r4107  
    325325                #GSASIIpath.IPyBreak()
    326326                print('\nFitting',obsArr.shape[0],'ring picks...')
    327                 result = G2img.FitMultiDist(obsArr,varList,parmDict)
     327                result = G2img.FitMultiDist(obsArr,varList,parmDict,covar=True)
     328                covar = result[3]
     329                covData = {'title':'Multi-distance recalibrate','covMatrix':covar,'varyList':varList,'variables':result[1]}
     330                Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Covariance')
     331                G2frame.GPXtree.SetItemPyData(Id,covData)
     332               
    328333                # create a sequential table?
    329334#                Id =  G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Sequential image calibration results')
Note: See TracChangeset for help on using the changeset viewer.