Use RA/Dec config column names

lsst · Feb 7, 2022 · 885b67b · 885b67b
1 parent 141fb8f
commit 885b67b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/python/lsst/pipe/tasks/insertFakes.py b/python/lsst/pipe/tasks/insertFakes.py
@@ -1046,8 +1046,8 @@ def trimFakeCat(self, fakeCat, image):
         points.extend(wcs.pixelToSky(corner).getVector() for corner in wideBbox.getCorners())
         polygon = ConvexPolygon(points)
 
-        ras = fakeCat["raJ2000"].values
-        decs = fakeCat["decJ2000"].values
+        ras = fakeCat[self.config.ra_col].values
+        decs = fakeCat[self.config.dec_col].values
 
         isContainedRaDec = polygon.contains(ras, decs)
 

diff --git a/python/lsst/pipe/tasks/matchFakes.py b/python/lsst/pipe/tasks/matchFakes.py
@@ -222,6 +222,7 @@ def composeFakeCat(self, fakeCats, skyMap):
     def _addPixCoords(self, fakeCat, image):
 
         """Add pixel coordinates to the catalog of fakes.
+
         Parameters
         ----------
         fakeCat : `pandas.core.frame.DataFrame`
@@ -233,8 +234,8 @@ def _addPixCoords(self, fakeCat, image):
         fakeCat : `pandas.core.frame.DataFrame`
         """
         wcs = image.getWcs()
-        ras = fakeCat['ra'].values
-        decs = fakeCat['dec'].values
+        ras = fakeCat[self.config.ra_col].values
+        decs = fakeCat[self.config.dec_col].values
         xs, ys = wcs.skyToPixelArray(ras, decs)
         fakeCat["x"] = xs
         fakeCat["y"] = ys
@@ -270,8 +271,8 @@ def _trimFakeCat(self, fakeCat, image):
         points.extend(wcs.pixelToSky(corner).getVector() for corner in wideBbox.getCorners())
         polygon = ConvexPolygon(points)
 
-        ras = fakeCat["raJ2000"].values
-        decs = fakeCat["decJ2000"].values
+        ras = fakeCat[self.config.ra_col].values
+        decs = fakeCat[self.config.dec_col].values
         isContainedRaDec = polygon.contains(ras, decs)
 
         # now use the exact pixel BBox to filter to only fakes that were inserted