Revert making pipeline driver a class.

This change reduces the conceptual complexity of ap_verify, and makes the data flow more obvious.
lsst · Aug 24, 2017 · a9e032f · a9e032f
1 parent ed73a1f
commit a9e032f
Show file tree

Hide file tree

Showing 4 changed files with 341 additions and 419 deletions.
diff --git a/python/lsst/ap/verify/ap_verify.py b/python/lsst/ap/verify/ap_verify.py
@@ -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
 
 
@@ -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)
diff --git a/python/lsst/ap/verify/appipe.py b/python/lsst/ap/verify/appipe.py