Switch to astropy.time in calls to Apdb methods (DM-43509)

APDB interface replaced the use of daf_base.DateTime with astropy Time, this patch updates client code to convert DateTtime to astropy Time when passing arguments to Apdb.
lsst · Mar 27, 2024 · 4065207 · 4065207
1 parent 0542d4b
commit 4065207
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/python/lsst/ap/association/diaPipe.py b/python/lsst/ap/association/diaPipe.py
@@ -529,7 +529,7 @@ def run(self,
         # Store DiaSources, updated DiaObjects, and DiaForcedSources in the
         # Apdb.
         self.apdb.store(
-            DateTime.now(),
+            DateTime.now().toAstropy(),
             diaCalResult.updatedDiaObjects,
             associatedDiaSources,
             diaForcedSources)

diff --git a/python/lsst/ap/association/loadDiaCatalogs.py b/python/lsst/ap/association/loadDiaCatalogs.py
@@ -183,7 +183,7 @@ def loadDiaSources(self, diaObjects, region, dateTime, apdb):
                                                "band",
                                                "diaSourceId"])
         else:
-            diaSources = apdb.getDiaSources(region, diaObjects.loc[:, "diaObjectId"], dateTime)
+            diaSources = apdb.getDiaSources(region, diaObjects.loc[:, "diaObjectId"], dateTime.toAstropy())
 
         diaSources.set_index(["diaObjectId", "band", "diaSourceId"],
                              drop=False,
@@ -231,7 +231,7 @@ def loadDiaForcedSources(self, diaObjects, region, dateTime, apdb):
             diaForcedSources = apdb.getDiaForcedSources(
                 region,
                 diaObjects.loc[:, "diaObjectId"],
-                dateTime)
+                dateTime.toAstropy())
 
         diaForcedSources.set_index(["diaObjectId", "diaForcedSourceId"],
                                    drop=False,

diff --git a/tests/test_loadDiaCatalogs.py b/tests/test_loadDiaCatalogs.py
@@ -80,7 +80,7 @@ def setUp(self):
             self.exposure)
 
         self.dateTime = self.exposure.visitInfo.date
-        self.apdb.store(self.dateTime,
+        self.apdb.store(self.dateTime.toAstropy(),
                         self.diaObjects,
                         self.diaSources,
                         self.diaForcedSources)

diff --git a/tests/test_packageAlerts.py b/tests/test_packageAlerts.py
@@ -62,7 +62,7 @@ def _roundTripThroughApdb(objects, sources, forcedSources, dateTime):
         Set of test DiaSources to round trip.
     forcedSources : `pandas.DataFrame`
         Set of test DiaForcedSources to round trip.
-    dateTime : `lsst.daf.base.DateTime`
+    dateTime : `astropy.time.Time`
         Time for the Apdb.
 
     Returns
@@ -200,7 +200,7 @@ def setUp(self):
             diaObjects,
             diaSourceHistory,
             diaForcedSources,
-            self.exposure.visitInfo.date)
+            self.exposure.visitInfo.date.toAstropy())
         self.diaObjects.replace(to_replace=[None], value=np.nan, inplace=True)
         diaSourceHistory.replace(to_replace=[None], value=np.nan, inplace=True)
         self.diaForcedSources.replace(to_replace=[None], value=np.nan,