From eeaa9ff380d56251a2b3709dc348fb309aa4e123 Mon Sep 17 00:00:00 2001 From: Erin Howard Date: Mon, 11 Sep 2023 17:01:35 -0700 Subject: [PATCH] Update pipeline subdirectories in response to RFC-775. --- pipelines/{DarkEnergyCamera => DECam}/ApVerify.yaml | 2 +- .../{DarkEnergyCamera => DECam}/ApVerifyCalibrateImage.yaml | 2 +- .../{DarkEnergyCamera => DECam}/ApVerifyWithFakes.yaml | 6 +++--- pipelines/{HyperSuprimeCam => HSC}/ApVerify.yaml | 2 +- .../{HyperSuprimeCam => HSC}/ApVerifyCalibrateImage.yaml | 2 +- pipelines/{HyperSuprimeCam => HSC}/ApVerifyWithFakes.yaml | 4 ++-- python/lsst/ap/verify/pipeline_driver.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename pipelines/{DarkEnergyCamera => DECam}/ApVerify.yaml (93%) rename pipelines/{DarkEnergyCamera => DECam}/ApVerifyCalibrateImage.yaml (89%) rename pipelines/{DarkEnergyCamera => DECam}/ApVerifyWithFakes.yaml (67%) rename pipelines/{HyperSuprimeCam => HSC}/ApVerify.yaml (90%) rename pipelines/{HyperSuprimeCam => HSC}/ApVerifyCalibrateImage.yaml (89%) rename pipelines/{HyperSuprimeCam => HSC}/ApVerifyWithFakes.yaml (76%) diff --git a/pipelines/DarkEnergyCamera/ApVerify.yaml b/pipelines/DECam/ApVerify.yaml similarity index 93% rename from pipelines/DarkEnergyCamera/ApVerify.yaml rename to pipelines/DECam/ApVerify.yaml index 23b1060a..d988cdcd 100644 --- a/pipelines/DarkEnergyCamera/ApVerify.yaml +++ b/pipelines/DECam/ApVerify.yaml @@ -8,7 +8,7 @@ imports: # a metrics subset because it would require constant micromanagement. exclude: - apPipe - - location: $AP_PIPE_DIR/pipelines/DarkEnergyCamera/ApPipe.yaml + - location: $AP_PIPE_DIR/pipelines/DECam/ApPipe.yaml tasks: # ApVerify override removed by excluding apPipe. diaPipe: diff --git a/pipelines/DarkEnergyCamera/ApVerifyCalibrateImage.yaml b/pipelines/DECam/ApVerifyCalibrateImage.yaml similarity index 89% rename from pipelines/DarkEnergyCamera/ApVerifyCalibrateImage.yaml rename to pipelines/DECam/ApVerifyCalibrateImage.yaml index 4b4a91f0..d8bc209a 100644 --- a/pipelines/DarkEnergyCamera/ApVerifyCalibrateImage.yaml +++ b/pipelines/DECam/ApVerifyCalibrateImage.yaml @@ -9,7 +9,7 @@ imports: # a metrics subset because it would require constant micromanagement. exclude: - apPipe - - location: $AP_PIPE_DIR/pipelines/DarkEnergyCamera/ApPipeCalibrateImage.yaml + - location: $AP_PIPE_DIR/pipelines/DECam/ApPipeCalibrateImage.yaml tasks: # ApVerify override removed by excluding apPipe. diaPipe: diff --git a/pipelines/DarkEnergyCamera/ApVerifyWithFakes.yaml b/pipelines/DECam/ApVerifyWithFakes.yaml similarity index 67% rename from pipelines/DarkEnergyCamera/ApVerifyWithFakes.yaml rename to pipelines/DECam/ApVerifyWithFakes.yaml index e7ac4be2..6d115bb9 100644 --- a/pipelines/DarkEnergyCamera/ApVerifyWithFakes.yaml +++ b/pipelines/DECam/ApVerifyWithFakes.yaml @@ -1,7 +1,7 @@ # Verification pipeline specialized for DECam with fake source inejection. # This concatenates various lsst.verify metrics to an AP pipeline -# This pipeline assumes $AP_PIPE_DIR/pipelines/DarkEnergyCamera/RunIsrForCrosstalkSources.yaml +# This pipeline assumes $AP_PIPE_DIR/pipelines/DECam/RunIsrForCrosstalkSources.yaml # has already been run. instrument: lsst.obs.decam.DarkEnergyCamera @@ -10,7 +10,7 @@ imports: - location: $AP_VERIFY_DIR/pipelines/_ingredients/ApVerifyWithFakes.yaml exclude: - processCcd - - location: $AP_PIPE_DIR/pipelines/DarkEnergyCamera/ProcessCcd.yaml - # Can't use $AP_PIPE_DIR/pipelines/DarkEnergyCamera/ApPipeWithFakes.yaml here + - location: $AP_PIPE_DIR/pipelines/DECam/ProcessCcd.yaml + # Can't use $AP_PIPE_DIR/pipelines/DECam/ApPipeWithFakes.yaml here # because the changes made by that file and _ingredients/ApVerifyWithFakes.yaml # are hard to separate. diff --git a/pipelines/HyperSuprimeCam/ApVerify.yaml b/pipelines/HSC/ApVerify.yaml similarity index 90% rename from pipelines/HyperSuprimeCam/ApVerify.yaml rename to pipelines/HSC/ApVerify.yaml index ba9a8105..2bb861ef 100644 --- a/pipelines/HyperSuprimeCam/ApVerify.yaml +++ b/pipelines/HSC/ApVerify.yaml @@ -8,7 +8,7 @@ imports: # a metrics subset because it would require constant micromanagement. exclude: - apPipe - - location: $AP_PIPE_DIR/pipelines/HyperSuprimeCam/ApPipe.yaml + - location: $AP_PIPE_DIR/pipelines/HSC/ApPipe.yaml tasks: # ApVerify override removed by excluding apPipe. diaPipe: diff --git a/pipelines/HyperSuprimeCam/ApVerifyCalibrateImage.yaml b/pipelines/HSC/ApVerifyCalibrateImage.yaml similarity index 89% rename from pipelines/HyperSuprimeCam/ApVerifyCalibrateImage.yaml rename to pipelines/HSC/ApVerifyCalibrateImage.yaml index f1fde5de..902d5922 100644 --- a/pipelines/HyperSuprimeCam/ApVerifyCalibrateImage.yaml +++ b/pipelines/HSC/ApVerifyCalibrateImage.yaml @@ -9,7 +9,7 @@ imports: # a metrics subset because it would require constant micromanagement. exclude: - apPipe - - location: $AP_PIPE_DIR/pipelines/HyperSuprimeCam/ApPipeCalibrateImage.yaml + - location: $AP_PIPE_DIR/pipelines/HSC/ApPipeCalibrateImage.yaml tasks: # ApVerify override removed by excluding apPipe. diaPipe: diff --git a/pipelines/HyperSuprimeCam/ApVerifyWithFakes.yaml b/pipelines/HSC/ApVerifyWithFakes.yaml similarity index 76% rename from pipelines/HyperSuprimeCam/ApVerifyWithFakes.yaml rename to pipelines/HSC/ApVerifyWithFakes.yaml index 19594dde..a88436a5 100644 --- a/pipelines/HyperSuprimeCam/ApVerifyWithFakes.yaml +++ b/pipelines/HSC/ApVerifyWithFakes.yaml @@ -7,7 +7,7 @@ imports: - location: $AP_VERIFY_DIR/pipelines/_ingredients/ApVerifyWithFakes.yaml exclude: - processCcd - - location: $AP_PIPE_DIR/pipelines/HyperSuprimeCam/ProcessCcd.yaml - # Can't use $AP_PIPE_DIR/pipelines/HyperSuprimeCam/ApPipeWithFakes.yaml here + - location: $AP_PIPE_DIR/pipelines/HSC/ProcessCcd.yaml + # Can't use $AP_PIPE_DIR/pipelines/HSC/ApPipeWithFakes.yaml here # because the changes made by that file and _ingredients/ApVerifyWithFakes.yaml # are hard to separate. diff --git a/python/lsst/ap/verify/pipeline_driver.py b/python/lsst/ap/verify/pipeline_driver.py index 328257e3..2925a5de 100644 --- a/python/lsst/ap/verify/pipeline_driver.py +++ b/python/lsst/ap/verify/pipeline_driver.py @@ -106,7 +106,7 @@ def runApPipeGen3(workspace, parsedCmdLine, processes=1): # processing pipeline (DM-31492). instruments = {id["instrument"] for id in workspace.workButler.registry.queryDataIds("instrument")} if "DECam" in instruments: - crosstalkPipeline = "${AP_PIPE_DIR}/pipelines/DarkEnergyCamera/RunIsrForCrosstalkSources.yaml" + crosstalkPipeline = "${AP_PIPE_DIR}/pipelines/DECam/RunIsrForCrosstalkSources.yaml" crosstalkArgs = ["pipetask", "run", "--butler-config", workspace.repo, "--pipeline", crosstalkPipeline,