Skip to content

Commit 7a39784

Browse files
sgiardiesgiardie
committed
Merge branch 'new-fg-marg' into serena_piso
2 parents 7a2fed4 + 85eb8d7 commit 7a39784

18 files changed

Lines changed: 610 additions & 405 deletions

‎project/SO/pISO/README.md‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -362,105 +362,105 @@ In the end, you should have the following added to your `data_dir` :
362362
│   ├── ...
363363
│   └── alms_Planck_f353.npy
364364
├── beams
365-
│   │── legacy
366-
│   │ ├── leakage_beams
367-
│   │ └── main_beams
368-
│   └── npipe
369-
│   ├── leakage_beams
370-
│   └── main_beams
365+
│ │── legacy
366+
│ │ ├── leakage_beams
367+
│ │ └── main_beams
368+
│ └── npipe
369+
│ ├── leakage_beams
370+
│ └── main_beams
371371
├── maps
372-
│   └── planck
373-
│     └── deep56
374-
│     ├── legacy
375-
│     │   ├── HFI_SkyMap_2048_R3.01_halfmission-1_f100_ivar.fits
372+
│ └── planck
373+
│ └── deep56
374+
│ ├── legacy
375+
│ │ ├── HFI_SkyMap_2048_R3.01_halfmission-1_f100_ivar.fits
376376
│ │ ...
377-
│     │   └── HFI_SkyMap_2048_R3.01_halfmission-2_f353_map_srcfree.fits
378-
│     ├── npipe
379-
│     │   ├── npipe6v20A_f100_ivar.fits
377+
│ │ └── HFI_SkyMap_2048_R3.01_halfmission-2_f353_map_srcfree.fits
378+
│ ├── npipe
379+
│ │ ├── npipe6v20A_f100_ivar.fits
380380
│ │ ...
381381
│     │   └── npipe6v20B_f353_map_srcfree.fits
382382
│        └── ... src subtraction stuff
383383
├── passbands
384-
│    └── planck
385-
│    ├── passband_npipe_f100.dat
386-
│    ├── passband_npipe_f143.dat
387-
│    ├── passband_npipe_f217.dat
388-
│    └── passband_npipe_f353.dat
384+
│ └── planck
385+
│ ├── passband_npipe_f100.dat
386+
│ ├── passband_npipe_f143.dat
387+
│ ├── passband_npipe_f217.dat
388+
│ └── passband_npipe_f353.dat
389389
│
390390
├── best_fits
391-
│   └── planck
392-
│    ├── cmb_and_fg_Planck_f100xPlanck_f100.dat
393-
│    ├── ...
394-
│    ├── cmb.dat
395-
│    ├── components
396-
│    │ ├── bb_dust_Planck_f100xPlanck_f100.dat
397-
│    │ ├── ...
398-
│      │ └── tt_tSZxCIB_Planck_f353xPlanck_f353.dat
399-
│   ├── fg_Planck_f100xPlanck_f100.dat
400-
│   ├── ...
401-
│   └── fg_Planck_f353xPlanck_f353.dat
391+
│ └── planck
392+
│ ├── cmb_and_fg_Planck_f100xPlanck_f100.dat
393+
│ ├── ...
394+
│ ├── cmb.dat
395+
│ ├── components
396+
│ │ ├── bb_dust_Planck_f100xPlanck_f100.dat
397+
│ │ ├── ...
398+
│ │ └── tt_tSZxCIB_Planck_f353xPlanck_f353.dat
399+
│ ├── fg_Planck_f100xPlanck_f100.dat
400+
│ ├── ...
401+
│ └── fg_Planck_f353xPlanck_f353.dat
402402
├── catalogs
403403
│ ├── cat_skn_090_20220526_nightonly_ordered.txt
404-
│   └── ...
404+
│ └── ...
405405
├── mcms
406-
│    └── planck
406+
│ └── planck
407407
│ ├── Planck_f100xPlanck_f100_Bbl_spin0xspin0.npy
408-
│   └── ...
408+
│ └── ...
409409
├── spectra
410-
│   └── planck
411-
│   ├── Dl_Planck_f100xPlanck_f100.dat
412-
│   ├── ...
413-
│   ├── Dl_Planck_f353xPlanck_f353.dat
410+
│ └── planck
411+
│ ├── Dl_Planck_f100xPlanck_f100.dat
412+
│ ├── ...
413+
│ ├── Dl_Planck_f353xPlanck_f353.dat
414414
├── spectra_leak_corr
415-
│   └── planck
416-
│   ├── Dl_Planck_f100xPlanck_f100.dat
417-
│   ├── ...
418-
│   ├── Dl_Planck_f353xPlanck_f353.dat
415+
│ └── planck
416+
│ ├── Dl_Planck_f100xPlanck_f100.dat
417+
│ ├── ...
418+
│ ├── Dl_Planck_f353xPlanck_f353.dat
419419
├── spectra_leak_corr_planck_bias_corr
420-
│   └── planck
421-
│   ├── Dl_Planck_f100xPlanck_f100.dat
422-
│   ├── ...
423-
│   ├── Dl_Planck_f353xPlanck_f353.dat
420+
│ └── planck
421+
│ ├── Dl_Planck_f100xPlanck_f100.dat
422+
│ ├── ...
423+
│ ├── Dl_Planck_f353xPlanck_f353.dat
424424
├── sim_spectra/
425-
│   └── planck
426-
│   └── Dl_Planck_f100xPlanck_f100_00_00000.dat
427-
│   ├── ...
428-
│   ├── Dl_Planck_f100xPlanck_f100_auto_00000.dat
429-
│   ├── ...
430-
│   ├── Dl_Planck_f100xPlanck_f100_cross_00000.dat
431-
│   ├── ...
432-
│   ├── Dl_Planck_f100xPlanck_f100_noise_00000.dat
433-
│   └── ...
425+
│ └── planck
426+
│ └── Dl_Planck_f100xPlanck_f100_00_00000.dat
427+
│ ├── ...
428+
│ ├── Dl_Planck_f100xPlanck_f100_auto_00000.dat
429+
│ ├── ...
430+
│ ├── Dl_Planck_f100xPlanck_f100_cross_00000.dat
431+
│ ├── ...
432+
│ ├── Dl_Planck_f100xPlanck_f100_noise_00000.dat
433+
│ └── ...
434434
├── sim_spectra_planck_noise_and_syst/
435-
│   └── Dl_Planck_f100xPlanck_f100_00_00000.dat
436-
│   ├── ...
437-
│   ├── Dl_Planck_f100xPlanck_f100_auto_00000.dat
438-
│   ├── ...
439-
│   ├── Dl_Planck_f100xPlanck_f100_cross_00000.dat
440-
│   ├── ...
441-
│   ├── Dl_Planck_f100xPlanck_f100_noise_00000.dat
442-
│   └── ...
435+
│ └── Dl_Planck_f100xPlanck_f100_00_00000.dat
436+
│ ├── ...
437+
│ ├── Dl_Planck_f100xPlanck_f100_auto_00000.dat
438+
│ ├── ...
439+
│ ├── Dl_Planck_f100xPlanck_f100_cross_00000.dat
440+
│ ├── ...
441+
│ ├── Dl_Planck_f100xPlanck_f100_noise_00000.dat
442+
│ └── ...
443443
├── montecarlo
444-
│   └── planck
445-
│   └── spectra_BB_Planck_f100xPlanck_f100_auto.dat
446-
│   ├── ...
447-
│   └── spectra_TT_Planck_f353xPlanck_f353_noise.dat
444+
│ └── planck
445+
│ └── spectra_BB_Planck_f100xPlanck_f100_auto.dat
446+
│ ├── ...
447+
│ └── spectra_TT_Planck_f353xPlanck_f353_noise.dat
448448
├── planck_mc_correction
449-
│   └── spectra_BB_Planck_f100xPlanck_f100_auto.dat
450-
│   ├── ...
451-
│   └── spectra_TT_Planck_f353xPlanck_f353_noise.dat
449+
│ └── spectra_BB_Planck_f100xPlanck_f100_auto.dat
450+
│ ├── ...
451+
│ └── spectra_TT_Planck_f353xPlanck_f353_noise.dat
452452
├── covariances
453-
│   └── planck
454-
│   └── analytic_cov_Planck_f100xPlanck_f100_Planck_f100xPlanck_f100.npy
455-
│   ├── ...
456-
│   ├── leakage_cov_Planck_f100xPlanck_f100_Planck_f100xPlanck_f100.npy
457-
│   ├── ...
458-
│   └── mc_cov_Planck_f100xPlanck_f100_Planck_f100xPlanck_f100.npy
453+
│ └── planck
454+
│ └── analytic_cov_Planck_f100xPlanck_f100_Planck_f100xPlanck_f100.npy
455+
│ ├── ...
456+
│ ├── leakage_cov_Planck_f100xPlanck_f100_Planck_f100xPlanck_f100.npy
457+
│ ├── ...
458+
│ └── mc_cov_Planck_f100xPlanck_f100_Planck_f100xPlanck_f100.npy
459459
└── windows
460-
   └── dr6xplanck
