Changeset 1264

Timestamp:

Mar 26, 2014 3:08:59 PM (10 years ago)

Author:

vondreele

Message:

Fix SASD plotting when sqPlot is True: log(Q vs Y*Q4) plot

File:

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

trunk/GSASIIplot.py

@@ -890 +890 @@
                     D = xye[5]-Ymax*G2frame.delOffset
                 elif 'SASD' in plottype:
-                    D = xye[4]
+                    if G2frame.sqPlot:
+                        D = xye[4]*X**4
+                        Z = xye[3]*X**4
+                    else:
+                        D = xye[4]
                     Plot.set_yscale("log",nonposy='mask')
                     Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.)
@@ -903 +907 @@
                         Plot.set_yscale("log",nonposy='mask')
                         if G2frame.ErrorBars:
-                            Plot.errorbar(X,Y,yerr=Sample['Scale'][0]*np.sqrt(1./(Pattern[0]['wtFactor']*xye[2])),
-                                ecolor=colors[N%6],picker=3.,clip_on=False)
+                            if G2frame.sqPlot:
+                                Plot.errorbar(X,Y,yerr=X**4*Sample['Scale'][0]*np.sqrt(1./(Pattern[0]['wtFactor']*xye[2])),
+                                    ecolor=colors[N%6],picker=3.,clip_on=False)
+                            else:
+                                Plot.errorbar(X,Y,yerr=Sample['Scale'][0]*np.sqrt(1./(Pattern[0]['wtFactor']*xye[2])),
+                                    ecolor=colors[N%6],picker=3.,clip_on=False)
                         else:
                             Plot.plot(X,Y,colors[N%6]+'+',picker=3.,clip_on=False)
-                        Plot.plot(X,D,colors[(N+1)%6],picker=False)
+                        Plot.plot(X,D,colors[(N+2)%6],picker=False)
                         Plot.plot(X,Z,colors[(N+1)%6],picker=False)
                 elif G2frame.Weight and 'PWDR' in plottype: