Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-43418: Fixes to ApVerify pipelines #231

Merged
merged 2 commits into from
Aug 30, 2024
+86 −1
Merged

DM-43418: Fixes to ApVerify pipelines #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f60cda3
Fix instrument specializations of ApVerifyWithFakes.
kfindeisen Aug 19, 2024
18915ad
Synchronize ApVerifyWithFakes to ApVerify.
kfindeisen Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions pipelines/DECam/ApVerifyWithFakes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,31 @@ instrument: lsst.obs.decam.DarkEnergyCamera
description: Fully instrumented AP pipeline with fakes, specialized for DECam
imports:
- location: $AP_VERIFY_DIR/pipelines/_ingredients/ApVerifyWithFakes.yaml
# Include all metrics from standard pipeline. It's not practical to create
# a metrics subset because it would require constant micromanagement.
exclude:
- apPipe
- location: $AP_PIPE_DIR/pipelines/DECam/ApPipeWithFakes.yaml
tasks:
# ApVerify override removed by excluding apPipe.
diaPipe:
class: lsst.ap.association.DiaPipelineTask
config:
doPackageAlerts: True
alertPackager.doWriteAlerts: True
contracts:
# Contracts removed by excluding apPipe
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCompletenessMag20t22.connections.ConnectionsClass(config=apFakesCompletenessMag20t22).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCompletenessMag22t24.connections.ConnectionsClass(config=apFakesCompletenessMag22t24).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCompletenessMag24t26.connections.ConnectionsClass(config=apFakesCompletenessMag24t26).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCountMag20t22.connections.ConnectionsClass(config=apFakesCountMag20t22).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCountMag22t24.connections.ConnectionsClass(config=apFakesCountMag22t24).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCountMag24t26.connections.ConnectionsClass(config=apFakesCountMag24t26).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCount.connections.ConnectionsClass(config=apFakesCount).matchedFakes.name
30 changes: 29 additions & 1 deletion pipelines/HSC/ApVerifyWithFakes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,35 @@
# Verification pipeline specialized for HSC, with fak source injection.
# Verification pipeline specialized for HSC, with fake source injection.
# This concatenates various lsst.verify metrics to an AP pipeline

instrument: lsst.obs.subaru.HyperSuprimeCam
description: Fully instrumented AP pipeline with fakes, specialized for HSC
imports:
- location: $AP_VERIFY_DIR/pipelines/_ingredients/ApVerifyWithFakes.yaml
# Include all metrics from standard pipeline. It's not practical to create
# a metrics subset because it would require constant micromanagement.
exclude:
- apPipe
- location: $AP_PIPE_DIR/pipelines/HSC/ApPipeWithFakes.yaml
tasks:
# ApVerify override removed by excluding apPipe.
diaPipe:
class: lsst.ap.association.DiaPipelineTask
config:
doPackageAlerts: True
alertPackager.doWriteAlerts: True
contracts:
# Contracts removed by excluding apPipe
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCompletenessMag20t22.connections.ConnectionsClass(config=apFakesCompletenessMag20t22).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCompletenessMag22t24.connections.ConnectionsClass(config=apFakesCompletenessMag22t24).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCompletenessMag24t26.connections.ConnectionsClass(config=apFakesCompletenessMag24t26).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCountMag20t22.connections.ConnectionsClass(config=apFakesCountMag20t22).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCountMag22t24.connections.ConnectionsClass(config=apFakesCountMag22t24).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCountMag24t26.connections.ConnectionsClass(config=apFakesCountMag24t26).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCount.connections.ConnectionsClass(config=apFakesCount).matchedFakes.name
28 changes: 28 additions & 0 deletions pipelines/LSSTCam-imSim/ApVerifyWithFakes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,31 @@ instrument: lsst.obs.lsst.LsstCamImSim
description: Fully instrumented AP pipeline with fakes, specialized for LSSTCam-imSim
imports:
- location: $AP_VERIFY_DIR/pipelines/_ingredients/ApVerifyWithFakes.yaml
# Include all metrics from standard pipeline. It's not practical to create
# a metrics subset because it would require constant micromanagement.
exclude:
- apPipe
- location: $AP_PIPE_DIR/pipelines/LSSTCam-imSim/ApPipeWithFakes.yaml
tasks:
# ApVerify override removed by excluding apPipe.
diaPipe:
class: lsst.ap.association.DiaPipelineTask
config:
doPackageAlerts: True
alertPackager.doWriteAlerts: True
contracts:
# Contracts removed by excluding apPipe
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCompletenessMag20t22.connections.ConnectionsClass(config=apFakesCompletenessMag20t22).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCompletenessMag22t24.connections.ConnectionsClass(config=apFakesCompletenessMag22t24).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCompletenessMag24t26.connections.ConnectionsClass(config=apFakesCompletenessMag24t26).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCountMag20t22.connections.ConnectionsClass(config=apFakesCountMag20t22).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCountMag22t24.connections.ConnectionsClass(config=apFakesCountMag22t24).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCountMag24t26.connections.ConnectionsClass(config=apFakesCountMag24t26).matchedFakes.name
- injectedMatch.connections.ConnectionsClass(config=injectedMatch).matchedDiaSources.name ==
apFakesCount.connections.ConnectionsClass(config=apFakesCount).matchedFakes.name
1 change: 1 addition & 0 deletions pipelines/_ingredients/ApVerifyWithFakes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ tasks:
# TODO: needed for "providing bulk sample alerts to brokers"; remove once
# we have an alternative.
doPackageAlerts: True
alertPackager.doWriteAlerts: True
contracts:
# Metric inputs must match pipeline outputs
# Use of ConnectionsClass for templated fields is a workaround for DM-30210
Expand Down
Loading