460+
└── dr6xplanck
461461
├── window_dr6_pa5_f150_kspace.fits
462462
└── ...
463-
   └── dr6xdeep56_20251119
463+
└── dr6xdeep56_20251119
464464
├── window_dr6_pa4_f220_baseline.fits
465465
├── ...
466466
└── window_lat_iso_i6_f150_kspace.fits

‎project/SO/pISO/paramfiles/global_legacy_deep56.dict‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,37 @@ binning_file = release_dir + "pspipe/binning/binning_50"
1010
apply_kspace_filter = True
1111

1212
maps_dir_planck = data_dir + "planck_projected/"
13+
14+
planck_projection_template = f"{release_dir}/maps/published/act_dr6.02_std_AA_night_pa4_f220_4way_set0_map_srcfree.fits"
1315
npipe_map_dir = "/global/cfs/cdirs/cmb/data/planck2020/npipe/"
1416
legacy_map_dir = "/global/cfs/cdirs/cmb/data/planck2018/pr3/frequencymaps/"
1517

1618
npipe_sim_dir = "/global/cfs/cdirs/cmb/data/planck2020/npipe"
1719
legacy_sim_dir = "/global/cfs/cdirs/sobs/users/sgiardie/iso/legacy/legacy_sims"
1820

19-
mcm_dir = data_dir + f"mcms/{run_name}"
20-
alms_dir = data_dir + f"alms/{run_name}"
21-
spec_dir = data_dir + f"spectra/{run_name}"
21+
mcm_dir = data_dir + f"mcms/{run_name}/"
22+
alms_dir = data_dir + f"alms/{run_name}/"
23+
old_spec_dir = data_dir + f"old_spectra/{run_name}/"
24+
spec_dir = data_dir + f"spectra/{run_name}/"
2225
best_fits_dir = data_dir + f"best_fits"
23-
plots_base_dir = data_dir + f"plots/{run_name}"
24-
noise_model_dir = data_dir + f"noise_model/{run_name}"
25-
sq_win_alms_dir = data_dir + f"sq_win_alms/{run_name}"
26-
cov_dir = data_dir + f"covariances/{run_name}"
27-
montecarlo_dir = data_dir + f"montecarlo/{run_name}"
28-
noise_alms_dir = data_dir + f"noise_alms/{run_name}"
29-
chain_dir = data_dir + f"chains/{run_name}"
30-
sim_spectra_planck_noise_and_syst_dir = data_dir + f"sim_spectra_planck_noise_and_syst/{run_name}"
31-
planck_mc_correction_dir = data_dir + f"montecarlo/{run_name}"
32-
spectra_leak_corr_dir = data_dir + f"spectra_leak_corr/{run_name}"
33-
spectra_leak_corr_planck_bias_corr_dir = data_dir + f"spectra_leak_corr_planck_bias_corr/{run_name}"
34-
montecarlo_beam_leakage_dir = data_dir + f"montecarlo_beam_leakage/{run_name}"
35-
sim_spec_dir = data_dir + f"sim_spectra/dust_binning_50/{run_name}"
26+
plots_dir = data_dir + f"plots/{run_name}/"
27+
noise_model_dir = data_dir + f"noise_model/{run_name}/"
28+
sq_win_alms_dir = data_dir + f"sq_win_alms/"
29+
cov_dir = data_dir + f"covariances/{run_name}/"
30+
montecarlo_dir = data_dir + f"montecarlo/{run_name}/"
31+
noise_alms_dir = data_dir + f"noise_alms/{run_name}/"
32+
chain_dir = data_dir + f"chains/{run_name}/"
33+
sim_spectra_planck_noise_and_syst_dir = data_dir + f"sim_spectra_planck_noise_and_syst/{run_name}/"
34+
planck_mc_correction_dir = data_dir + f"montecarlo_planck_mc_corr/{run_name}/"
35+
spectra_leak_corr_dir = data_dir + f"spectra_leak_corr/{run_name}/"
36+
spectra_leak_corr_planck_bias_corr_dir = data_dir + f"spectra_leak_corr_planck_bias_corr/{run_name}/"
37+
montecarlo_beam_leakage_dir = data_dir + f"montecarlo_beam_leakage/{run_name}/"
38+
sim_spec_dir = data_dir + f"sim_spectra/dust_binning_50/{run_name}/"
3639

