Skip to content

Commit

Permalink
Change pipeline_driver apdb defaults.
Browse files Browse the repository at this point in the history
Debug database config name.

Change name of association time metric.
  • Loading branch information
morriscb committed Dec 23, 2019
1 parent 1c1b25e commit 3511cac
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion config/default_image_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"apPipe:differencer:subtract.subtractExposures": "ip_diffim.ImagePsfMatchTime",
"apPipe:differencer:detection.run": "meas_algorithms.SourceDetectionTime",
"apPipe:differencer:measurement.run": "ip_diffim.DipoleFitTime",
"apPipe:associator.run": "ap_association.AssociationTime",
"apPipe:diaPipe:associator.run": "ap_association.AssociationTime",
}
memoryConfigs = {
"apPipe.runDataRef": "ap_pipe.ApPipeMemory",
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/ap/verify/pipeline_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def _getConfigArguments(workspace):

args = ["--configfile", overridePath]
# ApVerify will use the sqlite hooks for the Apdb.
args.extend(["--config", "apdb.db_url=sqlite:///" + workspace.dbLocation])
args.extend(["--config", "apdb.isolation_level=READ_UNCOMMITTED"])
args.extend(["--config", "diaPipe.apdb.db_url=sqlite:///" + workspace.dbLocation])
args.extend(["--config", "diaPipe.apdb.isolation_level=READ_UNCOMMITTED"])

return args
4 changes: 2 additions & 2 deletions tests/test_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ def testRunApPipeWorkspaceDb(self, mockDb, mockClass):

mockDb.assert_called_once()
cmdLineArgs = self._getCmdLineArgs(mockDb.call_args)
self.assertIn("apdb.db_url=sqlite:///" + self.workspace.dbLocation, cmdLineArgs)
self.assertIn("diaPipe.apdb.db_url=sqlite:///" + self.workspace.dbLocation, cmdLineArgs)

mockParse.assert_called_once()
cmdLineArgs = self._getCmdLineArgs(mockParse.call_args)
self.assertIn("apdb.db_url=sqlite:///" + self.workspace.dbLocation, cmdLineArgs)
self.assertIn("diaPipe.apdb.db_url=sqlite:///" + self.workspace.dbLocation, cmdLineArgs)

@patchApPipe
def testRunApPipeReuse(self, _mockDb, mockClass):
Expand Down

0 comments on commit 3511cac

Please sign in to comment.