From e9656cd4245e9ac903171cd5f4dd300f721d54ce Mon Sep 17 00:00:00 2001 From: Joe Zuntz Date: Thu, 16 Jun 2022 15:54:08 +0100 Subject: [PATCH] Label non-parallel stages as such --- txpipe/auxiliary_maps.py | 1 + txpipe/blinding.py | 2 ++ txpipe/convergence.py | 2 ++ txpipe/covariance.py | 2 ++ txpipe/exposure_info.py | 2 +- txpipe/input_cats.py | 6 +++--- txpipe/jackknife.py | 1 + txpipe/map_correlations.py | 1 + txpipe/map_plots.py | 2 +- txpipe/maps.py | 1 + txpipe/masks.py | 1 + txpipe/metacal_gcr_input.py | 3 ++- txpipe/metadata.py | 1 + txpipe/photoz_mlz.py | 2 +- txpipe/photoz_stack.py | 2 +- txpipe/psf_diagnostics.py | 9 ++++++--- txpipe/theory.py | 2 ++ txpipe/twopoint_plots.py | 2 ++ 18 files changed, 31 insertions(+), 11 deletions(-) diff --git a/txpipe/auxiliary_maps.py b/txpipe/auxiliary_maps.py index 31763b179..44025b64f 100644 --- a/txpipe/auxiliary_maps.py +++ b/txpipe/auxiliary_maps.py @@ -308,6 +308,7 @@ class TXUniformDepthMap(PipelineStage): make aux_lens_maps do, so may not always be useful. """ name = "TXUniformDepthMap" + parallel = False # make a mask from the auxiliary maps inputs = [("mask", MapsFile)] outputs = [("aux_lens_maps", MapsFile)] diff --git a/txpipe/blinding.py b/txpipe/blinding.py index 2f0482e9c..1f4a67eba 100755 --- a/txpipe/blinding.py +++ b/txpipe/blinding.py @@ -16,6 +16,7 @@ class TXBlinding(PipelineStage): """ name = "TXBlinding" + parallel = False inputs = [ ("twopoint_data_real_raw", SACCFile), ] @@ -235,6 +236,7 @@ class TXNullBlinding(PipelineStage): """ name = "TXNullBlinding" + parallel = False inputs = [ ("twopoint_data_real_raw", SACCFile), ] diff --git a/txpipe/convergence.py b/txpipe/convergence.py index 4a5887520..714725532 100644 --- a/txpipe/convergence.py +++ b/txpipe/convergence.py @@ -10,6 +10,7 @@ class TXConvergenceMaps(PipelineStage): This uses the wlmassmap library, which is included as a submodule in TXPipe. """ name = "TXConvergenceMaps" + parallel = False inputs = [ ("source_maps", MapsFile), ] @@ -89,6 +90,7 @@ class TXConvergenceMapPlots(PipelineStage): """ name = "TXConvergenceMapPlots" + parallel = False inputs = [ ("convergence_maps", MapsFile), diff --git a/txpipe/covariance.py b/txpipe/covariance.py index 0123d73c3..2926ecd72 100755 --- a/txpipe/covariance.py +++ b/txpipe/covariance.py @@ -30,6 +30,7 @@ class TXFourierGaussianCovariance(PipelineStage): measured. """ name = "TXFourierGaussianCovariance" + parallel = False do_xi = False inputs = [ @@ -581,6 +582,7 @@ class TXRealGaussianCovariance(TXFourierGaussianCovariance): TJPCov and a fiducial cosmology. """ name = "TXRealGaussianCovariance" + parallel = False do_xi = True inputs = [ diff --git a/txpipe/exposure_info.py b/txpipe/exposure_info.py index 588dd8998..43c134e0d 100755 --- a/txpipe/exposure_info.py +++ b/txpipe/exposure_info.py @@ -11,7 +11,7 @@ class TXExposureInfo(PipelineStage): """ name = "TXExposureInfo" - + parallel = False inputs = [] outputs = [ ("exposures", HDFFile), diff --git a/txpipe/input_cats.py b/txpipe/input_cats.py index 4b7183ed9..3fce64caf 100755 --- a/txpipe/input_cats.py +++ b/txpipe/input_cats.py @@ -23,7 +23,7 @@ class TXCosmoDC2Mock(PipelineStage): """ name = "TXCosmoDC2Mock" - + parallel = False inputs = [("response_model", HDFFile)] outputs = [ @@ -958,7 +958,7 @@ class TXBuzzardMock(TXCosmoDC2Mock): """ name = "TXBuzzardMock" - + parallel = False inputs = [("response_model", HDFFile)] outputs = [ @@ -992,7 +992,7 @@ class TXGaussianSimsMock(TXCosmoDC2Mock): """ name = "TXGaussianSimsMock" - + parallel = False inputs = [("response_model", HDFFile)] outputs = [ diff --git a/txpipe/jackknife.py b/txpipe/jackknife.py index 2ed39a63f..136fad859 100644 --- a/txpipe/jackknife.py +++ b/txpipe/jackknife.py @@ -11,6 +11,7 @@ class TXJackknifeCenters(PipelineStage): """ name = "TXJackknifeCenters" + parallel = False inputs = [ ("random_cats", RandomsCatalog), diff --git a/txpipe/map_correlations.py b/txpipe/map_correlations.py index d8b858079..dd2674570 100644 --- a/txpipe/map_correlations.py +++ b/txpipe/map_correlations.py @@ -17,6 +17,7 @@ class TXMapCorrelations(PipelineStage): is a directory. """ name = "TXMapCorrelations" + parallel = False inputs = [ ("lens_maps", MapsFile), ("convergence_maps", MapsFile), diff --git a/txpipe/map_plots.py b/txpipe/map_plots.py index 924746acb..a4749bfa4 100644 --- a/txpipe/map_plots.py +++ b/txpipe/map_plots.py @@ -20,7 +20,7 @@ class TXMapPlots(PipelineStage): """ name = "TXMapPlots" - + parallel = False inputs = [ ("source_maps", MapsFile), ("lens_maps", MapsFile), diff --git a/txpipe/maps.py b/txpipe/maps.py index 0a7873827..2024f3512 100644 --- a/txpipe/maps.py +++ b/txpipe/maps.py @@ -530,6 +530,7 @@ class TXDensityMaps(PipelineStage): """ name = "TXDensityMaps" + parallel = False inputs = [ ("lens_maps", MapsFile), ("mask", MapsFile), diff --git a/txpipe/masks.py b/txpipe/masks.py index 586fdcad9..6df244d3e 100644 --- a/txpipe/masks.py +++ b/txpipe/masks.py @@ -10,6 +10,7 @@ class TXSimpleMask(PipelineStage): """ name = "TXSimpleMask" + parallel = False # make a mask from the auxiliary maps inputs = [("aux_lens_maps", MapsFile)] outputs = [("mask", MapsFile)] diff --git a/txpipe/metacal_gcr_input.py b/txpipe/metacal_gcr_input.py index f21441b1a..d46a0a27b 100755 --- a/txpipe/metacal_gcr_input.py +++ b/txpipe/metacal_gcr_input.py @@ -15,7 +15,7 @@ class TXMetacalGCRInput(PipelineStage): """ name = "TXMetacalGCRInput" - + parallel = False inputs = [] outputs = [ @@ -192,6 +192,7 @@ class TXIngestStars(PipelineStage): in PSF estimation. """ name = "TXIngestStars" + parallel = False inputs = [] outputs = [ diff --git a/txpipe/metadata.py b/txpipe/metadata.py index f03f2f8a2..1261a718c 100644 --- a/txpipe/metadata.py +++ b/txpipe/metadata.py @@ -16,6 +16,7 @@ class TXTracerMetadata(PipelineStage): """ name = "TXTracerMetadata" + parallel = False inputs = [ ("shear_catalog", ShearCatalog), diff --git a/txpipe/photoz_mlz.py b/txpipe/photoz_mlz.py index 562d59e4f..475c2f70e 100755 --- a/txpipe/photoz_mlz.py +++ b/txpipe/photoz_mlz.py @@ -12,7 +12,7 @@ class PZPDFMLZ(PipelineStage): """ name = "PZPDFMLZ" - + parallel = False inputs = [ ("photometry_catalog", HDFFile), ("photoz_trained_model", DataFile), diff --git a/txpipe/photoz_stack.py b/txpipe/photoz_stack.py index 0768a3bb3..400ad2dc7 100755 --- a/txpipe/photoz_stack.py +++ b/txpipe/photoz_stack.py @@ -325,7 +325,7 @@ class TXPhotozPlots(PipelineStage): """ Make n(z) plots of source and lens galaxies """ - + parallel = False name = "TXPhotozPlots" inputs = [("shear_photoz_stack", NOfZFile), ("lens_photoz_stack", NOfZFile)] outputs = [ diff --git a/txpipe/psf_diagnostics.py b/txpipe/psf_diagnostics.py index cc787df24..7fa572a7b 100755 --- a/txpipe/psf_diagnostics.py +++ b/txpipe/psf_diagnostics.py @@ -183,7 +183,7 @@ class TXRoweStatistics(PipelineStage): """ name = "TXRoweStatistics" - + parallel = False inputs = [("star_catalog", HDFFile)] outputs = [ ("rowe134", PNGFile), @@ -340,7 +340,7 @@ def save_stats(self, rowe_stats): f.close() -class TXStarShearTests(PipelineStage): +class TXGalaxyStarShear(PipelineStage): """ Compute and plot star x galaxy and star x star correlations. @@ -349,6 +349,7 @@ class TXStarShearTests(PipelineStage): """ name = "TXGalaxyStarShear" + parallel = False inputs = [ ("shear_catalog", ShearCatalog), @@ -615,7 +616,7 @@ def save_stats(self, galaxy_star_stats, star_star_stats): f.close() -class TXStarDensityTests(PipelineStage): +class TXGalaxyStarDensity(PipelineStage): """ Compute and plot star x galaxy and star x star density correlations @@ -624,6 +625,7 @@ class TXStarDensityTests(PipelineStage): """ name = "TXGalaxyStarDensity" + parallel = False inputs = [ ("shear_catalog", ShearCatalog), @@ -824,6 +826,7 @@ class TXBrighterFatterPlot(PipelineStage): """ name = "TXBrighterFatterPlot" + parallel = False inputs = [("star_catalog", HDFFile)] diff --git a/txpipe/theory.py b/txpipe/theory.py index bbc6102c4..f38bad0d0 100644 --- a/txpipe/theory.py +++ b/txpipe/theory.py @@ -10,6 +10,7 @@ class TXTwoPointTheoryReal(PipelineStage): """ name = "TXTwoPointTheoryReal" + parallel = False inputs = [ ("twopoint_data_real", SACCFile), ("fiducial_cosmology", FiducialCosmology), # For example lines @@ -192,6 +193,7 @@ class TXTwoPointTheoryFourier(TXTwoPointTheoryReal): """ name = "TXTwoPointTheoryFourier" + parallel = False inputs = [ ("twopoint_data_fourier", SACCFile), ("fiducial_cosmology", FiducialCosmology), # For example lines diff --git a/txpipe/twopoint_plots.py b/txpipe/twopoint_plots.py index 03c47a701..f7705e214 100644 --- a/txpipe/twopoint_plots.py +++ b/txpipe/twopoint_plots.py @@ -11,6 +11,7 @@ class TXTwoPointPlots(PipelineStage): """ name = "TXTwoPointPlots" + parallel = False inputs = [ ("twopoint_data_real", SACCFile), ("fiducial_cosmology", FiducialCosmology), # For example lines @@ -545,6 +546,7 @@ class TXTwoPointPlotsFourier(PipelineStage): """ name = "TXTwoPointPlotsFourier" + parallel = False inputs = [ ("summary_statistics_fourier", SACCFile), ("fiducial_cosmology", FiducialCosmology), # For example lines