Merge pull request #74 from DUNE/feature/abooth_run_pandora_qol

`run-pandora` Suggestions from John Back

Author: alexbooth92

run-pandora/run_flow2root.sh

@@ -21,9 +21,13 @@ source $ARCUBE_DIR/util/init.inc.sh
 inName=${ARCUBE_IN_NAME}.${globalIdx}
 inFile=${ARCUBE_OUTDIR_BASE}/run-ndlar-flow/${ARCUBE_IN_NAME}/FLOW/${subDir}/${inName}.FLOW.hdf5
 
+# Is this data or MC?
+isData=1
+[ "${ARCUBE_PANDORA_INPUT_FORMAT}" ==  "SPMC" ] && isData=0
+
 # Convert input HDF5 file to ROOT
 source $ARCUBE_PANDORA_INSTALL/pandora.venv/bin/activate
-python3 $ARCUBE_PANDORA_INSTALL/LArRecoND/ndlarflow/h5_to_root_ndlarflow.py $inFile 0 $tmpOutDir
+run python3 $ARCUBE_PANDORA_INSTALL/LArRecoND/ndlarflow/h5_to_root_ndlarflow.py $inFile $isData $tmpOutDir
 deactivate
 
 # Move ROOT file from tmpOutDir to output directory

run-pandora/run_pandora.sh

@@ -36,7 +36,19 @@ run ${ARCUBE_PANDORA_INSTALL}/LArRecoND/bin/PandoraInterface -i ${ARCUBE_PANDORA
 
 # Move LArRecoND hierarchy analysis ROOT file to output dir
 tmpAnaOut=${tmpRunDir}/LArRecoND.root
+tmpMCHierOut=${tmpRunDir}/MCHierarchy.root
+tmpEvtHierOut=${tmpRunDir}/EventHierarchy.root
+
 anaOutDir=${outDir}/LAR_RECO_ND/${subDir}
 anaOutFile=${anaOutDir}/${outName}.LAR_RECO_ND.root
+mcHierOutDir=${outDir}/MC_HIER/${subDir}
+mcHierOutFile=${mcHierOutDir}/${outName}.MC_HIER.root
+evtHierOutDir=${outDir}/EVT_HIER/${subDir}
+evtHierOutFile=${evtHierOutDir}/${outName}.EVT_HIER.root
+
 mkdir -p ${anaOutDir}
 mv "${tmpAnaOut}" "${anaOutFile}"
+mkdir -p ${mcHierOutDir}
+mv "${tmpMCHierOut}" "${mcHierOutFile}"
+mkdir -p ${evtHierOutDir}
+mv "${tmpEvtHierOut}" "${evtHierOutFile}"