Skip to content

DM-49071: Do not save zero length diaSource catalogs #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fred3m merged 1 commit into from
Feb 27, 2025
Merged

DM-49071: Do not save zero length diaSource catalogs #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion python/lsst/ip/diffim/detectAndMeasure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,11 @@ def processResults(self, science, matchedTemplate, difference, sources, idFactor

measurementResults = pipeBase.Struct(
subtractedMeasuredExposure=difference,
diaSources=diaSources,
)

if len(diaSources) > 0:
measurementResults.diaSources = diaSources

Copy link
Member

@arunkannawadi arunkannawadi Feb 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed the conversation happening in real time (I was dropping off someone at the airport) but my first thought here is that this is going to get cumbersome in the long run. But I see Jim has approved (thanks Jim) and I need to catch up on the thread before I have strong opinions.

if self.config.doMaskStreaks and self.config.writeStreakInfo:
measurementResults.mergeItems(streakInfo, 'maskedStreaks')

Expand Down
22 changes: 12 additions & 10 deletions tests/test_detectAndMeasure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,14 +483,15 @@ def _detection_wrapper(setFlags=True):
goodSrcFlags = _checkMask(difference.mask, transientSources, excludeMaskPlanes)
if setFlags:
self.assertEqual(np.sum(~goodSrcFlags), nBad)
self.assertFalse(hasattr(output, "diaSources"))
else:
self.assertEqual(np.sum(~goodSrcFlags), 0)
for diaSource, goodSrcFlag in zip(output.diaSources, goodSrcFlags):
if ~goodSrcFlag:
with self.assertRaises(AssertionError):
for diaSource, goodSrcFlag in zip(output.diaSources, goodSrcFlags):
if ~goodSrcFlag:
with self.assertRaises(AssertionError):
self._check_diaSource(transientSources, diaSource, refIds=refIds)
else:
self._check_diaSource(transientSources, diaSource, refIds=refIds)
else:
self._check_diaSource(transientSources, diaSource, refIds=refIds)
_detection_wrapper(setFlags=False)
_detection_wrapper(setFlags=True)

Expand Down Expand Up @@ -917,14 +918,15 @@ def _detection_wrapper(setFlags=True):
goodSrcFlags = subtractTask._checkMask(difference.mask, transientSources, excludeMaskPlanes)
if setFlags:
self.assertEqual(np.sum(~goodSrcFlags), nBad)
self.assertFalse(hasattr(output, "diaSources"))
else:
self.assertEqual(np.sum(~goodSrcFlags), 0)
for diaSource, goodSrcFlag in zip(output.diaSources, goodSrcFlags):
if ~goodSrcFlag:
with self.assertRaises(AssertionError):
for diaSource, goodSrcFlag in zip(output.diaSources, goodSrcFlags):
if ~goodSrcFlag:
with self.assertRaises(AssertionError):
self._check_diaSource(transientSources, diaSource, refIds=refIds)
else:
self._check_diaSource(transientSources, diaSource, refIds=refIds)
else:
self._check_diaSource(transientSources, diaSource, refIds=refIds)
_detection_wrapper(setFlags=False)
_detection_wrapper(setFlags=True)

Expand Down