Skip to content

Commit cdf17bb

Browse files
leeskelvinleeskelvin
committed
Merge branch 'tickets/DM-45080'
2 parents ea42295 + b909e7b commit cdf17bb

7 files changed

Lines changed: 41 additions & 16 deletions

‎pipelines/wholeSkyCore.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ tasks:
7676
makeMetricTableObjectTableCoreRefCatMatch:
7777
class: lsst.analysis.tools.tasks.MakeMetricTableTask
7878
config:
79-
connections.metricBundleName: "objectTable_tract_gaia_dr3_20230707_match_metrics"
79+
connections.metricBundleName: "objectTable_tract_gaia_dr3_20230707_match_astrom_metrics"
8080
python: |
8181
from lsst.analysis.tools.atools import *
8282
objectTableCoreRefCatMatchWholeSkyPlot:
8383
class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
8484
config:
85-
connections.inputName: "objectTable_tract_gaia_dr3_20230707_match_metricsTable"
85+
connections.inputName: "objectTable_tract_gaia_dr3_20230707_match_astrom_metricsTable"
8686
connections.outputName: "objectTableCoreRefCatMatch_wholeSky"
8787
atools.wholeSkyMetric: WholeSkyPlotTool
8888
atools.wholeSkyMetric.plotKeys: []

‎python/lsst/analysis/tools/tasks/astrometricCatalogMatch.py‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,22 @@
3939
from ..tasks.catalogMatch import CatalogMatchConfig, CatalogMatchConnections, CatalogMatchTask
4040

4141

