Skip to content

Commit

Permalink
Ensure PSF is consistently propagated if customized (#246)
Browse files Browse the repository at this point in the history
* should be a public method

* remove mention of more examples that are non existant
  • Loading branch information
ismael-mendoza committed Feb 25, 2022
1 parent a137337 commit 9eabd38
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions btk/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
from btk.measure import available_measure_functions
from btk.measure import MeasureGenerator
from btk.metrics import MetricsGenerator
from btk.survey import _get_survey_from_cfg
from btk.survey import get_survey_from_cfg


def main(cfg: OmegaConf):
"""Run BTK from end-to-end using a hydra configuration object."""
surveys = [_get_survey_from_cfg(cfg.surveys[survey_name]) for survey_name in cfg.surveys]
surveys = [get_survey_from_cfg(cfg.surveys[survey_name]) for survey_name in cfg.surveys]

# get draw blends generator.
draw_blend_generator = instantiate(cfg.draw_blends, surveys=surveys)
Expand Down
4 changes: 2 additions & 2 deletions btk/survey.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
extinction (float): Exponential extinction coefficient for atmospheric absorption"""


def _get_survey_from_cfg(survey_conf: OmegaConf):
def get_survey_from_cfg(survey_conf: OmegaConf):
"""Creates the corresponding `btk.survey.Survey` object using the information from config file.
Args:
Expand Down Expand Up @@ -129,7 +129,7 @@ def get_surveys(names="Rubin", overrides: Iterable = ()):
cfg = compose("config", overrides=overrides)
for survey_name in cfg.surveys:
survey_conf = cfg.surveys[survey_name]
surveys.append(_get_survey_from_cfg(survey_conf))
surveys.append(get_survey_from_cfg(survey_conf))
if len(surveys) == 1:
return surveys[0]
return surveys
Expand Down
2 changes: 1 addition & 1 deletion notebooks/02b-custom-tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
"- psf: PSF for the filter. This can be provided in two ways:\n",
" - Providing a Galsim PSF model, e.g. `galsim.Kolmogorov(fwhm)` or any convolution of such models.\n",
" - Providing a function which returns a Galsim model when called (with no arguments). This can be used when you \n",
" you want to randomize the PSF. More on that in the example below.\n",
" you want to randomize the PSF.\n",
" In the case of the default surveys, we only use the first possibility, computing the model using the get_psf function beforehand; those models have an atmospheric and an optical component.\n",
"\n",
"Surveys are usually imported using `btk.survey.get_surveys(survey_names)`, which will create the Survey object(s) from a config file (currently, the implemented surveys are Rubin, HSC, HST, Euclid, DES and CFHT); it is also possible to create them directly in Python.\n",
Expand Down

0 comments on commit 9eabd38

Please sign in to comment.