diff --git a/pipelines/HSC/DRP-RC2.yaml b/pipelines/HSC/DRP-RC2.yaml index 7c446065..671b7cb6 100644 --- a/pipelines/HSC/DRP-RC2.yaml +++ b/pipelines/HSC/DRP-RC2.yaml @@ -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: @@ -244,6 +281,12 @@ subsets: - analyzeObjectTableCore - analyzeObjectTableSurveyCore - catalogMatchTract + - makeMetricTableMatchedVisitCore + - makeMetricTableObjectTableCore + - makeMetricTableObjectTableCoreRefCatMatch + - matchedVisitCoreWholeSkyPlot + - objectTableCoreWholeSkyPlot + - objectTableCoreRefCatMatchWholeSkyPlot - photometricCatalogMatch - photometricRefCatObjectTract - plotPropertyMapTract diff --git a/pipelines/HSC/DRP-RC2_subset.yaml b/pipelines/HSC/DRP-RC2_subset.yaml index cb30b7cb..c66607d5 100644 --- a/pipelines/HSC/DRP-RC2_subset.yaml +++ b/pipelines/HSC/DRP-RC2_subset.yaml @@ -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: @@ -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: @@ -416,6 +453,12 @@ subsets: - analyzeObjectTableCore - analyzeObjectTableSurveyCore - catalogMatchTract + - makeMetricTableMatchedVisitCore + - makeMetricTableObjectTableCore + - makeMetricTableObjectTableCoreRefCatMatch + - matchedVisitCoreWholeSkyPlot + - objectTableCoreWholeSkyPlot + - objectTableCoreRefCatMatchWholeSkyPlot - photometricCatalogMatch - photometricRefCatObjectTract - plotPropertyMapTract diff --git a/pipelines/HSC/DRP-ci_hsc.yaml b/pipelines/HSC/DRP-ci_hsc.yaml index 5bb3dba4..a564de1a 100644 --- a/pipelines/HSC/DRP-ci_hsc.yaml +++ b/pipelines/HSC/DRP-ci_hsc.yaml @@ -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: @@ -60,6 +85,10 @@ subsets: - analyzeObjectTableSurveyCore - analyzeSourceTableCore - catalogMatchTract + - makeMetricTableMatchedVisitCore + - makeMetricTableObjectTableCore + - matchedVisitCoreWholeSkyPlot + - objectTableCoreWholeSkyPlot - photometricCatalogMatch - photometricRefCatObjectTract - plotPropertyMapTract diff --git a/pipelines/LSSTComCamSim/DRP.yaml b/pipelines/LSSTComCamSim/DRP.yaml index 04892376..f289c1ec 100644 --- a/pipelines/LSSTComCamSim/DRP.yaml +++ b/pipelines/LSSTComCamSim/DRP.yaml @@ -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. diff --git a/pipelines/_ingredients/HSC/DRP.yaml b/pipelines/_ingredients/HSC/DRP.yaml index faccfb4c..9960a4a8 100644 --- a/pipelines/_ingredients/HSC/DRP.yaml +++ b/pipelines/_ingredients/HSC/DRP.yaml @@ -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 diff --git a/pipelines/_ingredients/LSSTComCamSim/DRP.yaml b/pipelines/_ingredients/LSSTComCamSim/DRP.yaml index 0f15d1ca..cd362285 100644 --- a/pipelines/_ingredients/LSSTComCamSim/DRP.yaml +++ b/pipelines/_ingredients/LSSTComCamSim/DRP.yaml @@ -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 @@ -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