Changeset 1312 for trunk/GSASIIplot.py

Timestamp:

Apr 30, 2014 9:42:51 PM (11 years ago)

Author:

toby

Message:

Parametric fit; work on PseudoVars? (more 2 come); minor code cleanups

File:

• trunk/GSASIIplot.py (modified) (7 diffs)

trunk/GSASIIplot.py ¶

@@ -2299 +2299 @@
 ##### PlotSeq
 ################################################################################
-def PlotSelectedSequence(G2frame,ColumnList,TableGet,SelectX):
+def PlotSelectedSequence(G2frame,ColumnList,TableGet,SelectX,fitnum=None,fitvals=None):
     '''Plot a result from a sequential refinement
 
@@ -2310 +2310 @@
       number (or None) as the X-axis selection
     '''
-    G2frame.seqYaxisList = ColumnList
-    G2frame.seqTableGet = TableGet
     G2frame.seqXselect = SelectX
     try:
@@ -2329 +2327 @@
             G2frame.seqXaxis = G2frame.seqXselect()
             Draw()
+    if fitnum is None:
+        label = 'Sequential refinement'
+    else:
+        label = 'Parametric fit #'+str(fitnum+1)
     try:
-        plotNum = G2frame.G2plotNB.plotList.index('Sequential refinement')
+        plotNum = G2frame.G2plotNB.plotList.index(label)
         Page = G2frame.G2plotNB.nb.GetPage(plotNum)
         Page.figure.clf()
@@ -2337 +2339 @@
             Page.Show()
     except ValueError:
-        Plot = G2frame.G2plotNB.addMpl('Sequential refinement').gca()
-        plotNum = G2frame.G2plotNB.plotList.index('Sequential refinement')
+        Plot = G2frame.G2plotNB.addMpl(label).gca()
+        plotNum = G2frame.G2plotNB.plotList.index(label)
         Page = G2frame.G2plotNB.nb.GetPage(plotNum)
         Page.canvas.mpl_connect('key_press_event', OnKeyPress)
@@ -2344 +2346 @@
     Page.Choice = ['s to select plot x-axis']
     Page.keyPress = OnKeyPress
+    Page.seqYaxisList = ColumnList
+    Page.seqTableGet = TableGet
+    Page.fitvals = fitvals
         
     def Draw():
@@ -2350 +2355 @@
         Plot.clear()
         if G2frame.seqXaxis is not None:    
-            xName,X,Xsig = G2frame.seqTableGet(G2frame.seqXaxis)
+            xName,X,Xsig = Page.seqTableGet(G2frame.seqXaxis)
         else:
             X = np.arange(0,G2frame.SeqTable.GetNumberRows(),1)
             xName = 'Data sequence number'
-        for col in G2frame.seqYaxisList:
-            name,Y,sig = G2frame.seqTableGet(col)
+        for col in Page.seqYaxisList:
+            name,Y,sig = Page.seqTableGet(col)
             if sig:
                 Plot.errorbar(X,Y,yerr=sig,label=name)
@@ -2361 +2366 @@
                 Plot.plot(X,Y)
                 Plot.plot(X,Y,'o',label=name)
+        if Page.fitvals:
+                Plot.plot(X,fitvals)
+                Plot.plot(X,fitvals,'*',label='Fit')
+            
         Plot.legend(loc='best')
         Plot.set_ylabel('Parameter values')