Changeset 2877

Timestamp:

Jun 25, 2017 11:23:22 PM (6 years ago)

Author:

toby

Message:

Plot each histogram after fitting in a sequential refinement

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIplot.py (modified) (3 diffs)
• GSASIIstrMain.py (modified) (2 diffs)

trunk/GSASII.py

@@ -4259 +4259 @@
         dlg.CenterOnParent()
         try:
-            OK,Msg = G2stMn.SeqRefine(self.GSASprojectfile,dlg)     #Msg is Rvals dict if Ok=True
+            OK,Msg = G2stMn.SeqRefine(self.GSASprojectfile,dlg,G2plt.SequentialPlotPattern,self)     #Msg is Rvals dict if Ok=True
         finally:
             dlg.Update(101.) # forces the Auto_Hide; needed after move w/Win & wx3.0

trunk/GSASIIplot.py

@@ -1181 +1181 @@
 ##### PlotPatterns
 ################################################################################
+def SequentialPlotPattern(G2frame,refdata,histogram):
+    '''This is passed into :func:`GSASIIstrMain.SeqRefine` where it is used to
+    provide a plot of the current powder histogram just after a refinement. It
+    takes the old refinement information (Rfactors, curve locations, etc.) and
+    combines it with the refinement results in refdata and passes that to
+    :func:`PlotPatterns`
+    '''
+    if not histogram.startswith('PWDR'): return 
+    G2frame.PatternId = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, histogram)
+    treedata = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
+    PlotPatterns(G2frame,newPlot=True,plotType='PWDR',data=[treedata[0],refdata])
+
 def ReplotPattern(G2frame,newPlot,plotType,PatternName=None,PickName=None):
     '''This does the same as PlotPatterns except that it expects the information
@@ -1196 +1208 @@
     PlotPatterns(G2frame,newPlot,plotType)
 
-def PlotPatterns(G2frame,newPlot=False,plotType='PWDR'):
+def PlotPatterns(G2frame,newPlot=False,plotType='PWDR',data=None):
     '''Powder pattern plotting package - displays single or multiple powder patterns as intensity vs
     2-theta, q or TOF. Can display multiple patterns as "waterfall plots" or contour plots. Log I 
@@ -1220 +1232 @@
         return
 #patch
-    data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
+    if data is None:
+        data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
     if 'Offset' not in data[0] and plotType in ['PWDR','SASD','REFD']:     #plot offset data
         Ymax = max(data[1][1])

trunk/GSASIIstrMain.py

@@ -256 +256 @@
     return [item for item in phaseVary if item.split(':')[0] in pIds]
 
-def SeqRefine(GPXfile,dlg):
+def SeqRefine(GPXfile,dlg,PlotFunction=None,G2frame=None):
     '''Perform a sequential refinement -- cycles through all selected histgrams,
     one at a time
@@ -410 +410 @@
             IfOK,Rvals,result,covMatrix,sig = RefineCore(Controls,Histo,Phases,restraintDict,
                 rigidbodyDict,parmDict,varyList,calcControls,pawleyLookup,ifPrint,printFile,dlg)
+            if PlotFunction:
+                PlotFunction(G2frame,Histo[histogram]['Data'],histogram)
     
             print '  wR = %7.2f%%, chi**2 = %12.6g, reduced chi**2 = %6.2f, last delta chi = %.4f'%(