Giuspugl/beamconv

AUTHORS

@@ -1,3 +1,4 @@
 Theodore Kisner <work@theodorekisner.com>
 Reijo Keskitalo <reijo.keskitalo@gmail.com>
 Andrea Zonca <zonca@sdsc.edu>
+Giuseppe Puglisi <giuse.puglisi@gmail.com>

src/toast/pipeline_tools/__init__.py

@@ -37,6 +37,7 @@
     simulate_sky_signal,
     add_conviqt_args,
     apply_conviqt,
+    apply_weighted_conviqt,
 )
 from .sss import add_sss_args, simulate_sss
 from .todground import (

src/toast/pipeline_tools/sky_signal.py

@@ -11,7 +11,7 @@
 from ..utils import Logger, Environment
 
 from ..map import DistPixels
-from ..todmap import OpSimPySM, OpSimScan, OpMadam, OpSimConviqt
+from ..todmap import OpSimPySM, OpSimScan, OpMadam, OpSimConviqt, OpSimWeightedConviqt
 
 
 def add_sky_signal_args(parser):
@@ -205,6 +205,22 @@ def add_conviqt_args(parser):
         dest="conviqt_normalize_beam",
     )
     parser.set_defaults(conviqt_normalize_beam=False)
+
+    parser.add_argument(
+        "--conviqt-calibrate",
+        required=False,
+        action="store_true",
+        help="Normalize the beams",
+        dest="conviqt_calibrate",
+    )
+    parser.add_argument(
+        "--no-conviqt-calibrate",
+        required=False,
+        action="store_false",
+        help="Do not normalize the beams",
+        dest="conviqt_calibrate",
+    )
+    parser.set_defaults(conviqt_calibrate=True)
     parser.add_argument(
         "--conviqt-remove-monopole",
         required=False,
@@ -278,7 +294,7 @@ def apply_conviqt(args, comm, data, cache_prefix="signal", verbose=True):
         pol=True,
         fwhm=args.conviqt_fwhm,
         order=args.conviqt_order,
-        calibrate=True,
+        calibrate=args.conviqt_calibrate,
         dxx=args.conviqt_dxx,
         out=cache_prefix,
         remove_monopole=args.conviqt_remove_monopole,
@@ -310,7 +326,7 @@ def apply_weighted_conviqt(args, comm, data, cache_prefix="signal", verbose=True
     timer.start()
 
     if comm.world_rank == 0 and verbose:
-        log.info("Running Conviqt")
+        log.info("Running Weighted Conviqt")
 
     verbosity = 0
     if verbose:
@@ -327,7 +343,7 @@ def apply_weighted_conviqt(args, comm, data, cache_prefix="signal", verbose=True
         pol=True,
         fwhm=args.conviqt_fwhm,
         order=args.conviqt_order,
-        calibrate=True,
+        calibrate=args.conviqt_calibrate,
         dxx=args.conviqt_dxx,
         out=cache_prefix,
         remove_monopole=args.conviqt_remove_monopole,

src/toast/todmap/__init__.py

@@ -40,7 +40,7 @@
 
 from .pointing_math import aberrate
 
-from .conviqt import OpSimConviqt
+from .conviqt import OpSimConviqt, OpSimWeightedConviqt
 
 from .atm import available_utils as atm_available_utils
 from .mapsampler import MapSampler