Skip to content

Commit

Permalink
Make Gaia DR3 the single frame astrometric refcat
Browse files Browse the repository at this point in the history
  • Loading branch information
cmsaunders committed Sep 15, 2023
1 parent b8c800f commit a840172
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/calibrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class CalibrateConnections(pipeBase.PipelineTaskConnections, dimensions=("instru

astromRefCat = cT.PrerequisiteInput(
doc="Reference catalog to use for astrometry",
name="gaia_dr2_20200414",
name="gaia_dr3_20230707",
storageClass="SimpleCatalog",
dimensions=("skypix",),
deferLoad=True,
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/calibrateImage.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class CalibrateImageConnections(pipeBase.PipelineTaskConnections,

astrometry_ref_cat = connectionTypes.PrerequisiteInput(
doc="Reference catalog to use for astrometric calibration.",
name="gaia_dr2_20200414",
name="gaia_dr3_20230707",
storageClass="SimpleCatalog",
dimensions=("skypix",),
deferLoad=True,
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/processBrightStars.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class ProcessBrightStarsConnections(PipelineTaskConnections, dimensions=("instru
)
refCat = PrerequisiteInput(
doc="Reference catalog that contains bright star positions",
name="gaia_dr2_20200414",
name="gaia_dr3_20230707",
storageClass="SimpleCatalog",
dimensions=("skypix",),
multiple=True,
Expand Down
8 changes: 4 additions & 4 deletions tests/test_calibrateImage.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def setUp(self):
# inputs
butlerTests.addDatasetType(self.repo, "postISRCCD", {"instrument", "exposure", "detector"},
"ExposureF")
butlerTests.addDatasetType(self.repo, "gaia_dr2_20200414", {"htm7"}, "SimpleCatalog")
butlerTests.addDatasetType(self.repo, "gaia_dr3_20230707", {"htm7"}, "SimpleCatalog")
butlerTests.addDatasetType(self.repo, "ps1_pv3_3pi_20170110", {"htm7"}, "SimpleCatalog")

# outputs
Expand Down Expand Up @@ -316,7 +316,7 @@ def setUp(self):
# put empty data
self.butler = butlerTests.makeTestCollection(self.repo)
self.butler.put(afwImage.ExposureF(), "postISRCCD", self.exposure_id)
self.butler.put(afwTable.SimpleCatalog(), "gaia_dr2_20200414", self.htm_id)
self.butler.put(afwTable.SimpleCatalog(), "gaia_dr3_20230707", self.htm_id)
self.butler.put(afwTable.SimpleCatalog(), "ps1_pv3_3pi_20170110", self.htm_id)

def tearDown(self):
Expand Down Expand Up @@ -344,7 +344,7 @@ def test_runQuantum(self):
mock_run = lsst.pipe.base.testUtils.runTestQuantum(task, self.butler, quantum)

# Ensure the reference loaders have been configured.
self.assertEqual(task.astrometry.refObjLoader.name, "gaia_dr2_20200414")
self.assertEqual(task.astrometry.refObjLoader.name, "gaia_dr3_20230707")
self.assertEqual(task.photometry.match.refObjLoader.name, "ps1_pv3_3pi_20170110")
# Check that the proper kwargs are passed to run().
self.assertEqual(mock_run.call_args.kwargs.keys(), {"exposure"})
Expand All @@ -369,7 +369,7 @@ def test_runQuantum_no_optional_outputs(self):
mock_run = lsst.pipe.base.testUtils.runTestQuantum(task, self.butler, quantum)

# Ensure the reference loaders have been configured.
self.assertEqual(task.astrometry.refObjLoader.name, "gaia_dr2_20200414")
self.assertEqual(task.astrometry.refObjLoader.name, "gaia_dr3_20230707")
self.assertEqual(task.photometry.match.refObjLoader.name, "ps1_pv3_3pi_20170110")
# Check that the proper kwargs are passed to run().
self.assertEqual(mock_run.call_args.kwargs.keys(), {"exposure"})
Expand Down

0 comments on commit a840172

Please sign in to comment.