Skip to content

Commit

Permalink
Fix DiaPipelineConnections.apdbMarker.
Browse files Browse the repository at this point in the history
The internal code used a different naming convention from the
connections declaration, and the storage class was missing.
  • Loading branch information
kfindeisen committed Jun 22, 2020
1 parent 223782c commit df6a0fc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions python/lsst/ap/association/diaPipe.py
Expand Up @@ -85,7 +85,7 @@ class DiaPipelineConnections(pipeBase.PipelineTaskConnections,
doc="Marker dataset storing the configuration of the Apdb for each "
"visit/detector. Used to signal the completion of the pipeline.",
name="apdb_marker",
storageClass="",
storageClass="Config",
dimensions=("instrument", "visit", "detector"),
)

Expand Down Expand Up @@ -246,4 +246,4 @@ def run(self, diaSourceCat, diffIm, exposure, ccdExposureIdBits):
None,
ccdExposureIdBits)

return pipeBase.Struct(apdb_marker=self.config.apdb.value)
return pipeBase.Struct(apdbMarker=self.config.apdb.value)
6 changes: 4 additions & 2 deletions tests/test_diaPipe.py
Expand Up @@ -24,6 +24,7 @@

import lsst.afw.image as afwImage
import lsst.afw.table as afwTable
import lsst.pipe.base as pipeBase
from lsst.utils import getPackageDir
import lsst.utils.tests
from unittest.mock import patch, Mock, DEFAULT
Expand Down Expand Up @@ -106,8 +107,9 @@ def _testRun(self, doPackageAlerts=False):
result = task.run(diaSrc, diffIm, exposure, ccdExposureIdBits)
for subtaskName in subtasksToMock:
getattr(task, subtaskName).run.assert_called_once()
self.assertEqual(result.apdb_marker.db_url, "sqlite://")
self.assertEqual(result.apdb_marker.isolation_level,
pipeBase.testUtils.assertValidOutput(task, result)
self.assertEqual(result.apdbMarker.db_url, "sqlite://")
self.assertEqual(result.apdbMarker.isolation_level,
"READ_UNCOMMITTED")


Expand Down

0 comments on commit df6a0fc

Please sign in to comment.