3740
k_filter_Planck = {'type': 'binary_cross', 'vk_mask': [-90, 90], 'hk_mask': [-50, 50], 'weighted': False}
38-
kspace_tf_path = release_dir + "pspipe/kspace_tf/dust_binning_50/"
39-
source_catalog = release_dir + "pspipe/source_catalog/cat_skn_multifreq_20220526_nightonly.txt"
41+
kspace_tf_path = "analytical"
42+
planck_source_catalog = release_dir + "pspipe/source_catalog/cat_skn_multifreq_20220526_nightonly.txt"
43+
4044
deconvolve_pixwin = True
4145

4246
pixwin_Planck = {'pix': 'HEALPIX', 'nside': 2048}

‎project/SO/pISO/paramfiles/global_npipe_deep56.dict‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,37 @@ binning_file = release_dir + "pspipe/binning/binning_50"
1010
apply_kspace_filter = True
1111

1212
maps_dir_planck = data_dir + "planck_projected/"
13+
14+
planck_projection_template = f"{release_dir}/maps/published/act_dr6.02_std_AA_night_pa4_f220_4way_set0_map_srcfree.fits"
1315
npipe_map_dir = "/global/cfs/cdirs/cmb/data/planck2020/npipe/"
1416
legacy_map_dir = "/global/cfs/cdirs/cmb/data/planck2018/pr3/frequencymaps/"
1517

