Changeset 2826

Timestamp:

May 10, 2017 9:28:05 PM (6 years ago)

Author:

vondreele

Message:

add covariances to sequential strain ring fit results

Location:

trunk

Files:

• GSASIIimage.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (2 diffs)

trunk/GSASIIimage.py

@@ -1005 +1005 @@
             ring.update(R)
             p0 = ring['Emat']
-            val,esd = FitStrain(Ring,p0,dset,wave,phi,StaType)
+            val,esd,covMat = FitStrain(Ring,p0,dset,wave,phi,StaType)
             ring['Emat'] = val
             ring['Esig'] = esd
@@ -1014 +1014 @@
             ringint /= np.mean(ringint)
             ring['Ivar'] = np.var(ringint)
+            ring['covMat'] = covMat
             print 'Variance in normalized ring intensity: %.3f'%(ring['Ivar'])
     CalcStrSta(StrSta,Controls)
@@ -1116 +1117 @@
     vals = list(result[0])
     chisq = np.sum(result[2]['fvec']**2)/(rings.shape[1]-3)     #reduced chi^2 = M/(Nobs-Nvar)
+    covM = result[1]
+    covMatrix = covM*chisq
     sig = list(np.sqrt(chisq*np.diag(result[1])))
     ValSig = zip(names,fmt,vals,sig)
     StrainPrint(ValSig,dset)
-    return vals,sig
+    return vals,sig,covMatrix
     
 def AutoSpotMasks(Image,Masks,Controls):

trunk/GSASIIimgGUI.py

@@ -2014 +2014 @@
                 parmDict = {'Sample load':StaCtrls['Sample load'],}
                 varyNames = ['e11','e12','e22']
+                coVar = np.eye(4*len(StaCtrls['d-zero']))
                 for j,item in enumerate(StaCtrls['d-zero']):
                     variables += item['Emat']
@@ -2025 +2026 @@
                     varyList.append('%d;Ivar'%(j))
                     sig.append(None)
+                    j4 = j*4
+                    coVar[j4:j4+3,j4:j4+3] = item['covMat']
                 SeqResult[name] = {'variables':variables,'varyList':varyList,'sig':sig,'Rvals':[],
-                    'covMatrix':np.eye(len(variables)),'title':name,'parmDict':parmDict}
+                    'covMatrix':coVar,'title':name,'parmDict':parmDict}
             else:
                 SeqResult['histNames'] = goodnames