Skip to content

Commit

Permalink
Revert making pipeline driver a class.
Browse files Browse the repository at this point in the history
This change reduces the conceptual complexity of ap_verify, and
makes the data flow more obvious. Dependencies on the ap_pipe API
are still contained in a separate module, where they can't clutter
up the top-level logic.
  • Loading branch information
kfindeisen committed Aug 31, 2017
1 parent cfafd0a commit 25eb227
Show file tree
Hide file tree
Showing 4 changed files with 340 additions and 419 deletions.
5 changes: 2 additions & 3 deletions python/lsst/ap/verify/ap_verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import lsst.log
from .dataset import Dataset
from .metrics import MetricsParser, check_squash_ready, AutoJob
from .appipe import ApPipeParser, ApPipe
from .pipeline_driver import ApPipeParser, run_ap_pipe
from .measurements import measure_from_metadata


Expand Down Expand Up @@ -158,6 +158,5 @@ def run_ap_verify():

with AutoJob(args) as job:
log.info('Running pipeline...')
pipeline = ApPipe(test_data, output, args)
metadata = pipeline.run(job)
metadata = run_ap_pipe(test_data, output, args, job)
_measure_final_properties(metadata, job)
281 changes: 0 additions & 281 deletions python/lsst/ap/verify/appipe.py

This file was deleted.

0 comments on commit 25eb227

Please sign in to comment.