Merge pull request #341 from LSSTDESC/fourier_configure

More configurable TXTwoPointFourier

examples/metacal/config.yml

@@ -289,6 +289,10 @@ TXTwoPointFourier:
     ell_max: 150
     bandwidth: 20
     cache_dir: ./cache/workspaces
+    do_shear_shear: True
+    do_shear_pos: True
+    do_pos_pos: True
+    compute_theory: True
 
 TXSimpleMask:
     depth_cut : 23.5

examples/metadetect/config.yml

@@ -297,6 +297,10 @@ TXTwoPointFourier:
     ell_max: 100
     bandwidth: 20
     cache_dir: ./cache/workspaces
+    do_shear_shear: True
+    do_shear_pos: True
+    do_pos_pos: True
+    compute_theory: True
 
 TXSimpleMaskFrac:
     supreme_map_file: data/example/inputs/supreme_dc2_dr6d_v2_g_nexp_sum_1deg2.hs

txpipe/data_types/types.py

@@ -197,9 +197,9 @@ def read_map(self, map_name):
             raise ValueError(f"Unknown map pixelization type {pixelization}")
         return m
 
-    def read_mask(self):
+    def read_mask(self, thresh=0):
         mask = self.read_map("mask")
-        mask[mask < 0] = 0
+        mask[mask <= thresh] = 0
         return mask
 
     def write_map(self, map_name, pixel, value, metadata):

txpipe/maps.py

@@ -425,22 +425,18 @@ class TXDensityMaps(PipelineStage):
         ("density_maps", MapsFile),
     ]
     config_options = {
-        'weight_thresh': 0.
+        "mask_threshold": 0.0
     }
 
     def run(self):
         import healpy
 
-        # Read the mask
+        # Read the mask and set all pixels below the threshold to 0
         with self.open_input("mask", wrapper=True) as f:
-            mask = f.read_map("mask")
-
-        # set unseen pixels to weight zero
-        mask[mask == healpy.UNSEEN] = 0
-        mask[np.isnan(mask)] = 0
-        mask = mask.flatten()
-        #identify pixels to keep (i.e. mask value above specified threshold)
-        pix_keep = mask > self.config['weight_thresh']
+            mask = f.read_mask(thresh=self.config["mask_threshold"])
+
+        #identify unmasked pixels
+        pix_keep = mask > 0.
         pix = np.where(pix_keep)[0]
 
         # Read the count maps