@@ -272,18 +272,19 @@ def run(self, visit, detector,
272
272
nDiaSources = diaObjects .nDiaSources
273
273
self .log .info (f"diaObjects contain { np .min (nDiaSources )} to { np .max (nDiaSources )} diaSources" )
274
274
275
+ dateTime = DateTime .now ().toAstropy ()
275
276
# Associate DiaSources with DiaObjects
276
277
associatedDiaSources , newDiaObjects , associatedDiaObjects = self .associateDiaSources (diaSources ,
277
278
diaObjects ,
278
279
diaSourcesReal ,
279
280
diaSourcesBogus ,
281
+ dateTime ,
280
282
)
281
283
# Merge new and preloaded diaObjects
282
284
mergedDiaObjects = self .mergeAssociatedCatalogs (associatedDiaObjects , newDiaObjects )
283
285
284
286
nObj = len (mergedDiaObjects )
285
287
nSrc = len (associatedDiaSources )
286
- dateTime = DateTime .now ().toAstropy ()
287
288
ind = 0
288
289
t_write0 = time .time ()
289
290
# Note that nObj must always be equal to or greater than nSrc
@@ -433,7 +434,7 @@ def simpleMatch(self, diaSourceTable, diaObjects, updateNdiaSources=True):
433
434
matchedDiaObjects = diaObjects .loc [matchedDiaObjectInds ],
434
435
)
435
436
436
- def associateDiaSources (self , diaSourceTable , diaObjects , diaSourcesReal , diaSourcesBogus ):
437
+ def associateDiaSources (self , diaSourceTable , diaObjects , diaSourcesReal , diaSourcesBogus , dateTime ):
437
438
"""Associate DiaSources with DiaObjects.
438
439
439
440
Parameters
@@ -458,7 +459,7 @@ def associateDiaSources(self, diaSourceTable, diaObjects, diaSourcesReal, diaSou
458
459
toAssociate = []
459
460
460
461
# Create new DiaObjects from unassociated diaSources.
461
- createResults = self .createNewDiaObjects (assocResults .unAssocDiaSources )
462
+ createResults = self .createNewDiaObjects (assocResults .unAssocDiaSources , dateTime )
462
463
if len (assocResults .matchedDiaSources ) > 0 :
463
464
toAssociate .append (assocResults .matchedDiaSources )
464
465
toAssociate .append (createResults .diaSources )
@@ -483,7 +484,7 @@ def associateDiaSources(self, diaSourceTable, diaObjects, diaSourcesReal, diaSou
483
484
inplace = True )
484
485
return (associatedDiaSources , createResults .newDiaObjects , assocResults .matchedDiaObjects )
485
486
486
- def createNewDiaObjects (self , unAssocDiaSources ):
487
+ def createNewDiaObjects (self , unAssocDiaSources , dateTime ):
487
488
"""Loop through the set of DiaSources and create new DiaObjects
488
489
for unassociated DiaSources.
489
490
@@ -511,7 +512,8 @@ def createNewDiaObjects(self, unAssocDiaSources):
511
512
# For this simulation we are using custom diaObjectIds,
512
513
# and need to preserve them.
513
514
# unAssocDiaSources["diaObjectId"] = unAssocDiaSources["diaSourceId"]
514
- preserveColumns = ["diaObjectId" , ]
515
+ preserveColumns = ["diaObjectId" , "radecMjdTai" ]
516
+ unAssocDiaSources ["radecMjdTai" ] = dateTime
515
517
516
518
# Fill the forced sources for each diaObject with random data
517
519
newDiaObjects = fillRandomTable (self .schema , unAssocDiaSources ,
0 commit comments