Changeset 282

Timestamp:

May 5, 2011 2:19:40 PM (14 years ago)

Author:

vondreele

Message:

fix "off by one" error in polymask.for
fix azimuth error in integration & plotting

Location:

trunk

Files:

• GSASIIimage.py (modified) (6 diffs)
• GSASIIplot.py (modified) (1 diff)
• binwin2.7/polymask.pyd (modified) (previous)
• fsource/polymask.for (modified) (1 diff)

trunk/GSASIIimage.py ¶

@@ -202 +202 @@
     cphi = cosd(phi)
     sphi = sind(phi)
-    ring = []
     if azm:
-        aR = azm[0]-90,azm[1]-90,1
+        aR = azm[0]-90,azm[1]-90,azm[1]-azm[0]
         if azm[1]-azm[0] > 180:
-            aR[2] = 2
-    else:
-        aR = 0,362,2
-    for a in range(aR[0],aR[1],aR[2]):
-        x = radii[0]*cosd(a-phi)
-        y = radii[1]*sind(a-phi)
-        X = (cphi*x-sphi*y+cent[0])
-        Y = (sphi*x+cphi*y+cent[1])
-        ring.append([X,Y])
-    return ring
-    
+            aR[2] /= 2
+    else:
+        aR = 0,362,181
+        
+    a = np.linspace(aR[0],aR[1],aR[2])
+    x = radii[0]*npcosd(a-phi)
+    y = radii[1]*npsind(a-phi)
+    X = (cphi*x-sphi*y+cent[0])
+    Y = (sphi*x+cphi*y+cent[1])
+    return zip(X,Y)
+                
 def calcDist(radii,tth):
     stth = sind(tth)
@@ -511 +510 @@
     scaley = pixelSize[1]/1000.
     
-    tay,tax = np.mgrid[iLim[0]+0.5:iLim[1]+.5,jLim[0]+.5:jLim[1]+.5]         #bin centers not corners
+#    tay,tax = np.mgrid[iLim[0]+0.5:iLim[1]+.5,jLim[0]+.5:jLim[1]+.5]         #bin centers not corners
+    tay,tax = np.mgrid[iLim[0]:iLim[1],jLim[0]:jLim[1]]         #bin corners
     tax = np.asfarray(tax*scalex,dtype=np.float32)
     tay = np.asfarray(tay*scaley,dtype=np.float32)
@@ -519 +519 @@
     spots = masks['Points']
     polygons = masks['Polygons']
-    tam = ma.make_mask_none((iLim[1]-iLim[0],jLim[1]-jLim[0]))
+    tam = ma.make_mask_none((nI,nJ))
     for polygon in polygons:
         if polygon:
             tamp = ma.make_mask_none((nI*nJ))
-            tam = ma.mask_or(tam.flatten(),ma.make_mask(pm.polymask(nI*nJ,
-                tax.flatten(),tay.flatten(),len(polygon),polygon,tamp)))
+            tamp = ma.make_mask(pm.polymask(nI*nJ,tax.flatten(),
+                tay.flatten(),len(polygon),polygon,tamp))
+            tam = ma.mask_or(tam.flatten(),tamp)
     if tam.shape: tam = np.reshape(tam,(nI,nJ))
     for X,Y,diam in spots:
-        tam = ma.mask_or(tam,ma.getmask(ma.masked_less((tax-X)**2+(tay-Y)**2,(diam/2.)**2)))
-    return np.array(GetTthAzm(tax,tay,data)),tam           #2-theta & azimuth arrays & position mask
+        tamp = ma.getmask(ma.masked_less((tax-X)**2+(tay-Y)**2,(diam/2.)**2))
+        tam = ma.mask_or(tam,tamp)
+    TA = np.array(GetTthAzm(tax,tay,data))
+    TA[1] = np.where(TA[1]<0,TA[1]+360,TA[1])
+    return np.array(TA),tam           #2-theta & azimuth arrays & position mask
 
 def Fill2ThetaAzimuthMap(masks,TA,tam,image):
@@ -540 +544 @@
         tam = ma.mask_or(tam.flatten(),ma.getmask(ma.masked_inside(tay.flatten(),max(0.01,tth-thick/2.),tth+thick/2.)))
     for tth,azm,thick in arcs:
-        tam = ma.mask_or(tam.flatten(),ma.getmask(ma.masked_inside(tay.flatten(),max(0.01,tth-thick/2.),tth+thick/2.))* \
-            ma.getmask(ma.masked_inside(tax.flatten(),azm[0],azm[1])))
+        tamt = ma.getmask(ma.masked_inside(tay.flatten(),max(0.01,tth-thick/2.),tth+thick/2.))
+        tama = ma.getmask(ma.masked_inside(tax.flatten(),azm[0],azm[1]))
+        tam = ma.mask_or(tam.flatten(),tamt*tama)
     taz = ma.masked_outside(image.flatten(),int(Zlim[0]),Zlim[1])
     tam = ma.mask_or(tam.flatten(),ma.getmask(taz))
@@ -554 +559 @@
     print 'Begin image integration'
     LUtth = data['IOtth']
-    if data['fullIntegrate']:
-        LRazm = [0,360]
-    else:
-        LRazm = data['LRazimuth']
+    LRazm = data['LRazimuth']
     numAzms = data['outAzimuths']
     numChans = data['outChannels']
@@ -583 +585 @@
                 print 'Process map block:',iBlk,jBlk,' limits:',iBeg,iFin,jBeg,jFin
                 TA,tam = Make2ThetaAzimuthMap(data,masks,(iBeg,iFin),(jBeg,jFin))           #2-theta & azimuth arrays & create position mask
+                
                 Nup += 1
                 dlg.Update(Nup)

trunk/GSASIIplot.py ¶

@@ -1648 +1648 @@
             x,y = np.hsplit(ring,2)
             tth,azm = G2img.GetTthAzm(x,y,Data)
+            azm = np.where(azm < 0.,azm+360,azm)
             Plot.plot(tth,azm,'b,')
     if not newPlot:

trunk/fsource/polymask.for ¶

@@ -16 +16 @@
       REAL*4       X(0:N-1),Y(0:N-1)
       REAL*8       POLY(0:M-1,0:1)
-      LOGICAL*1    MASK(N)
+      LOGICAL*1    MASK(0:N-1)
 
       INTEGER*4    I,K