Changeset 2242

Timestamp:

May 6, 2016 1:57:25 PM (7 years ago)

Author:

vondreele

Message:

change default stack inst to Gaussian
provide labels for plots of sequential stacking fault calcs.

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (4 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIgrid.py

@@ -687 +687 @@
         self.parmRange = [0.,1.]
         self.parmStep = 2
-        self.Inst = 'None'
+        self.Inst = 'Gaussian'
         self.Draw()
         

trunk/GSASIIphsGUI.py

@@ -2527 +2527 @@
         def OnSeqPlot(event):
             seqPlot.SetValue(False)
-            resultXY,resultXY2 = Layers['seqResults']
+            resultXY,resultXY2,seqNames = Layers['seqResults']
             pName = Layers['seqCodes'][0]
             G2plt.PlotXY(G2frame,resultXY,XY2=resultXY2,labelX=r'$\mathsf{2\theta}$',
-            labelY='Intensity',newPlot=True,Title='Sequential simulations on '+pName,lines=False)
+                labelY='Intensity',newPlot=True,Title='Sequential simulations on '+pName,
+                lines=False,names=seqNames)
             
         def CellSizer():
@@ -3221 +3222 @@
         profile = np.copy(G2frame.PatternTree.GetItemPyData(G2frame.PatternId)[1])
         resultXY2 = []
-        resultXY = [np.vstack((profile[0],profile[1])),]
+        resultXY = [np.vstack((profile[0],profile[1])),]    #observed data
         data['Layers']['selInst'] = simCodes[1]
         data['Layers']['seqCodes'] = simCodes[2:]
@@ -3231 +3232 @@
         dStep = (BegFin[1]-BegFin[0])/nSteps
         vals = np.linspace(BegFin[0],BegFin[1],nSteps+1,True)
+        simNames = []
         for val in vals:
             print ' Stacking simulation step for '+pName+' = %.5f'%(val)
+            simNames.append('%.3f'%(val))
             if 'cell' in pName:
                 cellId = cellSel.index(pName)
@@ -3263 +3266 @@
             G2pwd.CalcStackingPWDR(Layers,scale,background,limits,inst,profile,False)
             resultXY2.append([np.vstack((profile[0],profile[3])),][0])
-        data['Layers']['seqResults'] = [resultXY,resultXY2]
+        data['Layers']['seqResults'] = [resultXY,resultXY2,simNames]
         wx.MessageBox('Sequential simulation finished',caption='Stacking fault simulation',style=wx.ICON_EXCLAMATION)
         wx.CallAfter(UpdateLayerData)

trunk/GSASIIplot.py

@@ -2418 +2418 @@
 ################################################################################
             
-def PlotXY(G2frame,XY,XY2=None,labelX=None,labelY=None,newPlot=False,Title='',lines=False):
+def PlotXY(G2frame,XY,XY2=None,labelX=None,labelY=None,newPlot=False,
+    Title='',lines=False,names=[]):
     '''simple plot of xy data, used for diagnostic purposes
     '''
@@ -2438 +2439 @@
             #GSASIIpath.IPyBreak()
             return
-        wx.CallAfter(PlotXY,G2frame,XY,XY2,labelX,labelY,False,Title,False)
+        wx.CallAfter(PlotXY,G2frame,XY,XY2,labelX,labelY,False,Title,False,names)
 
     def OnMotion(event):
@@ -2501 +2502 @@
             dX = Page.Offset[0]*(ixy+1)*Xmax/500.
             dY = Page.Offset[1]*(ixy+1)*Ymax/100.
-            Plot.plot(X+dX,Y+dY,colors[ixy%6],picker=False)
+            if len(names):
+                Plot.plot(X+dX,Y+dY,colors[ixy%6],picker=False,label=names[ixy])
+            else:
+                Plot.plot(X+dX,Y+dY,colors[ixy%6],picker=False)
+    if len(names):
+        Plot.legend(loc='best')
     if not newPlot:
         Page.toolbar.push_current()