Decompose consdb polygons at the start.

Author: erykoff

decasu/lsst_wcs_consdb.py

@@ -101,6 +101,14 @@ def __init__(self, config, dbstring, bands, compute_pixels=True):
         db_table["dec_center"] = np.zeros(len(db_table))
         db_table["decasu_lst"] = np.zeros(len(db_table))
         db_table["skyvar"] = db_table["sky_noise"]**2.
+        db_table["ra_poly_0"] = np.zeros(len(db_table))
+        db_table["ra_poly_1"] = np.zeros(len(db_table))
+        db_table["ra_poly_2"] = np.zeros(len(db_table))
+        db_table["ra_poly_3"] = np.zeros(len(db_table))
+        db_table["dec_poly_0"] = np.zeros(len(db_table))
+        db_table["dec_poly_1"] = np.zeros(len(db_table))
+        db_table["dec_poly_2"] = np.zeros(len(db_table))
+        db_table["dec_poly_3"] = np.zeros(len(db_table))
 
         print("Computing local sidereal time...")
         loc = EarthLocation(lat=config.latitude*units.degree,
@@ -144,12 +152,20 @@ def __call__(self, row):
         region_str = self.table["s_region"][row]
 
         region = lsst.sphgeom.Region.from_ivoa_pos("".join(region_str.split("ICRS")).upper())
+        verts = [lsst.sphgeom.LonLat(vert) for vert in region.getVertices()]
+        ra = np.asarray([v.getLon().asDegrees() for v in verts])
+        dec = np.asarray([v.getLat().asDegrees() for v in verts])
+
         centroid = lsst.sphgeom.LonLat(region.getCentroid())
         center = [centroid.getLon().asDegrees(), centroid.getLat().asDegrees()]
 
         self.table["ra_center"][row] = center[0]
         self.table["dec_center"][row] = center[1]
 
+        for i in range(4):
+            self.table[f"ra_poly_{i}"][row] = ra[i]
+            self.table[f"dec_poly_{i}"][row] = dec[i]
+
         if self.compute_pixels:
             vertices = np.asarray([[v.x(), v.y(), v.z()] for v in region.getVertices()])
             pixels = hpg.query_polygon_vec(self.config.nside_run, vertices, inclusive=True, fact=16)

decasu/region_mapper.py

@@ -500,20 +500,9 @@ def build_region_input_map(self, indices, tilename=None, hpix=None):
             else:
                 # Don't use the WCS and use the bounding box specified in the table.
                 # This is only possible with DECam 1-amp mode or consdb.
-                if "s_region" in dg.table.dtype.names:
-                    import lsst.sphgeom
-
-                    region = lsst.sphgeom.Region.from_ivoa_pos(
-                        "".join(dg.table["s_region"][ind].split("ICRS")).upper(),
-                    )
-                    verts = [lsst.sphgeom.LonLat(vert) for vert in region.getVertices()]
-                    ra = np.asarray([v.getLon().asDegrees() for v in verts])
-                    dec = np.asarray([v.getLat().asDegrees() for v in verts])
-                    poly = healsparse.Polygon(ra=ra, dec=dec, value=[bit])
-                else:
-                    ra = np.array([dg.table[field][ind] for field in self.config.ra_corner_fields])
-                    dec = np.array([dg.table[field][ind] for field in self.config.dec_corner_fields])
-                    poly = healsparse.Polygon(ra=ra, dec=dec, value=[bit])
+                ra = np.array([dg.table[field][ind] for field in self.config.ra_corner_fields])
+                dec = np.array([dg.table[field][ind] for field in self.config.dec_corner_fields])
+                poly = healsparse.Polygon(ra=ra, dec=dec, value=[bit])
 
             # Check if we have additional masking
             if (dg.streak_table is not None or dg.bleed_table is not None or