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.

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-45750: Store new-style ephemerides and APDB catalogs in ap_verify data sets #238

Merged
merged 1 commit into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion pipelines/DECam/ApVerify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ imports:
# Include all metrics from standard pipeline. It's not practical to create
# a metrics subset because it would require constant micromanagement.
exclude:
- apPipe
- prompt
- location: $AP_PIPE_DIR/pipelines/DECam/ApPipe.yaml
include:
- prompt
tasks:
# ApVerify override removed by excluding apPipe.
diaPipe:
Expand Down
4 changes: 3 additions & 1 deletion pipelines/DECam/ApVerifyWithFakes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ imports:
# Include all metrics from standard pipeline. It's not practical to create
# a metrics subset because it would require constant micromanagement.
exclude:
- apPipe
- prompt
- location: $AP_PIPE_DIR/pipelines/DECam/ApPipeWithFakes.yaml
include:
- prompt
tasks:
# ApVerify override removed by excluding apPipe.
diaPipe:
Expand Down
4 changes: 3 additions & 1 deletion pipelines/HSC/ApVerify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ imports:
# Include all metrics from standard pipeline. It's not practical to create
# a metrics subset because it would require constant micromanagement.
exclude:
- apPipe
- prompt
- location: $AP_PIPE_DIR/pipelines/HSC/ApPipe.yaml
include:
- prompt
tasks:
# ApVerify override removed by excluding apPipe.
diaPipe:
Expand Down
4 changes: 3 additions & 1 deletion pipelines/HSC/ApVerifyWithFakes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ imports:
# Include all metrics from standard pipeline. It's not practical to create
# a metrics subset because it would require constant micromanagement.
exclude:
- apPipe
- prompt
- location: $AP_PIPE_DIR/pipelines/HSC/ApPipeWithFakes.yaml
include:
- prompt
tasks:
# ApVerify override removed by excluding apPipe.
diaPipe:
Expand Down
4 changes: 3 additions & 1 deletion pipelines/LSSTCam-imSim/ApVerify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ imports:
# Include all metrics from standard pipeline. It's not practical to create
# a metrics subset because it would require constant micromanagement.
exclude:
- apPipe
- prompt
- location: $AP_PIPE_DIR/pipelines/LSSTCam-imSim/ApPipe.yaml
include:
- prompt
tasks:
# ApVerify override removed by excluding apPipe.
diaPipe:
Expand Down
4 changes: 3 additions & 1 deletion pipelines/LSSTCam-imSim/ApVerifyWithFakes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ imports:
# Include all metrics from standard pipeline. It's not practical to create
# a metrics subset because it would require constant micromanagement.
exclude:
- apPipe
- prompt
- location: $AP_PIPE_DIR/pipelines/LSSTCam-imSim/ApPipeWithFakes.yaml
include:
- prompt
tasks:
# ApVerify override removed by excluding apPipe.
diaPipe:
Expand Down
2 changes: 2 additions & 0 deletions pipelines/_ingredients/ApVerify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
description: Fully instrumented AP pipeline.
imports:
- location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipe.yaml
include:
- prompt
- location: $AP_VERIFY_DIR/pipelines/_ingredients/MetricsRuntime.yaml
exclude:
- timing_calibrate
Expand Down
2 changes: 2 additions & 0 deletions pipelines/_ingredients/ApVerifyWithFakes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: Fully instrumented AP pipeline with fakes
imports:
- location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipeWithFakes.yaml
include:
- prompt
# Most metrics should not be run with fakes, to avoid bias or contamination.
- location: $AP_VERIFY_DIR/pipelines/_ingredients/ConversionsForFakes.yaml
tasks:
Expand Down
16 changes: 0 additions & 16 deletions pipelines/_ingredients/MetricsRuntime.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,6 @@ tasks:
connections.metric: MapDiaSourceTime
connections.labelName: transformDiaSrcCat
target: transformDiaSrcCat.run
timing_diaCatalogLoader:
class: lsst.verify.tasks.commonMetrics.TimingMetricTask
config:
connections.package: ap_association
connections.metric: LoadDiaCatalogsTime
connections.labelName: loadDiaCatalogs
metadataDimensions: [instrument, group, detector] # TimingMetricTask assumes visit
target: loadDiaCatalogs.run
timing_diaPipe_associator:
class: lsst.verify.tasks.commonMetrics.TimingMetricTask
config:
Expand Down Expand Up @@ -212,14 +204,6 @@ tasks:
connections.metric: MapDiaSourceCpuTime
connections.labelName: transformDiaSrcCat
target: transformDiaSrcCat.run
cputiming_diaCatalogLoader:
class: lsst.verify.tasks.commonMetrics.CpuTimingMetricTask
config:
connections.package: ap_association
connections.metric: LoadDiaCatalogsCpuTime
connections.labelName: loadDiaCatalogs
metadataDimensions: [instrument, group, detector] # CpuTimingMetricTask assumes visit
target: loadDiaCatalogs.run
cputiming_diaPipe_associator:
class: lsst.verify.tasks.commonMetrics.CpuTimingMetricTask
config:
Expand Down
Loading