From efe40d380777c7e31b29326edb3ecf23f6efa2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignasi=20P=C3=A9rez-R=C3=A0fols?= Date: Thu, 2 Jun 2022 12:17:05 +0200 Subject: [PATCH 1/4] minimum number of quasars per pixel in bin converted to variable --- .../expected_fluxes/dr16_expected_flux.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/py/picca/delta_extraction/expected_fluxes/dr16_expected_flux.py b/py/picca/delta_extraction/expected_fluxes/dr16_expected_flux.py index 867323f33..19a5b33cd 100644 --- a/py/picca/delta_extraction/expected_fluxes/dr16_expected_flux.py +++ b/py/picca/delta_extraction/expected_fluxes/dr16_expected_flux.py @@ -14,8 +14,8 @@ from picca.delta_extraction.utils import find_bins accepted_options = [ - "iter out prefix", "limit eta", "limit var lss", "num bins variance", - "num iterations", "num processors", "order", "out dir", + "iter out prefix", "limit eta", "limit var lss", "min num qso in fit", + "num bins variance", "num iterations", "num processors", "order", "out dir", "use constant weight", "use ivar as weight" ] @@ -25,6 +25,7 @@ "limit var lss": (0., 0.3), "num bins variance": 20, "num iterations": 5, + "min num qso in fit": 100, "order": 1, "use constant weight": False, "use ivar as weight": False, @@ -149,6 +150,7 @@ def __init__(self, config): self.iter_out_prefix = None self.limit_eta = None self.limit_var_lss = None + self.min_qso_in_fit = None self.num_bins_variance = None self.num_iterations = None self.order = None @@ -339,6 +341,12 @@ def __parse_config(self, config): var_lss_max = float(limit_var_lss[1]) self.limit_var_lss = (var_lss_min, var_lss_max) + self.min_qso_in_fit = config.getint("min qso in fit") + if self.min_qso_in_fit is None: + raise ExpectedFluxError( + "Missing argument 'min qso in fit' required by Dr16ExpectedFlux" + ) + self.num_bins_variance = config.getint("num bins variance") if self.num_bins_variance is None: raise ExpectedFluxError( @@ -761,7 +769,7 @@ def chi2(eta, var_lss, fudge): weights = var2_delta[index * num_var_bins:(index + 1) * num_var_bins] w = num_qso[index * num_var_bins:(index + 1) * - num_var_bins] > 100 + num_var_bins] > self.min_qso_in_fit return np.sum(chi2_contribution[w]**2 / weights[w]) minimizer = iminuit.Minuit(chi2, From 8031b8c98cf74818a54a116cbc8c1e184005633e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignasi=20P=C3=A9rez-R=C3=A0fols?= Date: Thu, 2 Jun 2022 12:17:16 +0200 Subject: [PATCH 2/4] fixed pylint version --- .github/workflows/pylint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index a2fe22a80..2c14d705b 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -18,7 +18,7 @@ jobs: sudo apt-get -y install libbz2-dev python -m pip install --upgrade pip if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - pip install pylint + pip install pylint==2.12.2 - name: This path run: | ls From 05515313be2d4185571156fc6187df2759e89521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignasi=20P=C3=A9rez-R=C3=A0fols?= Date: Thu, 2 Jun 2022 12:22:56 +0200 Subject: [PATCH 3/4] fixed bug in naming of new variable --- .../expected_fluxes/dr16_expected_flux.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/py/picca/delta_extraction/expected_fluxes/dr16_expected_flux.py b/py/picca/delta_extraction/expected_fluxes/dr16_expected_flux.py index 19a5b33cd..52955762b 100644 --- a/py/picca/delta_extraction/expected_fluxes/dr16_expected_flux.py +++ b/py/picca/delta_extraction/expected_fluxes/dr16_expected_flux.py @@ -150,7 +150,7 @@ def __init__(self, config): self.iter_out_prefix = None self.limit_eta = None self.limit_var_lss = None - self.min_qso_in_fit = None + self.min_num_qso_in_fit = None self.num_bins_variance = None self.num_iterations = None self.order = None @@ -341,8 +341,8 @@ def __parse_config(self, config): var_lss_max = float(limit_var_lss[1]) self.limit_var_lss = (var_lss_min, var_lss_max) - self.min_qso_in_fit = config.getint("min qso in fit") - if self.min_qso_in_fit is None: + self.min_num_qso_in_fit = config.getint("min num qso in fit") + if self.min_num_qso_in_fit is None: raise ExpectedFluxError( "Missing argument 'min qso in fit' required by Dr16ExpectedFlux" ) @@ -769,7 +769,7 @@ def chi2(eta, var_lss, fudge): weights = var2_delta[index * num_var_bins:(index + 1) * num_var_bins] w = num_qso[index * num_var_bins:(index + 1) * - num_var_bins] > self.min_qso_in_fit + num_var_bins] > self.min_num_qso_in_fit return np.sum(chi2_contribution[w]**2 / weights[w]) minimizer = iminuit.Minuit(chi2, From 6db5f56d365fa26ed50d621f5972e17a2ba4b5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignasi=20P=C3=A9rez-R=C3=A0fols?= Date: Thu, 2 Jun 2022 12:28:44 +0200 Subject: [PATCH 4/4] fixed config test --- py/picca/tests/delta_extraction/data/.config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/picca/tests/delta_extraction/data/.config.ini b/py/picca/tests/delta_extraction/data/.config.ini index 08a94faad..b3b30747f 100644 --- a/py/picca/tests/delta_extraction/data/.config.ini +++ b/py/picca/tests/delta_extraction/data/.config.ini @@ -55,7 +55,7 @@ use constant weight = False use ivar as weight = False out dir = /Users/iperezra/software/picca/py/picca/tests/delta_extraction/results/config_tests/ num processors = 1 - +min num qso in fit = 100 [correction arguments 0] filename = /Users/iperezra/software/picca/py/picca/tests/delta_extraction/data/delta_attributes.fits.gz