Skip to content
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

Jump to bottom

DM-22741: Remove ap_association subtasks from ap_pipe. Change to single DiaPipelineTask subtask. #80

Merged
merged 1 commit into from
Jan 2, 2020
Merged

DM-22741: Remove ap_association subtasks from ap_pipe. Change to single DiaPipelineTask subtask. #80

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/default_image_metrics.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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