Changeset 505 for trunk/GSASIIplot.py

Timestamp:

Mar 1, 2012 10:29:55 AM (11 years ago)

Author:

vondreele

Message:

start on plotting "error analysis" for powder patterns

File:

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

trunk/GSASIIplot.py

@@ -322 +322 @@
             else:
                 G2frame.Weight = True
-            print 'plot weighting:',G2frame.Weight
+            print 'error analysis:',G2frame.Weight
         elif event.key == 'n':
             if G2frame.Contour:
@@ -572 +572 @@
             Choice = (' key press','l: offset left','r: offset right','d: offset down',
                 'u: offset up','o: reset offset','n: log(I) on','c: contour on',
-                'q: toggle q plot','s: toggle single plot','+: no selection')
+                'q: toggle q plot','s: toggle single plot','w: toggle error analysis','+: no selection')
     cb = wx.ComboBox(G2frame.G2plotNB.status,style=wx.CB_DROPDOWN|wx.CB_READONLY,
         choices=Choice)
@@ -668 +668 @@
                 D = xye[5]-Ymax*G2frame.delOffset
                 if G2frame.Weight:
-                    W2 = np.sqrt(xye[2])
-                    D *= W2-Ymax*G2frame.delOffset
+                    DS = xye[5]*np.sqrt(xye[2])
+                    PlotDeltSig(G2frame,[X,DS])
                 if G2frame.logPlot:
                     Plot.semilogy(X,Y,colors[N%6]+'+',picker=3.,clip_on=False,nonposy='mask')
@@ -748 +748 @@
         Page.canvas.draw()
     G2frame.Pwdr = True
+    
+def PlotDeltSig(G2frame,XDS):
+    try:
+        plotNum = G2frame.G2plotNB.plotList.index('Error analysis')
+        Page = G2frame.G2plotNB.nb.GetPage(plotNum)
+        Page.figure.clf()
+        Plot = Page.figure.gca()          #get a fresh plot after clf()
+    except ValueError:
+        newPlot = True
+        G2frame.Cmax = 1.0
+        Plot = G2frame.G2plotNB.addMpl('Error analysis').gca()
+        plotNum = G2frame.G2plotNB.plotList.index('Error analysis')
+        Page = G2frame.G2plotNB.nb.GetPage(plotNum)
+    Page.SetFocus()
+    G2frame.G2plotNB.status.DestroyChildren()
+    Plot.set_title('Delta/sigma')
+    X,DS = XDS
+    Plot.set_xlabel(r'$\mathsf{2\theta}$',fontsize=14)
+    Plot.set_ylabel(r'$\mathsf{\Delta/\sigma}$',fontsize=14)
+    Plot.plot(X,DS,'k',picker=False)
+    Page.canvas.draw()
+    
     
 def PlotISFG(G2frame,newPlot=False,type=''):
@@ -1165 +1187 @@
         ptx.pyqlmninit()
         Start = False
-    MuStrKeys = G2spc.MustrainNames(SGData)
+#    MuStrKeys = G2spc.MustrainNames(SGData)
     cell = generalData['Cell'][1:]
     A,B = G2lat.cell2AB(cell[:6])