1618
npipe_sim_dir = "/global/cfs/cdirs/cmb/data/planck2020/npipe"
1719
legacy_sim_dir = "/global/cfs/cdirs/sobs/users/sgiardie/iso/legacy/legacy_sims"
1820

1921

20-
mcm_dir = data_dir + f"mcms/{run_name}"
21-
alms_dir = data_dir + f"alms/{run_name}"
22-
spec_dir = data_dir + f"spectra/{run_name}"
22+
mcm_dir = data_dir + f"mcms/{run_name}/"
23+
alms_dir = data_dir + f"alms/{run_name}/"
24+
old_spec_dir = data_dir + f"old_spectra/{run_name}/"
25+
spec_dir = data_dir + f"spectra/{run_name}/"
2326
best_fits_dir = data_dir + f"best_fits"
24-
plots_base_dir = data_dir + f"plots/{run_name}"
25-
noise_model_dir = data_dir + f"noise_model/{run_name}"
26-
sq_win_alms_dir = data_dir + f"sq_win_alms/{run_name}"
27-
cov_dir = data_dir + f"covariances/{run_name}"
28-
montecarlo_dir = data_dir + f"montecarlo/{run_name}"
29-
noise_alms_dir = data_dir + f"noise_alms/{run_name}"
30-
chain_dir = data_dir + f"chains/{run_name}"
31-
sim_spectra_planck_noise_and_syst_dir = data_dir + f"sim_spectra_planck_noise_and_syst/{run_name}"
32-
planck_mc_correction_dir = data_dir + f"montecarlo/{run_name}"
33-
spectra_leak_corr_dir = data_dir + f"spectra_leak_corr/{run_name}"
34-
spectra_leak_corr_planck_bias_corr_dir = data_dir + f"spectra_leak_corr_planck_bias_corr/{run_name}"
35-
montecarlo_beam_leakage_dir = data_dir + f"montecarlo_beam_leakage/{run_name}"
36-
sim_spec_dir = data_dir + f"sim_spectra/dust_binning_50/{run_name}"
27+
plots_dir = data_dir + f"plots/{run_name}/"
28+
noise_model_dir = data_dir + f"noise_model/{run_name}/"
29+
sq_win_alms_dir = data_dir + f"sq_win_alms/"
30+
cov_dir = data_dir + f"covariances/{run_name}/"
31+
montecarlo_dir = data_dir + f"montecarlo/{run_name}/"
32+
noise_alms_dir = data_dir + f"noise_alms/{run_name}/"
33+
chain_dir = data_dir + f"chains/{run_name}/"
34+
sim_spectra_planck_noise_and_syst_dir = data_dir + f"sim_spectra_planck_noise_and_syst/{run_name}/"
35+
planck_mc_correction_dir = data_dir + f"montecarlo_planck_mc_corr/{run_name}/"
36+
spectra_leak_corr_dir = data_dir + f"spectra_leak_corr/{run_name}/"
37+
spectra_leak_corr_planck_bias_corr_dir = data_dir + f"spectra_leak_corr_planck_bias_corr/{run_name}/"
38+
montecarlo_beam_leakage_dir = data_dir + f"montecarlo_beam_leakage/{run_name}/"
39+
sim_spec_dir = data_dir + f"sim_spectra/dust_binning_50/{run_name}/"
3740

