Changeset 87 for trunk/GSASIIimage.py

Timestamp:

Jun 15, 2010 1:21:20 PM (12 years ago)

Author:

vondreel

Message:

"Spots" in Masks is really "Points"
Start of "points" for masks

File:

• trunk/GSASIIimage.py (modified) (4 diffs)

trunk/GSASIIimage.py

@@ -434 +434 @@
     return True
     
-def Make2ThetaAzimuthMap(data,imageN):
+def Make2ThetaAzimuthMap(data,masks,imageN):
     #transforms 2D image from x,y space to 2-theta,azimuth space based on detector orientation
     pixelSize = data['pixelSize']
@@ -442 +442 @@
     tax = np.asfarray(tax*scalex,dtype=np.float32)
     tay = np.asfarray(tay*scaley,dtype=np.float32)
-    return GetTthAzm(tay,tax,data)           #2-theta & azimuth arrays
+    #make position masks here
+    XY = np.dstack((tax,tay))
+    return GetTthAzm(tay,tax,data),0           #2-theta & azimuth arrays & position mask
 
-def Fill2ThetaAzimuthMap(masks,TA,image):
+def Fill2ThetaAzimuthMap(masks,TA,tam,image):
     import numpy.ma as ma
     Zlim = masks['Thresholds'][1]
@@ -481 +483 @@
         dlg.Update(0)
         imageN = len(self.ImageZ)
-        TA = Make2ThetaAzimuthMap(data,imageN)           #2-theta & azimuth arrays
+        TA,tam = Make2ThetaAzimuthMap(data,masks,imageN)           #2-theta & azimuth arrays & create position mask
         dlg.Update(1)
         print 'Fill map with 2-theta/azimuth values'
-        tax,tay,taz = Fill2ThetaAzimuthMap(masks,TA,self.ImageZ)
+        tax,tay,taz = Fill2ThetaAzimuthMap(masks,TA,tam,self.ImageZ)    #and apply masks
         del TA
         dlg.Update(2)
@@ -496 +498 @@
         dlg.Update(4)
         t1 = time.time()
+        print "Elapsed time:","%8.3f"%(t1-t0), "s"
         print 'Integration complete'
-        print "Elapsed time:","%8.3f"%(t1-t0), "s"
     finally:
         dlg.Destroy()