Changeset 267 for trunk/GSASIIplot.py

Timestamp:

Apr 20, 2011 1:09:53 PM (12 years ago)

Author:

vondreele

Message:

removed azm rotation - didn't work
fix azimuthal polarization

File:

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

trunk/GSASIIplot.py

@@ -1163 +1163 @@
         Page.canvas.SetToolTipString('')
         sizexy = Data['size']
-        azmRot = 0.
-        if Data['fullIntegrate']:
-            azmRot = Data['azmthRotate']
         if event.xdata and event.ydata:                 #avoid out of frame errors
             Page.canvas.SetCursor(wx.CROSS_CURSOR)
@@ -1181 +1178 @@
                     tth,azm = G2img.GetTthAzm(event.xdata,event.ydata,Data)
                     if 'line3' in  str(item) or 'line4' in str(item) and not Data['fullIntegrate']:
-                        Page.canvas.SetToolTipString('%6d deg'%(azm-azmRot))
+                        Page.canvas.SetToolTipString('%6d deg'%(azm))
                     elif 'line1' in  str(item) or 'line2' in str(item):
                         Page.canvas.SetToolTipString('%8.3fdeg'%(tth))                           
@@ -1198 +1195 @@
                 else:
                     self.G2plotNB.status.SetFields(\
-                        ['','Detector 2-th =%9.3fdeg, dsp =%9.3fA, Q = %6.5fA-1, azm = %7.2fdeg, I = %6d'%(tth,dsp,Q,azm-azmRot,Int)])
+                        ['','Detector 2-th =%9.3fdeg, dsp =%9.3fA, Q = %6.5fA-1, azm = %7.2fdeg, I = %6d'%(tth,dsp,Q,azm,Int)])
 
     def OnImPlotKeyPress(event):
@@ -1494 +1491 @@
             if Data['fullIntegrate']:
                 Azm = np.array(range(0,361))
-                AzmRot = Data['azmthRotate']
             else:
                 Azm = np.array(range(LRAzim[0],LRAzim[1]+1))-AzmthOff
-                AzmRot = 0.0
             if ellI:
                 xyI = []
@@ -1517 +1512 @@
             if Nazm > 1:
                 for i in range(Nazm):
-                    cake = (LRAzim[0]+i*delAzm+AzmRot+720)%360
+                    if Data['fullIntegrate']:
+                        cake = (LRAzim[0]+i*delAzm+720)%360
+                    else:
+                        cake = LRAzim[0]+i*delAzm
                     ind = np.searchsorted(Azm,cake)
                     Plot.plot([arcxI[ind],arcxO[ind]],[arcyI[ind],arcyO[ind]],color='k',dashes=(5,5))