3841
k_filter_Planck = {'type': 'binary_cross', 'vk_mask': [-90, 90], 'hk_mask': [-50, 50], 'weighted': False}
39-
kspace_tf_path = release_dir + "pspipe/kspace_tf/dust_binning_50/"
40-
source_catalog = release_dir + "pspipe/source_catalog/cat_skn_multifreq_20220526_nightonly.txt"
42+
kspace_tf_path = "analytical"
43+
planck_source_catalog = release_dir + "pspipe/source_catalog/cat_skn_multifreq_20220526_nightonly.txt"
4144
deconvolve_pixwin = True
4245

4346
pixwin_Planck = {'pix': 'HEALPIX', 'nside': 2048}
@@ -59,10 +62,10 @@ l3_pad = 2000
5962
savgol_w = 300
6063
savgol_k = 4
6164

62-
maps_Planck_f100 = [ f'{maps_dir_planck}npipe6v20A_f100_map_deep56_patch_srcfree.fits', f'{maps_dir_planck}npipe6v20B_f100_map_deep56_patch_srcfree.fits']
63-
maps_Planck_f143 = [ f'{maps_dir_planck}npipe6v20A_f143_map_deep56_patch_srcfree.fits', f'{maps_dir_planck}npipe6v20B_f143_map_deep56_patch_srcfree.fits']
64-
maps_Planck_f217 = [ f'{maps_dir_planck}npipe6v20A_f217_map_deep56_patch_srcfree.fits', f'{maps_dir_planck}npipe6v20B_f217_map_deep56_patch_srcfree.fits']
65-
maps_Planck_f353 = [ f'{maps_dir_planck}npipe6v20A_f353_map_deep56_patch_srcfree.fits', f'{maps_dir_planck}npipe6v20B_f353_map_deep56_patch_srcfree.fits']
65+
maps_Planck_f100 = [ f'{planck_projected_dir}/npipe/npipe6v20A_f100_map_deep56_patch_srcfree.fits', f'{planck_projected_dir}/npipe/npipe6v20B_f100_map_deep56_patch_srcfree.fits']
66+
maps_Planck_f143 = [ f'{planck_projected_dir}/npipe/npipe6v20A_f143_map_deep56_patch_srcfree.fits', f'{planck_projected_dir}/npipe/npipe6v20B_f143_map_deep56_patch_srcfree.fits']
67+
maps_Planck_f217 = [ f'{planck_projected_dir}/npipe/npipe6v20A_f217_map_deep56_patch_srcfree.fits', f'{planck_projected_dir}/npipe/npipe6v20B_f217_map_deep56_patch_srcfree.fits']
68+
maps_Planck_f353 = [ f'{planck_projected_dir}/npipe/npipe6v20A_f353_map_deep56_patch_srcfree.fits', f'{planck_projected_dir}/npipe/npipe6v20B_f353_map_deep56_patch_srcfree.fits']
6669

