Changeset 4010 for trunk/GSASIIplot.py

Timestamp:

May 31, 2019 4:20:54 PM (3 years ago)

Author:

toby

Message:

add hidden diagnostic plot option (.) to show Y*W

File:

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

trunk/GSASIIplot.py

@@ -1841 +1841 @@
         elif event.key == 'e' and plottype in ['SASD','REFD']:
             G2frame.ErrorBars = not G2frame.ErrorBars
+        elif event.key == '.':
+            Page.plotStyle['WgtDiagnostic'] = not Page.plotStyle.get('WgtDiagnostic',False)
+            newPlot = True
         elif event.key == 'b':
             G2frame.SubBack = not G2frame.SubBack
@@ -2945 +2948 @@
         Title = r'$\sqrt{I}$ for '+Title
         Ymax = np.sqrt(Ymax)
+    elif Page.plotStyle.get('WgtDiagnostic',False):
+        Title = 'Scaling diagnostic for '+Title
     if Page.plotStyle['qPlot'] or plottype in ['SASD','REFD'] and not G2frame.Contour:
         xLabel = r'$Q, \AA^{-1}$'
@@ -2974 +2979 @@
             if Page.plotStyle['sqrtPlot']:
                 Plot.set_ylabel(r'$\sqrt{Intensity}$',fontsize=16)
+            elif Page.plotStyle.get('WgtDiagnostic',False):
+                Plot.set_ylabel('Intensity * Weight')
             else:
                 Plot.set_ylabel(r'$Intensity$',fontsize=16)
@@ -3084 +3091 @@
                 Y = np.where(xye[1]>=0.,np.sqrt(xye[1]),-np.sqrt(-xye[1]))+NoffY*Ymax/100.0
                 np.seterr(invalid=olderr['invalid'])
+            elif Page.plotStyle.get('WgtDiagnostic',False):
+                Y = xye[1]*xye[2]
             elif 'PWDR' in plottype and G2frame.SinglePlot and not (
                 Page.plotStyle['logPlot'] or Page.plotStyle['sqrtPlot'] or G2frame.Contour):
@@ -3158 +3167 @@
                         np.seterr(invalid=olderr['invalid'])
                         D = np.where(xye[5],(Y-Z),0.)-Page.plotStyle['delOffset']
-                    elif 'PWDR' in plottype and G2frame.SinglePlot and not (
+                    elif Page.plotStyle.get('WgtDiagnostic',False):
+                        Z = D = W = np.zeros_like(Y)
+                    elif G2frame.SinglePlot and not (
                         Page.plotStyle['logPlot'] or Page.plotStyle['sqrtPlot'] or G2frame.Contour):
                         W = xye[4]*multArray+NoffY*Ymax/100.0
@@ -3322 +3333 @@
                 else:
                     Plot.axvline(hkl[-2],color=clr,dashes=(5,5))
-        elif G2frame.GPXtree.GetItemText(PickId) in ['Reflection Lists'] or \
-            'PWDR' in G2frame.GPXtree.GetItemText(PickId) or refineMode:
+        elif Page.plotStyle.get('WgtDiagnostic',False):
+            pass # skip reflection markers
+        elif (G2frame.GPXtree.GetItemText(PickId) in ['Reflection Lists'] or 
+            'PWDR' in G2frame.GPXtree.GetItemText(PickId) or refineMode):
             Phases = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Reflection Lists'))
             l = GSASIIpath.GetConfigValue('Tick_length',8.0)