Changeset 4009 for trunk/GSASIIimgGUI.py

Timestamp:

May 31, 2019 3:25:20 PM (6 years ago)

Author:

toby

Message:

add convariance to recalibrate all, so esd's are computed properly seq. ref. table

File:

• trunk/GSASIIimgGUI.py (modified) (2 diffs)

trunk/GSASIIimgGUI.py ¶

@@ -222 +222 @@
                         print('calibrant missing from local image calibrants files')
                         return
-                    vals,varyList,sigList,parmDict = result
+                    vals,varyList,sigList,parmDict,covar = result
                     sigList = list(sigList)
                     if 'dist' not in varyList:
@@ -229 +229 @@
                         sigList.append(None)
                     vals.append(Data.get('setdist',Data['distance']))
+                    # add setdist to varylist etc. so that it is displayed in Seq Res table
                     varyList.append('setdist')
                     sigList.append(None)
-                    vals.append(Data.get('samplechangerpos',Data['samplechangerpos']))
-                    varyList.append('chgrpos')
-                    sigList.append(None)
+                    covar = np.lib.pad(covar, (0,1), 'constant')
+#                    vals.append(Data.get('samplechangerpos',Data['samplechangerpos']))
+#                    varyList.append('chgrpos')
+#                    sigList.append(None)
                     
                     SeqResult[name] = {'variables':vals,'varyList':varyList,'sig':sigList,'Rvals':[],
-                        'covMatrix':np.eye(len(varyList)),'title':name,'parmDict':parmDict}
+                        'covMatrix':covar,'title':name,'parmDict':parmDict}
                 SeqResult['histNames'] = Names                
                 G2frame.GPXtree.SetItemPyData(Id,SeqResult)