From 52308479da1e47b797e49ce424d2b8a117fdcbb7 Mon Sep 17 00:00:00 2001 From: Arun Kannawadi Date: Mon, 10 Jun 2024 09:25:26 -0700 Subject: [PATCH 1/2] Move measMatch* out of COMMON_OUTPUTS --- tests/test_pipelines.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_pipelines.py b/tests/test_pipelines.py index 9d10181a..91393d2b 100644 --- a/tests/test_pipelines.py +++ b/tests/test_pipelines.py @@ -87,8 +87,6 @@ "deepCoadd_forced_src", "deepCoadd_inputMap", "deepCoadd_meas", - "deepCoadd_measMatch", - "deepCoadd_measMatchFull", "deepCoadd_mergeDet", "deepCoadd_nImage", "deepCoadd_obj", @@ -118,6 +116,8 @@ HSC_OUTPUTS = { "calexp_skyCorr_visit_mosaic", "calexpBackground_skyCorr_visit_mosaic", + "deepCoadd_measMatch", + "deepCoadd_measMatchFull", "forced_src", "preSource", "preSourceTable", @@ -128,6 +128,8 @@ # LSSTCam-imSim common outputs, in addition to COMMON_OUTPUTS LSSTCAM_IMSIM_OUTPUTS = { + "deepCoadd_measMatch", + "deepCoadd_measMatchFull", "diaObjectTable_tract", "diaSourceTable", "diaSourceTable_tract", @@ -219,6 +221,8 @@ def test_decam_drp_merian(self): }, expected_outputs=COMMON_OUTPUTS | { + "deepCoadd_measMatch", + "deepCoadd_measMatchFull", "goodSeeingCoadd", "goodSeeingCoadd_nImage", "goodSeeingVisits", From 9a1b435f06b0b739f730ef7faab106189fbe6a75 Mon Sep 17 00:00:00 2001 From: Arun Kannawadi Date: Mon, 10 Jun 2024 09:26:00 -0700 Subject: [PATCH 2/2] Test LATISS pipeline --- tests/test_pipelines.py | 77 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/tests/test_pipelines.py b/tests/test_pipelines.py index 91393d2b..9dc67b0d 100644 --- a/tests/test_pipelines.py +++ b/tests/test_pipelines.py @@ -66,6 +66,15 @@ "yBackground", } +# LATISS common inputs, in addition to COMMON_INPUTS +LATISS_INPUTS = { + "atlas_refcat2_20220201", + "defects", + "gaia_dr3_20230707", + "sky", + "transmission_atmosphere_fgcm", +} + # LSSTCam-imSim common inputs, in addition to COMMON_INPUTS LSSTCAM_IMSIM_INPUTS = { "bfk", @@ -126,6 +135,48 @@ "srcMatchFull", } +# LATISS common outputs, in addition to COMMON_OUTPUTS +LATISS_OUTPUTS = { + "diaObjectTable_tract", + "diaSourceTable", + "diaSourceTable_tract", + "fgcm_Cycle0_FitParameters", + "fgcm_Cycle1_FitParameters", + "fgcm_Cycle2_FitParameters", + "fgcm_Cycle3_FitParameters", + "fgcm_Cycle4_FitParameters", + "fgcm_Cycle0_FlaggedStars", + "fgcm_Cycle1_FlaggedStars", + "fgcm_Cycle2_FlaggedStars", + "fgcm_Cycle3_FlaggedStars", + "fgcm_Cycle4_FlaggedStars", + "fgcm_reference_stars", + "fgcm_star_ids", + "fgcm_star_observations", + "forcedSourceOnDiaObjectTable", + "forcedSourceOnDiaObjectTable_tract", + "forcedSourceTable", + "forcedSourceTable_tract", + "forced_diff", + "forced_diff_diaObject", + "forced_src_diaObject", + "goodSeeingCoadd", + "goodSeeingCoadd_nImage", + "goodSeeingDiff_assocDiaSrcTable", + "goodSeeingDiff_diaObjTable", + "goodSeeingDiff_diaSrc", + "goodSeeingDiff_diaSrcTable", + "goodSeeingDiff_differenceExp", + "goodSeeingDiff_differenceTempExp", + "goodSeeingDiff_fullDiaObjTable", + "goodSeeingDiff_matchedExp", + "goodSeeingDiff_templateExp", + "goodSeeingVisits", + "mergedForcedSource", + "mergedForcedSourceOnDiaObject", + "transmission_atmosphere_fgcm", +} + # LSSTCam-imSim common outputs, in addition to COMMON_OUTPUTS LSSTCAM_IMSIM_OUTPUTS = { "deepCoadd_measMatch", @@ -442,6 +493,32 @@ def test_hsc_drp_rc2_subset(self): ) tester.run(butler, self) + def test_latiss_drp(self): + butler = self.makeButler(writeable=True) + tester = PipelineStepTester( + os.path.join(PIPELINES_DIR, "LATISS", "DRP.yaml"), + [ + "#step1", + "#step2a", + "#step2bcde", + "#step3a", + "#step3b", + "#step3c", + "#step4", + "#step5", + "#step6", + ], + [ + ("ps1_pv3_3pi_20170110", {"htm7"}, "SimpleCatalog", False), + ("gaia_dr2_20200414", {"htm7"}, "SimpleCatalog", False), + ("gaia_dr3_20230707", {"htm7"}, "SimpleCatalog", False), + ("atlas_refcat2_20220201", {"htm7"}, "SimpleCatalog", False), + ], + expected_inputs=COMMON_INPUTS | LATISS_INPUTS | {"fgcmLookUpTable"}, + expected_outputs=COMMON_OUTPUTS | LATISS_OUTPUTS, + ) + tester.run(butler, self) + def test_lsstcam_imsim_drp_ci_imsim(self): butler = self.makeButler(writeable=True) tester = PipelineStepTester(