From 2a07f9775c7073255229046120a224586f083337 Mon Sep 17 00:00:00 2001 From: calumgordon Date: Fri, 16 Jan 2026 17:50:42 +0100 Subject: [PATCH 1/2] added fid_wl option, and fixed job submission bug with picca corr. --- lyatools/correlations.py | 5 +++-- lyatools/run_one_mock.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lyatools/correlations.py b/lyatools/correlations.py index 879b1ee..7ffef85 100644 --- a/lyatools/correlations.py +++ b/lyatools/correlations.py @@ -107,6 +107,7 @@ def run_correlation( num_bins_rt = config.getint('num_bins_rt') fid_Om = config.getfloat('fid_Om') fid_Or = config.getfloat('fid_Or', 7.97505418919554e-05) + fid_wl = config.getfloat('fid_wl', -1) dmat_rejection = config.getfloat('dmat_rejection') dmat_num_bins_rp = config.getint('dmat_num_bins_rp', num_bins_rp) dmat_rp_max = config.getfloat('dmat_rp_max', rp_max) @@ -152,9 +153,9 @@ def run_correlation( text += f'--z-max-pairs {zmax} ' if cross and dmat: - text += f'--fid-Om {fid_Om} --nproc {nproc//2} ' + text += f'--fid-Om {fid_Om} --fid-wl {fid_wl} --nproc {nproc//2} ' else: - text += f'--fid-Om {fid_Om} --nproc {nproc} ' + text += f'--fid-Om {fid_Om} --fid-wl {fid_wl} --nproc {nproc} ' text += f'--fid-Or {fid_Or} --nside {nside} ' if metal_dmat: diff --git a/lyatools/run_one_mock.py b/lyatools/run_one_mock.py index f5df2a4..aebf0fb 100644 --- a/lyatools/run_one_mock.py +++ b/lyatools/run_one_mock.py @@ -163,6 +163,7 @@ def __init__( def run_mock(self): job_id = None + job_id_deltas = None if self.run_lyacolore_flag: submit_utils.print_spacer_line() From c076817dea79e9e4bc3229264d9a755a594a3938 Mon Sep 17 00:00:00 2001 From: calumgordon Date: Sat, 17 Jan 2026 12:56:50 +0100 Subject: [PATCH 2/2] fix xmetal bug --- lyatools/correlations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lyatools/correlations.py b/lyatools/correlations.py index 7ffef85..69f0e63 100644 --- a/lyatools/correlations.py +++ b/lyatools/correlations.py @@ -2,8 +2,8 @@ JOB_CONFIGS = {'cf_lya_lya': 1.5, 'dmat_lya_lya': 2.0, 'metal_dmat_lya_lya': 2.0, 'cf_lya_lyb': 1.0, 'dmat_lya_lyb': 1.0, 'metal_dmat_lya_lyb': 1.0, - 'xcf_lya_qso': 0.5, 'xdmat_lya_qso': 0.5, 'metal_xdmat_lya_qso': 0.5, - 'xcf_lyb_qso': 0.25, 'xdmat_lyb_qso': 0.25, 'metal_xdmat_lyb_qso': 0.25} + 'xcf_lya_qso': 0.5, 'xdmat_lya_qso': 0.5, 'xmetal_dmat_lya_qso': 0.5, + 'xcf_lyb_qso': 0.25, 'xdmat_lyb_qso': 0.25, 'xmetal_dmat_lyb_qso': 0.25} CORR_TYPES = ['lya_lya', 'lya_lyb', 'lya_qso', 'lyb_qso']