Merge pull request #11 from lsst/tickets/DM-29398

DM-29398: Use new .qgraph file format and API when exporting from ci_hsc_gen3
lsst · Mar 24, 2021 · 1665fac · 1665fac
2 parents 5bb3c8e + 41fb481
commit 1665fac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/bin.src/exportGraphInputs.py b/bin.src/exportGraphInputs.py
@@ -22,9 +22,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import pickle
 import argparse
 from lsst.daf.butler import Butler
+from lsst.pipe.base import QuantumGraph
 
 
 if __name__ == "__main__":
@@ -35,9 +35,7 @@
     args = parser.parse_args()
 
     butler = Butler(args.butler)
-
-    with(open(args.graph, "rb")) as f:
-        graph = pickle.load(f)
+    graph = QuantumGraph.loadUri(args.graph, universe=butler.registry.dimensions)
 
     # dataset_types_to_save = ("brightObjectMask", "ps1_pv3_3pi_20170110",
     #                          "jointcal_photoCalib", "jointcal_wcs", "bias",

diff --git a/bin/rebuild_demo.sh b/bin/rebuild_demo.sh
@@ -33,7 +33,7 @@ butler="${CI_HSC_GEN3_DIR}/DATA"
 pipetask qgraph -p "${PIPE_TASKS_DIR}/pipelines/DRP.yaml#processCcd" \
     --instrument lsst.obs.subaru.HyperSuprimeCam -b "${butler}" \
     -i HSC/calib,HSC/raw/all,HSC/masks,refcats,skymaps \
-    -d "visit=903342 AND detector=10" --output make_graph -q single_ccd_graph.pkl
+    -d "visit=903342 AND detector=10" --output make_graph -q single_ccd_graph.qgraph
 
 # This should specify paths so that export.py can be generic
-python bin.src/exportGraphInputs.py "${butler}" single_ccd_graph.pkl
+python bin.src/exportGraphInputs.py "${butler}" single_ccd_graph.qgraph