diff --git a/vast_pipeline/image/main.py b/vast_pipeline/image/main.py index bfb1aea9..eb99f75c 100644 --- a/vast_pipeline/image/main.py +++ b/vast_pipeline/image/main.py @@ -402,19 +402,8 @@ def read_selavy(self, dj_image: models.Image) -> pd.DataFrame: df['compactness'] = df['flux_int'].values / df['flux_peak'].values if self.config["condon_errors"]: - logger.warning("Calculating Condon '97 errors...") - logger.warning( - "Using the Condon uncertainties will overwrite those provide " - "by the input catalogue and should not be used if you have " - "applied any corrections to the input catalogues, or if you " - "trust their uncertainties." - ) - logger.warning( - "The Condon uncertainties only account for the statistical " - "component of the uncertainty - any systematic uncertainty" - "should be taken into account using the ra_uncertainty and " - "dec_uncertainty parameters in the config file." - ) + logger.debug("Calculating Condon '97 errors...") + theta_B = dj_image.beam_bmaj theta_b = dj_image.beam_bmin diff --git a/vast_pipeline/management/commands/ingestimages.py b/vast_pipeline/management/commands/ingestimages.py index 92d04705..c341f6da 100644 --- a/vast_pipeline/management/commands/ingestimages.py +++ b/vast_pipeline/management/commands/ingestimages.py @@ -88,6 +88,20 @@ def handle(self, *args, **options) -> None: except PipelineConfigError as e: raise CommandError(e) + if image_config.image_opts()['condon_errors']: + logger.warning( + "You have selected condon_errors=True. " + "Using the Condon uncertainties will overwrite those provide " + "by the input catalogue and should not be used if you have " + "applied any corrections to the input catalogues, or if you " + "trust their uncertainties." + ) + logger.warning( + "The Condon uncertainties only account for the statistical " + "component of the uncertainty - any systematic uncertainty" + "should be taken into account using the ra_uncertainty and " + "dec_uncertainty parameters in the config file." + ) # Create a dummy Pipeline instance using the given image ingestion configuration options d = _DummyPipeline(image_config) diff --git a/vast_pipeline/management/commands/runpipeline.py b/vast_pipeline/management/commands/runpipeline.py index 42918afe..41df148e 100644 --- a/vast_pipeline/management/commands/runpipeline.py +++ b/vast_pipeline/management/commands/runpipeline.py @@ -293,6 +293,21 @@ def run_pipe( "Source monitoring: %s", pipeline.config["source_monitoring"]["monitor"] ) + + if pipeline.config["condon_errors"]: + logger.warning( + "You have selected condon_errors=True. " + "Using the Condon uncertainties will overwrite those provide " + "by the input catalogue and should not be used if you have " + "applied any corrections to the input catalogues, or if you " + "trust their uncertainties." + ) + logger.warning( + "The Condon uncertainties only account for the statistical " + "component of the uncertainty - any systematic uncertainty" + "should be taken into account using the ra_uncertainty and " + "dec_uncertainty parameters in the config file." + ) # log the list of input data files for posterity inputs = pipeline.config["inputs"]