Change new dia object creation behavior.

lsst · Oct 8, 2021 · f049426 · f049426
1 parent d9043cd
commit f049426
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/python/lsst/ap/association/diaPipe.py b/python/lsst/ap/association/diaPipe.py
@@ -499,19 +499,16 @@ def createNewDiaObjects(self, unAssocDiaSources):
               unassociated DiaSources. (`pandas.DataFrame`)
             - ``nNewDiaObjects`` : Number of newly created diaObjects.(`int`)
         """
-        newDiaObjectsList = []
-        for idx, diaSource in unAssocDiaSources.iterrows():
-            newDiaObjectsList.append(
-                self._initialize_dia_object(diaSource["diaSourceId"]))
-        unAssocDiaSources["diaObjectId"] = unAssocDiaSources["diaSourceId"]
-        if len(newDiaObjectsList) > 0:
-            newDiaObjects = pd.DataFrame(data=newDiaObjectsList)
-        else:
+        if len(unAssocDiaSources) == 0:
             tmpObj = self._initialize_dia_object(0)
-            newDiaObjects = pd.DataFrame(data=newDiaObjectsList,
+            newDiaObjects = pd.DataFrame(data=[],
                                          columns=tmpObj.keys())
+        else:
+            newDiaObjects = unAssocDiaSources["diaSourceId"].apply(
+                self._initialize_dia_object)
+            unAssocDiaSources["diaObjectId"] = unAssocDiaSources["diaSourceId"]
         return pipeBase.Struct(diaSources=unAssocDiaSources,
-                               newDiaObjects=pd.DataFrame(data=newDiaObjects),
+                               newDiaObjects=newDiaObjects,
                                nNewDiaObjects=len(newDiaObjects))
 
     def _initialize_dia_object(self, objId):
@@ -550,7 +547,7 @@ def _initialize_dia_object(self, objId):
                           "flags": 0}
         for f in ["u", "g", "r", "i", "z", "y"]:
             new_dia_object["%sPSFluxNdata" % f] = 0
-        return new_dia_object
+        return pd.Series(data=new_dia_object)
 
     def testDataFrameIndex(self, df):
         """Test the sorted DataFrame index for duplicates.