6770
cal_Planck_f100 = 1.0
6871
cal_Planck_f143 = 1.0
@@ -102,7 +105,7 @@ leakage_beam_Planck_f353_TE = [beam_dir + '/npipe_DR6_AxB/gamma_npipe_DR6_AxB_35
102105
leakage_beam_Planck_f100_TB = [beam_dir + '/npipe_DR6_AxB/gamma_npipe_DR6_AxB_100%s_t2b.dat' % split for split in ["A", "B"]]
103106
leakage_beam_Planck_f143_TB = [beam_dir + '/npipe_DR6_AxB/gamma_npipe_DR6_AxB_143%s_t2b.dat' % split for split in ["A", "B"]]
104107
leakage_beam_Planck_f217_TB = [beam_dir + '/npipe_DR6_AxB/gamma_npipe_DR6_AxB_217%s_t2b.dat' % split for split in ["A", "B"]]
105-
leakage_beam_Planck_f143_TB = [beam_dir + '/npipe_DR6_AxB/gamma_npipe_DR6_AxB_143%s_t2b.dat' % split for split in ["A", "B"]]
108+
leakage_beam_Planck_f353_TB = [beam_dir + '/npipe_DR6_AxB/gamma_npipe_DR6_AxB_353%s_t2b.dat' % split for split in ["A", "B"]]
106109

107110
include_beam_chromaticity_effect_in_best_fit = False
108111

‎project/SO/pISO/python/dust/fit_dust_amplitude.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def get_fg_model(a_p, a_c, a_gtt, a_gte, a_gee, a_gbb, a_gtb, beta_c, beta_p, ba
183183
mc_cov = True
184184

185185
result_dir = d["chain_dir"] + f"/dust_from_planck353_{mode}"
186-
plot_dir = d["plots_base_dir"] + f"/dust_from_planck353_{mode}"
186+
plot_dir = d["plots_dir"] + f"/dust_from_planck353_{mode}"
187187
if args.leak_corr:
188188
result_dir += "_leak_corr"
189189
plot_dir += "_leak_corr"

‎project/SO/pISO/python/get_pseudo2datavec.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222

2323
mcm_dir = d['mcm_dir']
2424
plot_dir = opj(d['plots_dir'], 'mcms')
25+
spec_dir = d["spec_dir"]
2526
pspy_utils.create_directory(plot_dir)
27+
pspy_utils.create_directory(spec_dir)
2628

2729
surveys = d["surveys"]
2830
lmax = d['lmax']
@@ -70,6 +72,13 @@
7072
if np.count_nonzero(v.diagonal() == 0):
7173
log.info(f'WARNING: 0 in kspace_transfer_matrix {k}')
7274

75+
# this will be used in the old covariance computation
76+
for spec_name in spec_name_list:
77+
one_d_tf = kspace_transfer_matrix[spec_name].diagonal()
78+
cov_T_E_only = d["cov_T_E_only"]
79+
if cov_T_E_only == True: one_d_tf = one_d_tf[:4 * n_bins]
80+
np.savetxt(f"{spec_dir}/one_dimension_kspace_tf_{spec_name}.dat", one_d_tf)
81+
7382
if d[f"pixwin_{sv}"]["pix"] == "HEALPIX" and deconvolve_pixwin:
7483
pixwins = {}
7584
for sv in surveys:

‎project/SO/pISO/python/get_xarrays_covmat.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
modes_for_cov = spectra
2424

2525
cov_dir = d["cov_dir"]
26-
plot_dir = d["plots_base_dir"] + "/x_ar_cov"
26+
plot_dir = d["plots_dir"] + "/x_ar_cov"
2727

2828
pspy_utils.create_directory(plot_dir)
2929

‎project/SO/pISO/python/leakage/get_leakage_corrected_spectra_per_split.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
type = d["type"]
2828

2929
bestfit_dir = d["best_fits_dir"]
30-
spec_dir = d["spec_dir"]
30+
spec_dir = d["old_spec_dir"]
3131
spec_corr_dir = d["spectra_leak_corr_dir"]
32-
plot_dir = d["plots_base_dir"]+"/leakage/"
32+
plot_dir = d["plots_dir"]+"/leakage/"
3333

3434
lmax_for_plot = 2000
3535

‎project/SO/pISO/python/leakage/get_leakage_covariance.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
bestfit_dir = d["best_fits_dir"]
2727
sim_dir = d["montecarlo_beam_leakage_dir"]
2828
cov_dir = d["cov_dir"]
29-
plot_dir = d["plots_base_dir"] + "/leakage/"
29+
plot_dir = d["plots_dir"] + "/leakage/"
3030

3131
pspy_utils.create_directory(plot_dir)
3232
pspy_utils.create_directory(sim_dir)

‎project/SO/pISO/python/leakage/get_leakage_sim.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
bestfit_dir = d["best_fits_dir"]
3131
sim_dir = d["montecarlo_beam_leakage_dir"]
32-
plot_dir = d["plots_base_dir"]+ "/leakage/"
32+
plot_dir = d["plots_dir"]+ "/leakage/"
3333

3434
pspy_utils.create_directory(plot_dir)
3535
pspy_utils.create_directory(sim_dir)

‎project/SO/pISO/python/montecarlo/mc_plot_spectra.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
noise_model_dir = d["noise_model_dir"]
2929
mcm_dir = d["mcm_dir"]
30-
plot_dir = d["plots_base_dir"] + "/mc_spectra/"
30+
plot_dir = d["plots_dir"] + "/mc_spectra/"
3131
mc_dir = d["montecarlo_dir"]
3232
bestfit_dir = d["best_fits_dir"]
3333

0 commit comments

Comments
 (0)