Changeset 583

Timestamp:

May 2, 2012 4:08:10 PM (11 years ago)

Author:

vondreele

Message:

add Rwp to sequential results table & plot
fix bug in backflagcopy

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -934 +934 @@
         return sampleParm
             
+    def GetRwps():
+        Rwps = []
+        for name in histNames:
+            Rwps.append(data[name]['Rvals']['Rwp'])
+        return Rwps
+            
     def GetSigData(parm):
         sigData = []
@@ -1011 +1017 @@
             atomList[newAtomDict[item][0]] = item
     sampleParms = GetSampleParms()
+    Rwps = GetRwps()
     G2frame.dataFrame.SetMenuBar(G2frame.dataFrame.SequentialMenu)
     G2frame.dataFrame.SetLabel('Sequental refinement results')
     G2frame.dataFrame.CreateStatusBar()
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveSelSeq, id=wxID_SAVESEQSEL)
-    colLabels = data['varyList']+atomList.keys()+cellList.keys()
-    Types = len(data['varyList']+atomList.keys()+cellList.keys())*[wg.GRID_VALUE_FLOAT,]
-    seqList = [list(data[name]['variables']) for name in histNames]
-    
+    colLabels = ['Rwp',]+data['varyList']+atomList.keys()+cellList.keys()
+    Types = (len(data['varyList']+atomList.keys()+cellList.keys())+1)*[wg.GRID_VALUE_FLOAT,]
+    seqList = [[Rwps[i],]+list(data[name]['variables']) for i,name in enumerate(histNames)]    
     for i,item in enumerate(seqList):
         newAtomDict = data[histNames[i]]['newAtomDict']

trunk/GSASIIpwdGUI.py

@@ -281 +281 @@
     
     def OnBackFlagCopy(event):
-        print data
-        flag = data[1]
+        flag = data[0][1]
         backDict = data[-1]
         if backDict['nDebye']:
@@ -307 +306 @@
                 Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,item)
                 backData = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Background'))
-                backData[1] = copy.copy(flag)
+                backData[0][1] = copy.copy(flag)
                 bkDict = backData[-1]
                 if bkDict['nDebye'] == backDict['nDebye']: