Changeset 4034 for trunk

Timestamp:

Jun 20, 2019 3:13:53 PM (6 years ago)

Author:

vondreele

Message:

implement xline & yline masks to integration - still checking it

Location:

trunk

Files:

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

trunk/GSASIIimage.py ¶

@@ -901 +901 @@
             tam = ma.mask_or(tam,ma.make_mask(pm.polymask(nI*nJ,tax,
                 tay,len(polygon),polygon,tamp)[:nI*nJ]))
-    if True:
-        for X,Y,rsq in masks['Points'].T:
-            tam = ma.mask_or(tam,ma.getmask(ma.masked_less((tax-X)**2+(tay-Y)**2,rsq)))
-    if tam.shape: tam = np.reshape(tam,(nI,nJ))
+    for X,Y,rsq in masks['Points'].T:
+        tam = ma.mask_or(tam,ma.getmask(ma.masked_less((tax-X)**2+(tay-Y)**2,rsq)))
+    if tam.shape: 
+        tam = np.reshape(tam,(nI,nJ))
+    else:
+        tam = ma.make_mask_none((nI,nJ))
+    for xline in masks.get('Xlines',[]):    #a y pixel position
+        if iLim[0] <= xline <= iLim[1]:
+            tam[iLim[1]-xline,:] = True
+    for yline in masks.get('Ylines',[]):    #a x pixel position
+        if jLim[0] <= yline <= jLim[1]:
+            tam[:,jLim[1]-yline] = True            
     return tam           #position mask
 

trunk/GSASIIimgGUI.py ¶

@@ -1359 +1359 @@
     before they are used for integration.
     '''
-    for key in ['Points','Rings','Arcs','Polygons','Xlines','Ylines',]:
+    for key in ['Points','Rings','Arcs','Polygons',]:
         data[key] = data.get(key,[])
         l1 = len(data[key])