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-44452: Add WholeSkyAnalysisTask to the DRP HSC reprocessing pipelines #125

Merged
merged 1 commit into from
Jun 18, 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
43 changes: 43 additions & 0 deletions pipelines/HSC/DRP-RC2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,43 @@ tasks:
class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
config:
band_order: ['i', 'r', 'g', 'z', 'y', 'N921']
matchedVisitCoreWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
connections.inputName: "matchedVisitCore_metricsTable"
connections.outputName: "matchedVisitCore_wholeSky"
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [145.0, 340.0]
atools.wholeSkyMetric.yLimits: [-5.0, 10.0]
atools.wholeSkyMetric.bands: ["g", "r", "i", "z", "y"]
atools.wholeSkyMetric.plotKeys: []
atools.wholeSkyMetric.keysWithBand: parameters.matchedVisitCoreKeysWithBand
python: |
from lsst.analysis.tools.atools import *
objectTableCoreWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [145.0, 340.0]
atools.wholeSkyMetric.yLimits: [-5.0, 10.0]
atools.wholeSkyMetric.bands: ["g", "r", "i", "z", "y"]
atools.wholeSkyMetric.plotKeys: parameters.objectTableCorePlotKeys
atools.wholeSkyMetric.keysWithBand: parameters.objectTableCoreKeysWithBand
python: |
from lsst.analysis.tools.atools import *
objectTableCoreRefCatMatchWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
connections.inputName: "objectTable_tract_gaia_dr3_20230707_match_metricsTable"
connections.outputName: "objectTableCoreRefCatMatch_wholeSky"
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [145.0, 340.0]
atools.wholeSkyMetric.yLimits: [-5.0, 10.0]
atools.wholeSkyMetric.bands: ["g", "r", "i", "z", "y"]
atools.wholeSkyMetric.plotKeys: []
atools.wholeSkyMetric.keysWithBand: parameters.objectTableCoreRefCatMatchKeysWithBand
python: |
from lsst.analysis.tools.atools import *
subsets:
step1:
subset:
Expand Down Expand Up @@ -244,6 +281,12 @@ subsets:
- analyzeObjectTableCore
- analyzeObjectTableSurveyCore
- catalogMatchTract
- makeMetricTableMatchedVisitCore
- makeMetricTableObjectTableCore
- makeMetricTableObjectTableCoreRefCatMatch
- matchedVisitCoreWholeSkyPlot
- objectTableCoreWholeSkyPlot
- objectTableCoreRefCatMatchWholeSkyPlot
- photometricCatalogMatch
- photometricRefCatObjectTract
- plotPropertyMapTract
Expand Down
43 changes: 43 additions & 0 deletions pipelines/HSC/DRP-RC2_subset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ tasks:
python: |
from lsst.faro.measurement import PF1Task
config.measure.retarget(PF1Task)
matchedVisitCoreWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
connections.inputName: "matchedVisitCore_metricsTable"
connections.outputName: "matchedVisitCore_wholeSky"
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [125.0, 175.0]
atools.wholeSkyMetric.yLimits: [-5.0, 10.0]
atools.wholeSkyMetric.bands: ["g", "r", "i", "z", "y"]
atools.wholeSkyMetric.plotKeys: []
atools.wholeSkyMetric.keysWithBand: parameters.matchedVisitCoreKeysWithBand
python: |
from lsst.analysis.tools.atools import *
modelPhotRepGal1:
class: lsst.faro.measurement.TractMatchedMeasurementTask
config:
Expand Down Expand Up @@ -139,6 +152,30 @@ tasks:
config.connections.matchedCatalog = 'matchedCatalogTractStarsSNR5to80'
from lsst.faro.measurement import ModelPhotRepTask
config.measure.retarget(ModelPhotRepTask)
objectTableCoreWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [125.0, 175.0]
atools.wholeSkyMetric.yLimits: [-5.0, 10.0]
atools.wholeSkyMetric.bands: ["g", "r", "i", "z", "y"]
atools.wholeSkyMetric.plotKeys: parameters.objectTableCorePlotKeys
atools.wholeSkyMetric.keysWithBand: parameters.objectTableCoreKeysWithBand
python: |
from lsst.analysis.tools.atools import *
objectTableCoreRefCatMatchWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
connections.inputName: "objectTable_tract_gaia_dr3_20230707_match_metricsTable"
connections.outputName: "objectTableCoreRefCatMatch_wholeSky"
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [125.0, 175.0]
atools.wholeSkyMetric.yLimits: [-5.0, 10.0]
atools.wholeSkyMetric.bands: ["g", "r", "i", "z", "y"]
atools.wholeSkyMetric.plotKeys: []
atools.wholeSkyMetric.keysWithBand: parameters.objectTableCoreRefCatMatchKeysWithBand
python: |
from lsst.analysis.tools.atools import *
psfPhotRepStar1:
class: lsst.faro.measurement.TractMatchedMeasurementTask
config:
Expand Down Expand Up @@ -416,6 +453,12 @@ subsets:
- analyzeObjectTableCore
- analyzeObjectTableSurveyCore
- catalogMatchTract
- makeMetricTableMatchedVisitCore
- makeMetricTableObjectTableCore
- makeMetricTableObjectTableCoreRefCatMatch
- matchedVisitCoreWholeSkyPlot
- objectTableCoreWholeSkyPlot
- objectTableCoreRefCatMatchWholeSkyPlot
- photometricCatalogMatch
- photometricRefCatObjectTract
- plotPropertyMapTract
Expand Down
29 changes: 29 additions & 0 deletions pipelines/HSC/DRP-ci_hsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,31 @@ tasks:
class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
config:
band_order: ['i', 'r']
matchedVisitCoreWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
connections.inputName: "matchedVisitCore_metricsTable"
connections.outputName: "matchedVisitCore_wholeSky"
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [295.0, 345.0]
atools.wholeSkyMetric.yLimits: [-7.5, 7.5]
atools.wholeSkyMetric.bands: ["r", "i"]
atools.wholeSkyMetric.plotKeys: []
atools.wholeSkyMetric.keysWithBand: parameters.matchedVisitCoreKeysWithBand
python: |
from lsst.analysis.tools.atools import *
objectTableCoreWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [295.0, 345.0]
atools.wholeSkyMetric.yLimits: [-7.5, 7.5]
atools.wholeSkyMetric.bands: ["r", "i"]
atools.wholeSkyMetric.plotKeys: parameters.objectTableCorePlotKeys
atools.wholeSkyMetric.keysWithBand: parameters.objectTableCoreKeysWithBand
python: |
from lsst.analysis.tools.atools import *

