Add number of objects loaded to loadDiaCatalogs logs.

lsst · Sep 25, 2024 · 66c279a · 66c279a
1 parent 09f8d94
commit 66c279a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/python/lsst/ap/association/diaPipe.py b/python/lsst/ap/association/diaPipe.py
@@ -459,6 +459,7 @@ def run(self,
             diaObjects, _ = self.purgeDiaObjects(diffIm.getBBox(), diffIm.getWcs(), preloadedDiaObjects,
                                                  buffer=self.config.imagePixelMargin)
         else:
+            self.log.info("Preloaded DiaObject table is empty.")
             diaObjects = preloadedDiaObjects
 
         # Associate DiaSources with DiaObjects

diff --git a/python/lsst/ap/association/loadDiaCatalogs.py b/python/lsst/ap/association/loadDiaCatalogs.py
@@ -220,7 +220,6 @@ def loadDiaObjects(self, region, schema):
             DiaObjects loaded from the Apdb that are within the area defined
             by ``pixelRanges``.
         """
-        self.log.info("Loading DiaObjects")
         diaObjects = self.apdb.getDiaObjects(region)
 
         diaObjects.set_index("diaObjectId", drop=False, inplace=True)
@@ -230,6 +229,7 @@ def loadDiaObjects(self, region, schema):
                 "downstream pipeline issues. Dropping duplicated rows")
             # Drop duplicates via index and keep the first appearance.
             diaObjects = diaObjects.groupby(diaObjects.index).first()
+        self.log.info("Loaded %i DiaObjects", len(diaObjects))
 
         return convertTableToSdmSchema(schema, diaObjects, tableName="DiaObject")
 
@@ -258,8 +258,6 @@ def loadDiaSources(self, diaObjects, region, dateTime, schema):
             DiaSources loaded from the Apdb that are within the area defined
             by ``pixelRange`` and associated with ``diaObjects``.
         """
-        self.log.info("Loading DiaSources")
-
         diaSources = self.apdb.getDiaSources(region, diaObjects.loc[:, "diaObjectId"], dateTime)
 
         diaSources.set_index(["diaObjectId", "band", "diaSourceId"],
@@ -275,6 +273,7 @@ def loadDiaSources(self, diaObjects, region, dateTime, schema):
             diaSources.set_index(["diaObjectId", "band", "diaSourceId"],
                                  drop=False,
                                  inplace=True)
+        self.log.info("Loaded %i DiaSources", len(diaSources))
 
         return convertTableToSdmSchema(schema, diaSources, tableName="DiaSource")
 
@@ -299,7 +298,6 @@ def loadDiaForcedSources(self, diaObjects, region, dateTime, schema):
             DiaObjects loaded from the Apdb that are within the area defined
             by ``pixelRanges``.
         """
-        self.log.info("Loading DiaForcedSources")
 
         if len(diaObjects) == 0:
             # If no diaObjects are available return an empty DataFrame with
@@ -326,5 +324,7 @@ def loadDiaForcedSources(self, diaObjects, region, dateTime, schema):
             diaForcedSources.set_index(["diaObjectId", "diaForcedSourceId"],
                                        drop=False,
                                        inplace=True)
+        nVisits = 0 if diaForcedSources.empty else len(set(diaForcedSources["visit"]))
+        self.log.info("Loaded %i DiaForcedSources from %i visits", len(diaForcedSources), nVisits)
 
         return convertTableToSdmSchema(schema, diaForcedSources, tableName="DiaForcedSource")