Changeset 4712

Timestamp:

Jan 4, 2021 2:46:25 PM (3 years ago)

Author:

vondreele

Message:

fix plotting of image limit ellipses - wrong call (GetDetectorXY) used. Should be GetDetectorXY2

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (6 diffs)

trunk/GSASIIimgGUI.py

@@ -1762 +1762 @@
                 dsp0 = wave/(2.0*sind(LUtth[0]/2.0))
                 dsp1 = wave/(2.0*sind(LUtth[1]/2.0))
-                x0 = G2img.GetDetectorXY(dsp0,0.0,Controls)[0]
-                x1 = G2img.GetDetectorXY(dsp1,0.0,Controls)[0]
+                x0 = G2img.GetDetectorXY2(dsp0,0.0,Controls)[0]
+                x1 = G2img.GetDetectorXY2(dsp1,0.0,Controls)[0]
                 if not np.any(x0) or not np.any(x1):
                     raise Exception
@@ -1797 +1797 @@
                     dsp0 = wave/(2.0*sind(LUtth[0]/2.0))
                     dsp1 = wave/(2.0*sind(LUtth[1]/2.0))
-                    x0 = G2img.GetDetectorXY(dsp0,0.0,Controls)[0]
-                    x1 = G2img.GetDetectorXY(dsp1,0.0,Controls)[0]
+                    x0 = G2img.GetDetectorXY2(dsp0,0.0,Controls)[0]
+                    x1 = G2img.GetDetectorXY2(dsp1,0.0,Controls)[0]
                     if not np.any(x0) or not np.any(x1):
                         raise Exception

trunk/GSASIIplot.py

@@ -6955 +6955 @@
     Azm = np.linspace(*aR)
     for azm in Azm:
-        XY = G2img.GetDetectorXY(Dsp(np.squeeze(angI),wave),azm,Data)
+        XY = G2img.GetDetectorXY2(Dsp(np.squeeze(angI),wave),azm,Data)
         if np.any(XY):
             xy1.append(XY)      #what about hyperbola
-        XY = G2img.GetDetectorXY(Dsp(np.squeeze(angO),wave),azm,Data)
+        XY = G2img.GetDetectorXY2(Dsp(np.squeeze(angO),wave),azm,Data)
         if np.any(XY):
             xy2.append(XY)      #what about hyperbola
@@ -7240 +7240 @@
                 xyI = []
                 for azm in Azm:
-                    xy = G2img.GetDetectorXY(dspI,azm,Data)
+                    xy = G2img.GetDetectorXY2(dspI,azm,Data)
                     if np.any(xy):
                         xyI.append(xy)
@@ -7249 +7249 @@
                 xyO = []
                 for azm in Azm:
-                    xy = G2img.GetDetectorXY(dspO,azm,Data)
+                    xy = G2img.GetDetectorXY2(dspO,azm,Data)
                     if np.any(xy):
                         xyO.append(xy)
@@ -7720 +7720 @@
             G2frame.itemPicked = None
             
-    # PlotImage execution starts here
+#### PlotImage execution starts here
     if not len(G2frame.ImageZ):
         return
@@ -7844 +7844 @@
                 xyI = []
                 for azm in Azm:
-                    xy = G2img.GetDetectorXY(dspI,azm,Data)
+                    xy = G2img.GetDetectorXY2(dspI,azm,Data)
                     if np.any(xy):
                         xyI.append(xy)
@@ -7855 +7855 @@
                 arcxO = []
                 for azm in Azm:
-                    xy = G2img.GetDetectorXY(dspO,azm,Data)
+                    xy = G2img.GetDetectorXY2(dspO,azm,Data)
                     if np.any(xy):
                         xyO.append(xy)