Changeset 2145

Timestamp:

Feb 10, 2016 3:44:21 PM (6 years ago)

Author:

vondreele

Message:

make Comments with merging R values, etc. for HKL Merge result

File:

• trunk/GSASIIgrid.py (modified) (4 diffs)

trunk/GSASIIgrid.py

@@ -3015 +3015 @@
         Inst = G2frame.PatternTree.GetItemPyData(GetPatternTreeItemId(G2frame,
             G2frame.PatternId,'Instrument Parameters'))
+        CId = GetPatternTreeItemId(G2frame,G2frame.PatternId,'Comments')
+        if CId:
+            Comments = G2frame.PatternTree.GetItemPyData(CId)
+        else:
+            Comments = []
         refList = np.copy(data[1]['RefList'])
+        Comments.append(' Merging %d reflections from %s'%(len(refList),Name))
         dlg = MergeDialog(G2frame,data)
         try:
@@ -3028 +3034 @@
         SG = 'P '+Laue
         SGData = G2spc.SpcGroup(SG)[1]
-#        refList = G2lat.LaueUnique2(SGData,refList)
         refList = G2lat.LaueUnique(Laue,refList)
         dlg = wx.ProgressDialog('Build HKL dictonary','',len(refList)+1, 
@@ -3069 +3074 @@
         mergeRef = np.array(mergeRef)
         if sumFo:
-            print 'merge R = %6.2f%s for %d reflections in %s'%(100.*sumDf/sumFo,'%',mergeRef.shape[0],Laue)
+            mtext = ' merge R = %6.2f%s for %d reflections in %s'%(100.*sumDf/sumFo,'%',mergeRef.shape[0],Laue)
+            print mtext
+            Comments.append(mtext)
         else:
             print 'nothing to merge for %s reflections'%(mergeRef.shape[0])
@@ -3086 +3093 @@
         newData[1]['RefList'] = mergeRef
         Id = G2frame.PatternTree.AppendItem(parent=G2frame.root,text=newName)
+        G2frame.PatternTree.SetItemPyData(
+            G2frame.PatternTree.AppendItem(Id,text='Comments'),Comments)
         G2frame.PatternTree.SetItemPyData(Id,newData)
         G2frame.PatternTree.SetItemPyData(