Changeset 1344 for trunk/GSASIIplot.py

Timestamp:

May 13, 2014 1:47:18 PM (9 years ago)

Author:

vondreele

Message:

print "chisq" after image calibration/recalibration
fixes to profile plots

File:

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

trunk/GSASIIplot.py

@@ -772 +772 @@
             if 'PWDR' in plottype:
                 Page.Choice = (' key press','n: log(I) off','l: offset left','r: offset right','o: reset offset',
-                    'c: contour on','q: toggle q plot','s: toggle single plot','+: no selection')
+                    'c: contour on','q: toggle q plot','s: toggle single plot','w: toggle divide by sig','+: no selection')
             elif 'SASD' in plottype:
-                Page.Choice = (' key press','b: toggle subtract background','n: semilog on',
+                Page.Choice = (' key press','b: toggle subtract background file','n: semilog on',
                     'd: offset down','l: offset left','r: offset right','u: offset up','o: reset offset',
-                    'q: toggle S(q) plot','s: toggle single plot','+: no selection')
+                    'q: toggle S(q) plot','s: toggle single plot','w: toggle (Io-Ic)/sig plot','+: no selection')
         else:
             if 'PWDR' in plottype:
@@ -783 +783 @@
                     'q: toggle q plot','s: toggle single plot','w: toggle divide by sig','+: no selection')
             elif 'SASD' in plottype:
-                Page.Choice = (' key press','b: toggle subtract background','n: loglog on','e: toggle error bars',
+                Page.Choice = (' key press','b: toggle subtract background file','n: loglog on','e: toggle error bars',
                     'd: offset down','l: offset left','r: offset right','u: offset up','o: reset offset',
-                    'q: toggle S(q) plot','s: toggle single plot','+: no selection')
+                    'q: toggle S(q) plot','s: toggle single plot','w: toggle (Io-Ic)/sig plot','+: no selection')
 
     Page.keyPress = OnPlotKeyPress    
@@ -1001 +1001 @@
                 else:
                     if G2frame.SubBack:
-                        DifLine = Plot.plot(Xum,Y-W,colors[N%6]+'+',picker=1.,clip_on=False)  #Io-Ib
-                        Plot.plot(X,Z-W,colors[(N+1)%6],picker=False)               #Ic-Ib
+                        if 'PWDR' in plottype:
+                            Plot.plot(Xum,Y-W,colors[N%6]+'+',picker=False,clip_on=False)  #Io-Ib
+                            Plot.plot(X,Z-W,colors[(N+1)%6],picker=False)               #Ic-Ib
+                        else:
+                            Plot.plot(X,YB,colors[N%6]+'+',picker=3.,clip_on=False)
+                            Plot.plot(X,ZB,colors[(N+1)%6],picker=False)
                     else:
-                        ObsLine = Plot.plot(Xum,Y,colors[N%6]+'+',picker=3.,clip_on=False)    #Io
-                        Plot.plot(X,Z,colors[(N+1)%6],picker=False)                 #Ic
-                        if G2frame.logPlot:
-                            Plot.set_yscale("log",nonposy='mask')
-                            Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.)
+                        if 'PWDR' in plottype:
+                            ObsLine = Plot.plot(Xum,Y,colors[N%6]+'+',picker=3.,clip_on=False)    #Io
+                            Plot.plot(X,Z,colors[(N+1)%6],picker=False)                 #Ic
+                        else:
+                            Plot.plot(X,YB,colors[N%6]+'+',picker=3.,clip_on=False)
+                            Plot.plot(X,ZB,colors[(N+1)%6],picker=False)
                     if 'PWDR' in plottype:
                         Plot.plot(X,W,colors[(N+2)%6],picker=False)                 #Ib