42-
class AstrometricCatalogMatchConfig(CatalogMatchConfig, pipelineConnections=CatalogMatchConnections):
42+
class AstrometricCatalogMatchConnections(
43+
CatalogMatchConnections,
44+
dimensions=("tract", "skymap"),
45+
defaultTemplates={"targetCatalog": "objectTable_tract", "refCatalog": "gaia_dr3_20230707"},
46+
):
47+
matchedCatalog = pipeBase.connectionTypes.Output(
48+
doc="Catalog with matched target and reference objects with separations",
49+
name="{targetCatalog}_{refCatalog}_match_astrom",
50+
storageClass="ArrowAstropy",
51+
dimensions=("tract", "skymap"),
52+
)
53+
54+
55+
class AstrometricCatalogMatchConfig(
56+
CatalogMatchConfig, pipelineConnections=AstrometricCatalogMatchConnections
57+
):
4358
bands = pexConfig.ListField[str](
4459
doc="The bands to persist downstream",
4560
default=["u", "g", "r", "i", "z", "y"],
@@ -114,7 +129,7 @@ class AstrometricCatalogMatchVisitConnections(
114129

115130
matchedCatalog = pipeBase.connectionTypes.Output(
116131
doc="Catalog with matched target and reference objects with separations",
117-
name="{targetCatalog}_{refCatalog}_match",
132+
name="{targetCatalog}_{refCatalog}_match_astrom",
118133
storageClass="ArrowAstropy",
119134
dimensions=("visit",),
120135
)

‎python/lsst/analysis/tools/tasks/photometricCatalogMatch.py‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,22 @@
3333
from ..tasks.catalogMatch import CatalogMatchConfig, CatalogMatchConnections, CatalogMatchTask
3434

3535

36-
class PhotometricCatalogMatchConnections(CatalogMatchConnections):
37-
pass
36+
class PhotometricCatalogMatchConnections(
37+
CatalogMatchConnections,
38+
dimensions=("tract", "skymap"),
39+
defaultTemplates={"targetCatalog": "objectTable_tract", "refCatalog": "ps1_pv3_3pi_20170110"},
40+
):
41+
matchedCatalog = pipeBase.connectionTypes.Output(
42+
doc="Catalog with matched target and reference objects with separations",
43+
name="{targetCatalog}_{refCatalog}_match_photom",
44+
storageClass="ArrowAstropy",
45+
dimensions=("tract", "skymap"),
46+
)
3847

3948

4049
class PhotometricCatalogMatchConfig(
41-
CatalogMatchConfig, pipelineConnections=PhotometricCatalogMatchConnections
50+
CatalogMatchConfig,
51+
pipelineConnections=PhotometricCatalogMatchConnections,
4252
):
4353
def setDefaults(self):
4454
super().setDefaults()
@@ -125,7 +135,7 @@ class PhotometricCatalogMatchVisitConnections(
125135

126136
matchedCatalog = pipeBase.connectionTypes.Output(
127137
doc="Catalog with matched target and reference objects with separations",
128-
name="{targetCatalog}_{refCatalog}_match",
138+
name="{targetCatalog}_{refCatalog}_match_photom",
129139
storageClass="ArrowAstropy",
130140
dimensions=("visit",),
131141
)

‎python/lsst/analysis/tools/tasks/refCatObjectAnalysis.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class RefCatObjectAnalysisConnections(
3434
defaultTemplates={
3535
"targetCatalog": "objectTable_tract",
3636
"refCatalog": "gaia_dr3_20230707",
37-
"outputName": "objectTable_tract_gaia_dr3_20230707_match",
37+
"outputName": "objectTable_tract_gaia_dr3_20230707_match_astrom",
3838
},
3939
):
4040
data = ct.Input(
4141
doc="Tract based object table to load from the butler",
42-
name="{targetCatalog}_{refCatalog}_match",
42+
name="{targetCatalog}_{refCatalog}_match_astrom",
4343
storageClass="ArrowAstropy",
4444
deferLoad=True,
4545
dimensions=("skymap", "tract"),

‎python/lsst/analysis/tools/tasks/refCatObjectPhotometricAnalysis.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class RefCatObjectPhotometricAnalysisConnections(
3434
defaultTemplates={
3535
"targetCatalog": "objectTable_tract",
3636
"refCatalog": "ps1_pv3_3pi_20170110",
37-
"outputName": "objectTable_tract_ps1_pv3_3pi_20170110_match",
37+
"outputName": "objectTable_tract_ps1_pv3_3pi_20170110_match_photom",
3838
},
3939
):
4040
data = ct.Input(
4141
doc="Tract based object table to load from the butler",
42-
name="{targetCatalog}_{refCatalog}_match",
42+
name="{targetCatalog}_{refCatalog}_match_photom",
4343
storageClass="ArrowAstropy",
4444
deferLoad=True,
4545
dimensions=("skymap", "tract"),

‎python/lsst/analysis/tools/tasks/refCatSourceAnalysis.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ class RefCatSourceAnalysisConnections(
3333
defaultTemplates={
3434
"targetCatalog": "sourceTable_visit",
3535
"refCatalog": "gaia_dr3_20230707",
36-
"outputName": "sourceTable_visit_gaia_dr3_20230707_match",
36+
"outputName": "sourceTable_visit_gaia_dr3_20230707_match_astrom",
3737
},
3838
):
3939
data = ct.Input(
4040
doc="Tract based object table to load from the butler",
41-
name="{targetCatalog}_{refCatalog}_match",
41+
name="{targetCatalog}_{refCatalog}_match_astrom",
4242
storageClass="ArrowAstropy",
4343
deferLoad=True,
4444
dimensions=("visit",),

‎python/lsst/analysis/tools/tasks/refCatSourcePhotometricAnalysis.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
class RefCatSourcePhotometricAnalysisConnections(
3131
AnalysisBaseConnections,
3232
dimensions=("visit",),
33-
defaultTemplates={"outputName": "sourceTable_visit_ps1_pv3_3pi_20170110_match"},
33+
defaultTemplates={"outputName": "sourceTable_visit_ps1_pv3_3pi_20170110_match_photom"},
3434
):
3535
data = ct.Input(
3636
doc="Tract based object table to load from the butler",
37-
name="sourceTable_visit_ps1_pv3_3pi_20170110_match",
37+
name="sourceTable_visit_ps1_pv3_3pi_20170110_match_photom",
3838
storageClass="ArrowAstropy",
3939
deferLoad=True,
4040
dimensions=("visit",),

0 commit comments

Comments
 (0)