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.

Sign up for GitHub

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-40110: Make Gaia DR3 the single frame astrometric refcat #825

Merged
merged 1 commit into from
Sep 15, 2023
Merged

DM-40110: Make Gaia DR3 the single frame astrometric refcat #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/calibrate.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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