Merge pull request #825 from lsst/tickets/DM-40110

DM-40110: Make Gaia DR3 the single frame astrometric refcat
lsst · Sep 15, 2023 · 39803aa · 39803aa
2 parents b8c800f + a840172
commit 39803aa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/python/lsst/pipe/tasks/calibrate.py b/python/lsst/pipe/tasks/calibrate.py
@@ -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,

diff --git a/python/lsst/pipe/tasks/calibrateImage.py b/python/lsst/pipe/tasks/calibrateImage.py
@@ -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,

diff --git a/python/lsst/pipe/tasks/processBrightStars.py b/python/lsst/pipe/tasks/processBrightStars.py
@@ -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,

diff --git a/tests/test_calibrateImage.py b/tests/test_calibrateImage.py
@@ -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
@@ -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):
@@ -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"})
@@ -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"})