fix planck survey name in paramfiles, add options to deal with beam

Serena Giardiello · Serena Giardiello · commit bec8b8a136ed · 2026-06-25T12:56:04.000-04:00
chrom per survey
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes.dict
@@ -16,8 +16,17 @@ sim_spec_dir = data_dir + f'sims/spectra/{run_name}/'
 spec_dir = data_dir + f'spectra/{run_name}/'
 cov_dir = data_dir + f'covariances/{run_name}/'
 window_dir = data_dir + f'windows/{run_name}/'
+sacc_dir = data_dir + f'sacc/{run_name}/'
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+nulls_dir = f'nulls/{run_name}'
+nulls_yaml = yaml_dir + "post_spectra.yaml"
+
+sacc_fname = "simu_sacc"
+# start and stop for sacc sim
+iStart = 0
+iStop = 100
+
+# surveys = ['dr6', 'planck', 'lat_iso']
 # surveys = ['dr6', 'lat_iso']
 surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
@@ -148,6 +157,8 @@ freq_info_lat_iso_i5_f220 = {'freq_tag': 220, 'passband': passband_dir_lat_iso +
 freq_info_lat_iso_i5_f280 = {'freq_tag': 280, 'passband': passband_dir_lat_iso + 'bandpass_mean_f280.dat'}
 
 include_beam_chromaticity_effect_in_best_fit = False
+include_beam_chromaticity_effect_in_sacc = False
+
 beam_dir_dr6 = '/scratch/gpfs/SIMONSOBS/lat-iso/beams/dr6/main_beams/'
 beam_T_dr6_pa4_f220 = beam_dir_dr6 + 'coadd_pa4_f220_night_beam_tform_jitter_cmb.txt'
 beam_T_dr6_pa5_f090 = beam_dir_dr6 + 'coadd_pa5_f090_night_beam_tform_jitter_cmb.txt'
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_cal_poleff.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_cal_poleff.dict
@@ -16,11 +16,17 @@ sim_spec_dir = data_dir + f'sims/spectra/{run_name}/'
 spec_dir = data_dir + f'spectra/{run_name}/'
 cov_dir = data_dir + f'covariances/{run_name}/'
 window_dir = data_dir + f'windows/{run_name}/'
+sacc_dir = data_dir + f'sacc/{run_name}/'
 
 nulls_dir = f'nulls/{run_name}'
 nulls_yaml = yaml_dir + "post_spectra.yaml"
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+sacc_fname = "simu_sacc"
+# start and stop for sacc sim
+iStart = 0
+iStop = 100
+
+# surveys = ['dr6', 'planck', 'lat_iso']
 # surveys = ['dr6', 'lat_iso']
 surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
@@ -175,6 +181,7 @@ freq_info_lat_iso_i5_f220 = {'freq_tag': 220, 'passband': passband_dir_lat_iso +
 freq_info_lat_iso_i5_f280 = {'freq_tag': 280, 'passband': passband_dir_lat_iso + 'bandpass_mean_f280.dat'}
 
 include_beam_chromaticity_effect_in_best_fit = False
+include_beam_chromaticity_effect_in_sacc = False
 
 beam_dir_planck = '/scratch/gpfs/SIMONSOBS/lat-iso/beams/planck/legacy/main_beams/'
 beam_T_planck_f100 = beam_dir_planck + "bl_T_legacy_100hm1x100hm2.dat"
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_cal_poleff_beam_chrom.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_cal_poleff_beam_chrom.dict
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_el_split.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_el_split.dict
@@ -17,7 +17,7 @@ spec_dir = data_dir + f'spectra/{run_name}/'
 cov_dir = data_dir + f'covariances/{run_name}/'
 window_dir = data_dir + f'windows/{run_name}/'
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+# surveys = ['dr6', 'planck', 'lat_iso']
 # surveys = ['dr6', 'lat_iso']
 surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_el_split_cal_poleff.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_el_split_cal_poleff.dict
@@ -17,7 +17,7 @@ spec_dir = data_dir + f'spectra/{run_name}/'
 cov_dir = data_dir + f'covariances/{run_name}/'
 window_dir = data_dir + f'windows/{run_name}/'
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+# surveys = ['dr6', 'planck', 'lat_iso']
 # surveys = ['dr6', 'lat_iso']
 surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_flip_split_cal_poleff.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_flip_split_cal_poleff.dict
@@ -17,7 +17,7 @@ spec_dir = data_dir + f'spectra/{run_name}/'
 cov_dir = data_dir + f'covariances/{run_name}/'
 window_dir = data_dir + f'windows/{run_name}/'
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+# surveys = ['dr6', 'planck', 'lat_iso']
 # surveys = ['dr6', 'lat_iso']
 surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_inout_split.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_inout_split.dict
@@ -17,7 +17,7 @@ spec_dir = data_dir + f'spectra/{run_name}/'
 cov_dir = data_dir + f'covariances/{run_name}/'
 window_dir = data_dir + f'windows/{run_name}/'
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+# surveys = ['dr6', 'planck', 'lat_iso']
 # surveys = ['dr6', 'lat_iso']
 surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_kspace_corrections.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_kspace_corrections.dict
@@ -24,7 +24,7 @@ sacc_dir = data_dir + f'sacc/{run_name}/'
 nulls_dir = f'nulls/{run_name}'
 nulls_yaml = yaml_dir + "post_spectra.yaml"
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+# surveys = ['dr6', 'planck', 'lat_iso']
 # surveys = ['dr6', 'lat_iso']
 surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_pwv_split.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_pwv_split.dict
@@ -17,7 +17,7 @@ spec_dir = data_dir + f'spectra/{run_name}/'
 cov_dir = data_dir + f'covariances/{run_name}/'
 window_dir = data_dir + f'windows/{run_name}/'
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+# surveys = ['dr6', 'planck', 'lat_iso']
 # surveys = ['dr6', 'lat_iso']
 surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
diff --git a/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_pwv_split_cal_poleff.dict b/project/SO/pISO/paramfiles/deep56_20260201_skn_50cg_inpaint_holes_pwv_split_cal_poleff.dict
@@ -17,7 +17,7 @@ spec_dir = data_dir + f'spectra/{run_name}/'
 cov_dir = data_dir + f'covariances/{run_name}/'
 window_dir = data_dir + f'windows/{run_name}/'
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+# surveys = ['dr6', 'planck', 'lat_iso']
 # surveys = ['dr6', 'lat_iso']
 surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
diff --git a/project/SO/pISO/paramfiles/dr6xdeep56_20260201_skn_50cg_inpaint_holes_cal_poleff.dict b/project/SO/pISO/paramfiles/dr6xdeep56_20260201_skn_50cg_inpaint_holes_cal_poleff.dict
@@ -20,7 +20,7 @@ window_dir = data_dir + f'windows/{run_name}/'
 nulls_dir = f'nulls/{run_name}'
 nulls_yaml = yaml_dir + "post_spectra.yaml"
 
-# surveys = ['dr6', 'legacy', 'lat_iso']
+# surveys = ['dr6', 'planck', 'lat_iso']
 surveys = ['dr6', 'lat_iso']
 # surveys = ['lat_iso']
 arrays_dr6 = ['pa4_f220', 'pa5_f090', 'pa5_f150', 'pa6_f090', 'pa6_f150']
diff --git a/project/SO/pISO/python/get_best_fit_mflike.py b/project/SO/pISO/python/get_best_fit_mflike.py
@@ -38,8 +38,6 @@
 
 plot_dir = opj(d['plots_dir'], 'best_fits')
 
-
-
 log.info(f"save best fits in {bestfit_dir} folder")
 
 pspy_utils.create_directory(bestfit_dir)
@@ -95,21 +93,36 @@
 
 beams = None
 if d["include_beam_chromaticity_effect_in_best_fit"]:
-    log.info(f"include beam array accounting for beam chromaticity \n")
-    # Get beam chromaticity
-    alpha_dict, nu_ref_dict = beam_chromaticity.act_dr6_beam_scaling()
     beams = {}
-    for map_set in map_set_list:
-        bl_mono_file_name = d[f"beam_mono_{map_set}"]
-        l, bl = pspy_utils.read_beam_file(bl_mono_file_name, lmax=10000)
-        l, nu_array, bl_nu = beam_chromaticity.get_multifreq_beam(l,
-                                                                  bl,
-                                                                  passbands[map_set],
-                                                                  nu_ref_dict[map_set],
-                                                                  alpha_dict[map_set])
-                                                                  
-        beams[map_set + "_s0"] = {"nu": nu_array, "beams": bl_nu.T}
-        beams[map_set + "_s2"] = {"nu": nu_array, "beams": bl_nu.T}
+    for survey in surveys:
+        # check whether we should do beam chromaticity for that survey
+        if d["include_beam_chromaticity_effect_in_best_fit"][survey]:
+            log.info(f"include beam array accounting for beam chromaticity for {survey} \n")
+            map_set_sv = [map_set for map_set in map_set_list if survey in map_set]
+
+            for map_set in map_set_sv:
+                alpha, nu_ref = d[f"beam_scaling_{map_set}"]["alpha"], d[f"beam_scaling_{map_set}"]["nu_ref"]
+
+                bl_mono_file_name = d[f"beam_mono_{map_set}"]
+                l, bl = pspy_utils.read_beam_file(bl_mono_file_name, lmax=10000)
+                l, nu_array, bl_nu = beam_chromaticity.get_multifreq_beam(l,
+                                                                        bl,
+                                                                        passbands[map_set],
+                                                                        nu_ref,
+                                                                        alpha)
+                                                                        
+                
+                beams[map_set + "_s0"] = {"nu": nu_array, "beams": bl_nu.T}
+                beams[map_set + "_s2"] = {"nu": nu_array, "beams": bl_nu.T}
+        else:
+            map_set_sv = [map_set for map_set in map_set_list if survey in map_set]
+            for map_set in map_set_sv:
+                # setting all the beams to 1 to neglect chromatic beam effect for surveys for which it shouldn't be included (planck)
+                nu_array = passbands[map_set][0]
+                beam_arr = np.ones((len(nu_array), 10000))
+                beams[map_set + "_s0"] = {"nu": nu_array, "beams": beam_arr}
+                beams[map_set + "_s2"] = {"nu": nu_array, "beams": beam_arr}
+
 
 
 log.info("Getting foregrounds contribution")
diff --git a/project/SO/pISO/python/port2sacc.py b/project/SO/pISO/python/port2sacc.py
@@ -68,22 +68,27 @@
 
 
 beams = None
-# neglecting this for now for iso
 if d["include_beam_chromaticity_effect_in_sacc"]:
-    log.info(f"include beam array accounting for beam chromaticity \n")
-
-    # Get beam chromaticity
     beams = {}
-    alpha_dict, nu_ref_dict = beam_chromaticity.act_dr6_beam_scaling()
-    for map_set in map_set_list:
-        bl_mono_file_name = d[f"beam_mono_{map_set}"]
-        l, bl = pspy_utils.read_beam_file(bl_mono_file_name, lmax=10000)
-        l, nu_array, bl_nu = beam_chromaticity.get_multifreq_beam(l,
-                                                                  bl,
-                                                                  passbands[map_set],
-                                                                  nu_ref_dict[map_set],
-                                                                  alpha_dict[map_set])
-        beams[map_set] = [l, dict(T=bl_nu, E=bl_nu)]
+    for survey in surveys:
+        # check whether we should do beam chromaticity for that survey and include it only in the sacc for that survey
+        if d["include_beam_chromaticity_effect_in_best_fit"][survey]:
+            log.info(f"include beam array accounting for beam chromaticity for {survey} \n")
+            map_set_sv = [map_set for map_set in map_set_list if survey in map_set]
+
+            for map_set in map_set_sv:
+                alpha, nu_ref = d[f"beam_scaling_{map_set}"]["alpha"], d[f"beam_scaling_{map_set}"]["nu_ref"]
+
+                bl_mono_file_name = d[f"beam_mono_{map_set}"]
+                l, bl = pspy_utils.read_beam_file(bl_mono_file_name, lmax=10000)
+                l, nu_array, bl_nu = beam_chromaticity.get_multifreq_beam(l,
+                                                                        bl,
+                                                                        passbands[map_set],
+                                                                        nu_ref,
+                                                                        alpha)
+                                                                        
+                beams[map_set] = [l, dict(T=bl_nu, E=bl_nu)]
+
 
 # Define metadata such as dict content or libraries version
 metadata = dict(