subsets:
analysis_tools:
subset:
Expand All @@ -60,6 +85,10 @@ subsets:
- analyzeObjectTableSurveyCore
- analyzeSourceTableCore
- catalogMatchTract
- makeMetricTableMatchedVisitCore
- makeMetricTableObjectTableCore
- matchedVisitCoreWholeSkyPlot
- objectTableCoreWholeSkyPlot
- photometricCatalogMatch
- photometricRefCatObjectTract
- plotPropertyMapTract
Expand Down
4 changes: 4 additions & 0 deletions pipelines/LSSTComCamSim/DRP.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ subsets:
subset:
- consolidateHealSparsePropertyMaps
- analyzeObjectTableSurveyCore
- makeMetricTableMatchedVisitCore
- makeMetricTableObjectTableCore
- matchedVisitCoreWholeSkyPlot
- objectTableCoreWholeSkyPlot
description: |
Tasks that should be run as the final step that require global inputs,
and can be run after the 'step3' subset.
Expand Down
1 change: 1 addition & 0 deletions pipelines/_ingredients/HSC/DRP.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ imports:
- $ANALYSIS_TOOLS_DIR/pipelines/coaddQualityCore.yaml
- $ANALYSIS_TOOLS_DIR/pipelines/matchedVisitQualityCore.yaml
- $ANALYSIS_TOOLS_DIR/pipelines/visitQualityCore.yaml
- $ANALYSIS_TOOLS_DIR/pipelines/wholeSkyCore.yaml
tasks:
isolatedStarAssociation:
class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
Expand Down
33 changes: 33 additions & 0 deletions pipelines/_ingredients/LSSTComCamSim/DRP.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ imports:
- $ANALYSIS_TOOLS_DIR/pipelines/diaTractQualityCore.yaml
- $ANALYSIS_TOOLS_DIR/pipelines/matchedVisitQualityCore.yaml
- $ANALYSIS_TOOLS_DIR/pipelines/visitQualityCore.yaml
- $ANALYSIS_TOOLS_DIR/pipelines/wholeSkyCore.yaml
tasks:
fgcmFitCycle:
class: lsst.fgcmcal.fgcmFitCycle.FgcmFitCycleTask
Expand Down Expand Up @@ -91,6 +92,38 @@ tasks:
python: |
from lsst.analysis.tools.atools import *
from lsst.analysis.tools.contexts import *
matchedVisitCoreWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
connections.inputName: "matchedVisitCore_metricsTable"
connections.outputName: "matchedVisitCore_wholeSky"
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [120.0, 305.0]
atools.wholeSkyMetric.yLimits: [-55.0, 10.0]
atools.wholeSkyMetric.bands: ["g", "r", "i"]
atools.wholeSkyMetric.plotKeys: []
atools.wholeSkyMetric.keysWithBand: parameters.matchedVisitCoreKeysWithBand
python: |
from lsst.analysis.tools.atools import *
objectTableCoreWholeSkyPlot:
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
config:
atools.wholeSkyMetric: WholeSkyPlotTool
atools.wholeSkyMetric.xLimits: [120.0, 305.0]
atools.wholeSkyMetric.yLimits: [-55.0, 10.0]
atools.wholeSkyMetric.bands: ["g", "r", "i"]
atools.wholeSkyMetric.plotKeys: [
"wPerpPSFP_wPerp_psfFlux_median",
"wPerpPSFP_wPerp_psfFlux_sigmaMAD",
"skippedDeblenderMetrics_numSkippedPeaks",
"skippedDeblenderMetrics_numSkippedBlends",
"skippedDeblenderMetrics_numBlendParentTooBig",
"skippedDeblenderMetrics_numBlendTooManyPeaks",
"skippedDeblenderMetrics_numBlendTooManyMasked",
]
atools.wholeSkyMetric.keysWithBand: parameters.objectTableCoreKeysWithBand
python: |
from lsst.analysis.tools.atools import *
# These don't actually work now:
photometricMatchPreVisit:
class: lsst.analysis.tools.tasks.photometricCatalogMatch.PhotometricCatalogMatchVisitTask
Expand Down
Loading