Changeset 1151

Timestamp:

Nov 25, 2013 2:01:08 PM (9 years ago)

Author:

vondreele

Message:

fix ring & arc masks

Location:

trunk

Files:

• GSASIIimage.py (modified) (1 diff)
• GSASIIplot.py (modified) (7 diffs)

trunk/GSASIIimage.py

@@ -279 +279 @@
     return ring,(delt > 90),sumI/len(ring)
     
-def makeIdealRing(ellipse,azm=None):
-    'Needs a doc string'
-    cent,phi,radii = ellipse
-    cphi = cosd(phi)
-    sphi = sind(phi)
-    if azm:
-        aR = azm[0]-90,azm[1]-90,azm[1]-azm[0]
-        if azm[1]-azm[0] > 180:
-            aR[2] /= 2
-    else:
-        aR = 0,362,181
-        
-    a = np.linspace(aR[0],aR[1],aR[2])
-    slr = radii[0]**2/radii[1]
-    rat2 = (radii[0]/radii[1])**2
-    if radii[0] > 0.:       #ellipse
-        ecc = np.sqrt(max(1.-rat2,0.))
-    else:                   #hyperbola
-        ecc = np.sqrt(1.+rat2)
-    rad = slr/(1.+ecc*npcosd(a))
-    xy = np.array([rad*npsind(a)+cent[0],rad*npcosd(a)+cent[1]])
-    return xy
-                    
-def calcDist(radii,tth):
-    'Needs a doc string'
-    stth = sind(tth)
-    ctth = cosd(tth)
-    ttth = tand(tth)
-    return math.sqrt(radii[0]**4/(ttth**2*((radii[0]*ctth)**2+(radii[1]*stth)**2)))
-    
-def calcZdisCosB(radius,tth,radii):
-    'Needs a doc string'
-    cosB = sinb = radii[0]**2/(radius*radii[1])
-    if cosB > 1.:
-        return 0.,1.
-    else:
-        cosb = math.sqrt(1.-sinb**2)
-        ttth = tand(tth)
-        zdis = radii[1]*ttth*cosb/sinb
-        return zdis,cosB
-        
 def GetEllipse2(tth,dxy,dist,cent,tilt,phi):
     '''uses Dandelin spheres to find ellipse or hyperbola parameters from detector geometry

trunk/GSASIIplot.py

@@ -2113 +2113 @@
     from matplotlib.patches import Ellipse,Arc,Circle,Polygon
     import numpy.ma as ma
-    Dsp = lambda tth,wave: wave/(2.*sind(tth/2.))
+    Dsp = lambda tth,wave: wave/(2.*npsind(tth/2.))
     global Data,Masks
     colors=['b','g','r','c','m','k']
@@ -2494 +2494 @@
                 xyI = []
                 for azm in Azm:
-                    xyI.append(G2img.GetDetectorXY(dspI,azm,Data))
+                    xyI.append(G2img.GetDetectorXY(dspI,azm,Data))      #what about hyperbola?
                 xyI = np.array(xyI)
                 arcxI,arcyI = xyI.T
@@ -2501 +2501 @@
                 xyO = []
                 for azm in Azm:
-                    xyO.append(G2img.GetDetectorXY(dspO,azm,Data))
+                    xyO.append(G2img.GetDetectorXY(dspO,azm,Data))      #what about hyperbola?
                 xyO = np.array(xyO)
                 arcxO,arcyO = xyO.T
@@ -2519 +2519 @@
                 Plot.plot(xring,yring,'r+',picker=3)
             if Data['setRings']:
-    #            rings = np.concatenate((Data['rings']),axis=0)
                 N = 0
                 for ring in Data['rings']:
@@ -2525 +2524 @@
                     Plot.plot(xring,yring,'+',color=colors[N%6])
                     N += 1            
-            for ellipse in Data['ellipses']:
-#                print 'plot:',ellipse
+            for ellipse in Data['ellipses']:      #what about hyperbola?
                 cent,phi,[width,height],col = ellipse
-                Plot.add_artist(Ellipse([cent[0],cent[1]],2*width,2*height,phi,ec=col,fc='none'))
-                Plot.text(cent[0],cent[1],'+',color=col,ha='center',va='center')
+                if width > 0:       #ellipses
+                    Plot.add_artist(Ellipse([cent[0],cent[1]],2*width,2*height,phi,ec=col,fc='none'))
+                    Plot.text(cent[0],cent[1],'+',color=col,ha='center',va='center')
         if G2frame.PatternTree.GetItemText(G2frame.PickId) in 'Stress/Strain':
             print 'plot stress/strain stuff'
@@ -2555 +2554 @@
                 tth,thick = ring
                 wave = Data['wavelength']
-                x1,y1 = np.hsplit(np.array(G2img.makeIdealRing(G2img.GetEllipse(Dsp(tth+thick/2.,wave),Data))),2)
-                x2,y2 = np.hsplit(np.array(G2img.makeIdealRing(G2img.GetEllipse(Dsp(tth-thick/2.,wave),Data))),2)
+                xy1 = []
+                xy2 = []
+                Azm = np.linspace(0,362,181)
+                for azm in Azm:
+                    xy1.append(G2img.GetDetectorXY(Dsp(tth+thick/2.,wave),azm,Data))      #what about hyperbola
+                    xy2.append(G2img.GetDetectorXY(Dsp(tth-thick/2.,wave),azm,Data))      #what about hyperbola
+                x1,y1 = np.array(xy1).T
+                x2,y2 = np.array(xy2).T
                 G2frame.ringList.append([Plot.plot(x1,y1,'r',picker=3),iring,'o'])            
                 G2frame.ringList.append([Plot.plot(x2,y2,'r',picker=3),iring,'i'])
@@ -2564 +2569 @@
                 tth,azm,thick = arc           
                 wave = Data['wavelength']
-                x1,y1 = np.hsplit(np.array(G2img.makeIdealRing(G2img.GetEllipse(Dsp(tth+thick/2.,wave),Data),azm)),2)
-                x2,y2 = np.hsplit(np.array(G2img.makeIdealRing(G2img.GetEllipse(Dsp(max(0.01,tth-thick/2.),wave),Data),azm)),2)
+                xy1 = []
+                xy2 = []
+                aR = azm[0],azm[1],azm[1]-azm[0]
+                if azm[1]-azm[0] > 180:
+                    aR[2] /= 2
+                Azm = np.linspace(aR[0],aR[1],aR[2])
+                for azm in Azm:
+                    xy1.append(G2img.GetDetectorXY(Dsp(tth+thick/2.,wave),azm,Data))      #what about hyperbola
+                    xy2.append(G2img.GetDetectorXY(Dsp(tth-thick/2.,wave),azm,Data))      #what about hyperbola
+                x1,y1 = np.array(xy1).T
+                x2,y2 = np.array(xy2).T
                 G2frame.arcList.append([Plot.plot(x1,y1,'r',picker=3),iarc,'o'])            
                 G2frame.arcList.append([Plot.plot(x2,y2,'r',picker=3),iarc,'i'])