Changeset 55 for trunk/GSASIIplot.py

Timestamp:

Apr 29, 2010 12:27:45 PM (13 years ago)

Author:

vondreel

Message:

3rd try - reduce meatrices in integration

File:

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

trunk/GSASIIplot.py

@@ -550 +550 @@
                 if (0 <= xpix <= size) and (0 <= ypix <= size):
                     Page.canvas.SetToolTipString('%6d'%(self.ImageZ[ypix][xpix]))
-                tth,azm,dsp = G2cmp.GetTthDspAzm(xpos,ypos,Data)
+                tth,azm,dsp = G2cmp.GetTthAzmDsp(xpos,ypos,Data)
                 Q = 2.*math.pi/dsp
                 self.G2plotNB.status.SetFields(\
@@ -609 +609 @@
                             rings.remove(ring)                                                                       
                 else:
-                    tth,azm,dsp = G2cmp.GetTthDspAzm(xpos,ypos,Data)
+                    tth,azm,dsp = G2cmp.GetTthAzmDsp(xpos,ypos,Data)
                     if 'Line2D' in str(self.itemPicked):
                         if 'line1' in str(self.itemPicked):
@@ -738 +738 @@
         if azm and tth:
             self.G2plotNB.status.SetFields(\
-                ['Detector 2-th =%9.2fdeg, azm = %7.2fdeg'%(tth,azm),])
+                ['Detector 2-th =%9.3fdeg, azm = %7.2fdeg'%(tth,azm),])
                     
     def OnPick(event):
@@ -809 +809 @@
     Plot.set_xlabel('azimuth',fontsize=12)
     Plot.set_ylabel('2-theta',fontsize=12)
-    Plot.contour(self.TA[:,:,0],self.TA[:,:,1],self.TA[:,:,2],V,cmap=acolor)
+    Plot.contour(self.TA[:,:,0],self.TA[:,:,1],image,V,cmap=acolor)
     if Data['showLines']:
         IOtth = Data['IOtth']
@@ -826 +826 @@
             x,y = G2cmp.GetTthAzm(xring,yring,Data)
             Plot.plot(y,x,'r+')            
-    for ellipse in Data['ellipses']:
-        ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color
-        x,y = np.hsplit(ring,2)
-        tth,azm = G2cmp.GetTthAzm(x,y,Data)
-        Plot.plot(azm,tth,'b')
+        for ellipse in Data['ellipses']:
+            ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color
+            x,y = np.hsplit(ring,2)
+            tth,azm = G2cmp.GetTthAzm(x,y,Data)
+            Plot.plot(azm,tth,'b,')
     if not newPlot:
         Page.toolbar.push_current()
@@ -859 +859 @@
         if azm and tth:
             self.G2plotNB.status.SetFields(\
-                ['Detector 2-th =%9.2fdeg, azm = %7.2fdeg'%(tth,azm),])
+                ['Detector 2-th =%9.3fdeg, azm = %7.2fdeg'%(tth,azm),])
                                 
     try:
@@ -889 +889 @@
     Plot.set_xlabel('2-theta',fontsize=12)
     Plot.imshow(image,cmap=acolor,vmin=Imin,vmax=Imax,interpolation='nearest', \
-        extent=[ysc[0],ysc[-1],xsc[0],xsc[-1]],aspect='auto')
+        extent=[ysc[0],ysc[-1],xsc[-1],xsc[0]],aspect='auto')
     if Data['setRings']:
         rings = np.concatenate((Data['rings']),axis=0)
@@ -895 +895 @@
             x,y = G2cmp.GetTthAzm(xring,yring,Data)
             Plot.plot(x,y,'r+')            
-    for ellipse in Data['ellipses']:
-        ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color
-        x,y = np.hsplit(ring,2)
-        tth,azm = G2cmp.GetTthAzm(x,y,Data)
-        Plot.plot(tth,azm,'b')
+        for ellipse in Data['ellipses']:
+            ring = np.array(G2cmp.makeIdealRing(ellipse[:3])) #skip color
+            x,y = np.hsplit(ring,2)
+            tth,azm = G2cmp.GetTthAzm(x,y,Data)
+            Plot.plot(tth,azm,'b,')
     if not newPlot:
         Page.toolbar.push_current()