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-39683: Break faro task up into visit, matched, and tract-based subsets #72

Merged
merged 1 commit into from
Jun 21, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

from documenteer.conf.pipelinespkg import *


project = "drp_pipe"
html_theme_options["logotext"] = project
html_title = project
Expand Down
4 changes: 3 additions & 1 deletion pipelines/HSC/DRP-Prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ instrument: lsst.obs.subaru.HyperSuprimeCam
imports:
- location: "$DRP_PIPE_DIR/pipelines/_ingredients/HSC/DRP.yaml"
exclude:
- faro_all
- faro_visit
- faro_matched
- faro_tract
tasks:
fgcmFitCycle:
class: lsst.fgcmcal.fgcmFitCycle.FgcmFitCycleTask
Expand Down
4 changes: 3 additions & 1 deletion pipelines/HSC/DRP-ci_hsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ imports:
# there isn't enough data.
- fgcm
- gbdesAstrometricFit
- faro_all
- faro_visit
- faro_matched
- faro_tract
# Some of these plots fail with ci_hsc data
# - analyzeObjectTableCore
# - refCatObjectTract
Expand Down
4 changes: 3 additions & 1 deletion pipelines/_ingredients/HSC/DRP+fakes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ imports:
- analyzeObjectTableSurveyCore
- catalogMatchTract
- refCatObjectTract
- faro_all
- faro_visit
- faro_matched
- faro_tract
tasks:
singleFrameWithFakes:
class: lsst.pipe.tasks.processCcdWithFakes.ProcessCcdWithFakesTask
Expand Down
26 changes: 15 additions & 11 deletions pipelines/_ingredients/HSC/DRP.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ tasks:
config:
doMultipleCycles: true
subsets:
faro_all:
faro_visit:
subset:
# visit-level on single-frame products
- nsrcMeasVisit
- TE3
- TE4
# tract-level, matched-visit on single-frame products
description: |
Set of visit-level faro metrics. These tasks run on single-frame products and
require Calibrated Source Tables, which are available after
consolidateSourceTable (step6) is run.
faro_matched:
subset:
- matchCatalogsTract
- matchCatalogsPatch
- matchCatalogsPatchMultiBand
Expand Down Expand Up @@ -54,17 +58,17 @@ subsets:
- psfPhotRepStar2
- psfPhotRepStar3
- psfPhotRepStar4
# tract-level on coadd products
description: |
Set of tract-level, matched-visit faro metrics. These tasks run on single-frame
products and require Calibrated Source Tables, which are available after
consolidateSourceTable (step6) is run.
faro_tract:
subset:
- TE1
- TE2
- wPerp
- skyObjectMean
- skyObjectStd
description: |
Set of tasks for calculation of metrics via faro.
These tasks are a mix of visit- and tract-level and must be run globally
for RC2.
Tasks that require single-frame products use Calibrated Source Tables,
which are available after consolidateSourceTable (step6) is run.
Tasks that require coadd products use Object Tables which are available
after consolidateObjectTable (step3) is run.
Set of tract-level faro metrics to be run on coadd products. These use Object
Tables which are available after consolidateObjectTable (step3) is run.
26 changes: 15 additions & 11 deletions pipelines/_ingredients/LSSTCam-imSim/DRP.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,17 @@ subsets:

Includes extended-level diff_matched_analysis metrics, which are
considered core for DC2 as they can't be run on other datasets yet.
faro_all:
faro_visit:
subset:
# visit-level on single-frame products
- nsrcMeasVisit
- TE3
- TE4
# tract-level, matched-visit on single-frame products
description: |
Set of visit-level faro metrics. These tasks run on single-frame products and
require Calibrated Source Tables, which are available after
consolidateSourceTable (step6) is run.
faro_matched:
subset:
- matchCatalogsTract
- matchCatalogsPatch
- matchCatalogsPatchMultiBand
Expand Down Expand Up @@ -282,17 +286,17 @@ subsets:
- psfPhotRepStar2
- psfPhotRepStar3
- psfPhotRepStar4
# tract-level on coadd products
description: |
Set of tract-level, matched-visit faro metrics. These tasks run on single-frame
products and require Calibrated Source Tables, which are available after
consolidateSourceTable (step6) is run.
faro_tract:
subset:
- TE1
- TE2
- wPerp
- skyObjectMean
- skyObjectStd
description: |
Set of tasks for calculation of metrics via faro.
These tasks are a mix of visit- and tract-level.

Tasks that require single-frame products use Calibrated Source Tables,
which are available after consolidateSourceTable (step2).
Tasks that require coadd products use Object Tables which are available
after consolidateObjectTable (step3).
Set of tract-level faro metrics to be run on coadd products. These use Object
Tables which are available after consolidateObjectTable (step3) is run.