Changeset 4107

Timestamp:

Aug 21, 2019 4:00:10 PM (4 years ago)

Author:

vondreele

Message:

put covar matrix in Covariance from multi-dist recalibrate

Location:

trunk

Files:

• GSASIIimage.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -202 +202 @@
         P = 2.*R0**2*zdis*npcosd(phi0-phi)
         Rcalc = (P+Q)/R
-        M = (Robs-Rcalc)*10.        #why 10? does make "chi**2" more reasonable
+        M = (Robs-Rcalc)*25.        #why 25? does make "chi**2" more reasonable
         return M
         
@@ -334 +334 @@
         P = 2.*R0**2*zdis*npcosd(phi0-phi)
         Rcalc = (P+Q)/R
-        return (Robs-Rcalc)*10.        #why 10? does make "chi**2" more reasonable
+        return (Robs-Rcalc)*25.        #why 25? does make "chi**2" more reasonable
         
     p0 = [parmDict[key] for key in varyList]

trunk/GSASIIimgGUI.py

@@ -325 +325 @@
                 #GSASIIpath.IPyBreak()
                 print('\nFitting',obsArr.shape[0],'ring picks...')
-                result = G2img.FitMultiDist(obsArr,varList,parmDict)
+                result = G2img.FitMultiDist(obsArr,varList,parmDict,covar=True)
+                covar = result[3]
+                covData = {'title':'Multi-distance recalibrate','covMatrix':covar,'varyList':varList,'variables':result[1]}
+                Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Covariance')
+                G2frame.GPXtree.SetItemPyData(Id,covData)
+                
                 # create a sequential table?
 #                Id =  G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Sequential image calibration results')