Skip to content

Commit d49e000

Browse files
committed
Supply current time for new object radecMjdTai
1 parent 2ca6906 commit d49e000

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

python/lsst/ap/association/testApdb.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -272,18 +272,19 @@ def run(self, visit, detector,
272272
nDiaSources = diaObjects.nDiaSources
273273
self.log.info(f"diaObjects contain {np.min(nDiaSources)} to {np.max(nDiaSources)} diaSources")
274274

275+
dateTime = DateTime.now().toAstropy()
275276
# Associate DiaSources with DiaObjects
276277
associatedDiaSources, newDiaObjects, associatedDiaObjects = self.associateDiaSources(diaSources,
277278
diaObjects,
278279
diaSourcesReal,
279280
diaSourcesBogus,
281+
dateTime,
280282
)
281283
# Merge new and preloaded diaObjects
282284
mergedDiaObjects = self.mergeAssociatedCatalogs(associatedDiaObjects, newDiaObjects)
283285

284286
nObj = len(mergedDiaObjects)
285287
nSrc = len(associatedDiaSources)
286-
dateTime = DateTime.now().toAstropy()
287288
ind = 0
288289
t_write0 = time.time()
289290
# Note that nObj must always be equal to or greater than nSrc
@@ -433,7 +434,7 @@ def simpleMatch(self, diaSourceTable, diaObjects, updateNdiaSources=True):
433434
matchedDiaObjects=diaObjects.loc[matchedDiaObjectInds],
434435
)
435436

436-
def associateDiaSources(self, diaSourceTable, diaObjects, diaSourcesReal, diaSourcesBogus):
437+
def associateDiaSources(self, diaSourceTable, diaObjects, diaSourcesReal, diaSourcesBogus, dateTime):
437438
"""Associate DiaSources with DiaObjects.
438439
439440
Parameters
@@ -458,7 +459,7 @@ def associateDiaSources(self, diaSourceTable, diaObjects, diaSourcesReal, diaSou
458459
toAssociate = []
459460

460461
# Create new DiaObjects from unassociated diaSources.
461-
createResults = self.createNewDiaObjects(assocResults.unAssocDiaSources)
462+
createResults = self.createNewDiaObjects(assocResults.unAssocDiaSources, dateTime)
462463
if len(assocResults.matchedDiaSources) > 0:
463464
toAssociate.append(assocResults.matchedDiaSources)
464465
toAssociate.append(createResults.diaSources)
@@ -483,7 +484,7 @@ def associateDiaSources(self, diaSourceTable, diaObjects, diaSourcesReal, diaSou
483484
inplace=True)
484485
return (associatedDiaSources, createResults.newDiaObjects, assocResults.matchedDiaObjects)
485486

486-
def createNewDiaObjects(self, unAssocDiaSources):
487+
def createNewDiaObjects(self, unAssocDiaSources, dateTime):
487488
"""Loop through the set of DiaSources and create new DiaObjects
488489
for unassociated DiaSources.
489490
@@ -511,7 +512,8 @@ def createNewDiaObjects(self, unAssocDiaSources):
511512
# For this simulation we are using custom diaObjectIds,
512513
# and need to preserve them.
513514
# unAssocDiaSources["diaObjectId"] = unAssocDiaSources["diaSourceId"]
514-
preserveColumns = ["diaObjectId", ]
515+
preserveColumns = ["diaObjectId", "radecMjdTai"]
516+
unAssocDiaSources["radecMjdTai"] = dateTime
515517

516518
# Fill the forced sources for each diaObject with random data
517519
newDiaObjects = fillRandomTable(self.schema, unAssocDiaSources,

0 commit comments

Comments
 (0)