Changeset 98

Timestamp:

Jul 1, 2010 11:32:40 AM (12 years ago)

Author:

vondreel

Message:

new fortran polymask used

Location:

trunk

Files:

• GSASIIimage.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -5 +5 @@
 import numpy as np
 import numpy.linalg as nl
+import GSASIIpath
 import GSASIIplot as G2plt
 import GSASIIlattice as G2lat
@@ -460 +461 @@
 def Make2ThetaAzimuthMap(data,masks,imageN):
     import numpy.ma as ma
+    import polymask as pm
     #transforms 2D image from x,y space to 2-theta,azimuth space based on detector orientation
     pixelSize = data['pixelSize']
@@ -471 +473 @@
     polygons = masks['Polygons']
     tam = ma.make_mask_none((imageN,imageN))
+    for polygon in polygons:
+        tamp = ma.make_mask_none((imageN*imageN))
+        tam = ma.mask_or(tam.flatten(),ma.make_mask(pm.polymask(imageN*imageN,
+            tax.flatten(),tay.flatten(),len(polygon),polygon,tamp)))
+    tam = np.reshape(tam,(imageN,imageN))
     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)))
-    for polygon in polygons:
-        tam = ma.mask_or(tam.flatten(),ma.make_mask([pointInPolygon(polygon,xy) for xy in zip(tax.flatten(),tay.flatten())]))
     return GetTthAzm(tax,tay,data),tam           #2-theta & azimuth arrays & position mask
 

trunk/GSASIIimgGUI.py

@@ -589 +589 @@
             spotText = wx.TextCtrl(parent=self.dataDisplay,value=("%.2f,%.2f" % (x,y)),
                 style=wx.TE_READONLY)
-            spotTextazmText
+            spotText.SetBackgroundColour(VERY_LIGHT_GREY)
             littleSizer.Add(spotText,0,wx.ALIGN_CENTER_VERTICAL)
             spotText.Bind(wx.EVT_ENTER_WINDOW,OnTextMsg)