modernize this

project/ACT_DR6/paramfiles/global_dust_weighted.dict

@@ -1,41 +1,34 @@
 surveys = ["Planck"]
 arrays_Planck = ["f143", "f353"]
 planck_version = "npipe"
-data_dir = "/global/cfs/cdirs/act/data/tlouis/dr6v4/final_products/"
-sim_spec_dir = f"{data_dir}/all_sim_spectra/sim_spectra_dust_weighted_final/"
+release_dir = "/global/cfs/cdirs/act/data/act_dr6v4/"
+
+binning_file = release_dir + "spectra/binning/binning_50"
+apply_kspace_filter  = True
+k_filter_Planck = {"type":'binary_cross', "vk_mask":[-90, 90], "hk_mask":[-50, 50], "weighted":False}
+kspace_tf_path  = release_dir + "spectra/kspace_tf/dust_binning_50/"
+sim_spec_dir = release_dir + "spectra/sim_spectra/dust_weighted_binning_50/"
+source_catalog = release_dir + "spectra/source_catalog/cat_skn_multifreq_20220526_nightonly.txt"
 
 deconvolve_pixwin = True
 pixwin_Planck = {"pix": 'HEALPIX', "nside": 2048}
 
-binning_file = data_dir + "binning/BIN_ACTPOL_50_4_SC_large_bin_at_low_ell"
 niter = 0
 remove_mean = False
 binned_mcm = False
 lmax = 3000
 type = 'Dl'
 write_splits_spectra = True
 cov_T_E_only = False
-multistep_path = data_dir
 
 use_toeplitz_mcm  = False
 use_toeplitz_cov  = True
 
-# kspace filter parameters
-apply_kspace_filter  = True
-kspace_tf_path  = data_dir +  "kspace_tf_dust/"
-k_filter_Planck = {"type":"binary_cross","vk_mask":[-90, 90], "hk_mask":[-50, 50], "weighted": False}
-
-deconvolve_map_maker_tf_Planck = False
-
-mm_tf_Planck_f143 = data_dir + "transfer_fcns/tf_unity.dat"
-mm_tf_Planck_f353 = data_dir + "transfer_fcns/tf_unity.dat"
-
-# maps
 
 src_free_maps_Planck = True
 n_splits_Planck = 2
-maps_Planck_f143 = [data_dir + 'maps/planck/npipe6v20%s_f143_map_srcfree.fits' % split for split in ["A", "B"]]
-maps_Planck_f353 = [data_dir + 'maps/planck/npipe6v20%s_f353_map_srcfree.fits' % split for split in ["A", "B"]]
+maps_Planck_f143 = ["planck_projected/npipe6v20%s_f143_map_srcfree.fits" % split for split in ["A", "B"]]
+maps_Planck_f353 = ["planck_projected/npipe6v20%s_f353_map_srcfree.fits" % split for split in ["A", "B"]]
 
 cal_Planck_f143 = 1.
 cal_Planck_f353 = 1.
@@ -44,18 +37,18 @@ pol_eff_Planck_f143 = 1.
 pol_eff_Planck_f353 = 1.
 
 do_bandpass_integration = True
-passband_dir = data_dir + "passbands/"
+passband_dir_planck = release_dir + "spectra/for_planck/passbands/"
 
-freq_info_Planck_f143 = {"freq_tag": 143, "passband": passband_dir + "passband_npipe_f143.dat"}
-freq_info_Planck_f353 = {"freq_tag": 353, "passband": passband_dir + "passband_npipe_f353.dat"}
+freq_info_Planck_f143 = {"freq_tag": 143, "passband": passband_dir_planck + "passband_npipe_f143.dat"}
+freq_info_Planck_f353 = {"freq_tag": 353, "passband": passband_dir_planck + "passband_npipe_f353.dat"}
 
-beam_dir_Planck = f'{data_dir}/beams/npipe/'
+planck_fits_beam_path = release_dir + "spectra/for_planck/beams/"
 
-beam_T_Planck_f143 = beam_dir_Planck + 'bl_T_npipe_143Ax143B.dat'
-beam_T_Planck_f353 = beam_dir_Planck + 'bl_T_npipe_353Ax353B.dat'
+beam_T_Planck_f143 = "beams/npipe_DR6_AxB/bl_T_npipe_DR6_143Ax143B.dat"
+beam_T_Planck_f353 = "beams/npipe_DR6_AxB/bl_T_npipe_DR6_353Ax353B.dat"
 
-beam_pol_Planck_f143 = beam_dir_Planck + 'bl_pol_npipe_143Ax143B.dat'
-beam_pol_Planck_f353 = beam_dir_Planck + 'bl_pol_npipe_353Ax353B.dat'
+beam_pol_Planck_f143 = "beams/npipe_DR6_AxB/bl_pol_npipe_DR6_143Ax143B.dat"
+beam_pol_Planck_f353 = "beams/npipe_DR6_AxB/bl_pol_npipe_DR6_353Ax353B.dat"
 
 include_beam_chromaticity_effect_in_best_fit = False
 
@@ -66,18 +59,19 @@ edge_skip_rescale = 1
 cross_link_threshold = 0.97
 n_med_ivar = 3
 
-win_dir = "windows/"
+mask_dir = release_dir + "spectra/masks/"
+ps_mask_Planck_f143 = mask_dir + "source_mask_15mJy_and_dust_rad12.fits"
+ps_mask_Planck_f353 = mask_dir + "source_mask_15mJy_and_dust_rad12.fits"
 
-ps_mask_Planck_f143 = f'{data_dir}/masks/act_pts_mask_fluxcut_15.0mJy_at150Ghz_rad_12.0_monster_dust_paper.fits'
-ps_mask_Planck_f353 = f'{data_dir}/masks/act_pts_mask_fluxcut_15.0mJy_at150Ghz_rad_12.0_monster_dust_paper.fits'
+window_dir = release_dir + "spectra/windows/dr6xplanck/"
 
-window_kspace_Planck_f143 = win_dir + "kspace_mask_dr6_pa6_f150.fits"
-window_T_Planck_f143 = win_dir + "window_w_dr6_pa6_f150_baseline.fits"
-window_pol_Planck_f143 = win_dir + "window_w_dr6_pa6_f150_baseline.fits"
+window_kspace_Planck_f143 = window_dir + "window_dr6_pa6_f150_kspace.fits"
+window_T_Planck_f143 = window_dir + "window_dr6_pa6_f150_baseline_ivar.fits"
+window_pol_Planck_f143 = window_dir + "window_dr6_pa6_f150_baseline_ivar.fits"
 
-window_kspace_Planck_f353 = win_dir + "kspace_mask_dr6_pa6_f150.fits"
-window_T_Planck_f353 = win_dir + "window_w_dr6_pa6_f150_baseline.fits"
-window_pol_Planck_f353 = win_dir + "window_w_dr6_pa6_f150_baseline.fits"
+window_kspace_Planck_f353 = window_dir + "window_dr6_pa6_f150_kspace.fits"
+window_T_Planck_f353 = window_dir + "window_dr6_pa6_f150_baseline_ivar.fits"
+window_pol_Planck_f353 = window_dir + "window_dr6_pa6_f150_baseline_ivar.fits"
 
 
 # best fit params (only used for sim generation and covariances computation)
@@ -109,4 +103,3 @@ range_TE = [-150, 150]
 range_ET = [-150, 150]
 range_EE = [-20, 50]
 
-planck_data_dir = data_dir + "planck_data/"