Changeset 4593

Timestamp:

Oct 13, 2020 2:16:15 PM (2 years ago)

Author:

vondreele

Message:

fix image plotting issues with 2-theta limits, arc & ring masks & azimuth limits with new GetDetectorXY code

Location:

trunk

Files:

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

trunk/GSASIIimage.py

@@ -507 +507 @@
     xyz -= np.array([0.,0.,dist])                 #translate back
     xyz = np.inner(xyz,iMN)
-    return xyz[:2]+cent
+    return np.squeeze(xyz)[:2]+cent
         
 def GetDetectorXY2(dsp,azm,data):
@@ -638 +638 @@
     distsq = data['distance']**2
     G = ((dx-x0x)**2+(dy-x0y)**2+distsq)/distsq       #for geometric correction = 1/cos(2theta)^2 if tilt=0.
-    return np.array([tth,azm,G,dsp])
+    return tth,azm,G,dsp
     
 def GetTth(x,y,data):

trunk/GSASIIplot.py

@@ -6822 +6822 @@
     Azm = np.linspace(*aR)
     for azm in Azm:
-        XY = G2img.GetDetectorXY(Dsp(angI,wave),azm,Data)
+        XY = G2img.GetDetectorXY(Dsp(np.squeeze(angI),wave),azm,Data)
         if XY is not None:
             xy1.append(XY)      #what about hyperbola
-        XY = G2img.GetDetectorXY(Dsp(angO,wave),azm,Data)
+        XY = G2img.GetDetectorXY(Dsp(np.squeeze(angO),wave),azm,Data)
         if XY is not None:
             xy2.append(XY)      #what about hyperbola
@@ -7248 +7248 @@
                     azm[0] += off
                     azm[1] -= off
-                (x1,y1),(x2,y2) = ComputeArc(angI,angO,wave,*azm)
+                (x1,y1),(x2,y2) = ComputeArc(np.squeeze(angI),np.squeeze(angO),wave,*azm)
                 pI,pO,pL,pU = G2frame.arcList[pick.itemNumber]
                 pI.set_data((x2,y2))
@@ -7717 +7717 @@
                 xyO = []
                 arcxO = []
-                arcxI = []
                 for azm in Azm:
                     xy = G2img.GetDetectorXY(dspO,azm,Data)
@@ -7726 +7725 @@
                     arcxO,arcyO = xyO.T                
                     Plot.plot(arcxO,arcyO,picker=3,label='Otth')
-            if ellO and ellI and len(arcxO) and len(arcxI):
+            if ellO and ellI and len(arcxO):
                 Plot.plot([arcxI[0],arcxO[0]],[arcyI[0],arcyO[0]],picker=3,label='Lazm')
                 Plot.plot([arcxI[-1],arcxO[-1]],[arcyI[-1],arcyO[-1]],picker=3,label='Uazm')
@@ -7734 +7733 @@
                     cake += delAzm/2.
                 ind = np.searchsorted(Azm,cake)
-                if len(arcxO) and len(arcxI):
+                if len(arcxO):
                     Plot.plot([arcxI[ind],arcxO[ind]],[arcyI[ind],arcyO[ind]],color='k',dashes=(5,5))
         if 'linescan' in Data and Data['linescan'][0] and G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Image Controls',]:
@@ -7794 +7793 @@
         for iarc,arc in enumerate(Masks['Arcs']):      # drawing arc masks
             if arc:
-                tth,azm,thick = arc           
+                tth,azm,thick = arc
+                azm = np.squeeze(azm)
                 wave = Data['wavelength']
                 (x1,y1),(x2,y2) = ComputeArc(tth-thick/2.,tth+thick/2.,wave,azm[0],azm[1])