diff --git a/TrackRecon.C b/TrackRecon.C index 3eefc51..df4c67a 100644 --- a/TrackRecon.C +++ b/TrackRecon.C @@ -45,9 +45,9 @@ bool process_alpha_proton_scattering = false, doPCSX3ClusterAnalysis = true, doPCQQQClusterAnalysis = true, doOldAnalysis = false, - BenchMark = true, + BenchMark = false, onwire_analysis = true, - diagnostic_eplots = true, + diagnostic_eplots = false, diagnostic_tplots = true, reactiondata = false, doPCEnergyCalibration = false, @@ -3999,8 +3999,10 @@ static void reaction_ax_core(HistPlotter *plotter, const std::vector &Si_ plotter->Fill1D(rx + "_pczfix" + sfx, 600, -300, 300, pcz_fix, pmlabel); plotter->Fill1D(rx + "_Ex_from" + ejtag + sfx, 400, -20, 20, Ex, pmlabel); plotter->Fill2D(rx + "_Ef_vs_theta" + ejtag + sfx, 100, 0, 180, 800, 0, ef_max, theta * 180 / M_PI, Efix, pmlabel); + plotter->Fill2D(rx + "_Ex_vs_theta" + ejtag + sfx, 100, 0, 180, 800, -20, 20, theta * 180 / M_PI, Ex, pmlabel); plotter->Fill1D(rx + "_VertexReconZ" + sfx, 800, -400, 400, vertex_z, pmlabel); plotter->Fill2D(rx + "_VertexReconZ_vs_Ef" + ejtag + sfx, 800, -400, 400, 800, 0, ef_max, vertex_z, Efix, pmlabel); + plotter->Fill2D(rx + "_VertexReconZ_vs_Ex" + ejtag + sfx, 800, -400, 400, 800, -20, 20, vertex_z, Ex, pmlabel); // Gas segmentation validation PCPath pp = pcPath(r_rhoMin_fix, sievent.pos); @@ -4015,6 +4017,7 @@ static void reaction_ax_core(HistPlotter *plotter, const std::vector &Si_ { plotter->Fill1D(rx + "_Ex_from" + ejtag + "_" + topo + sfx, 400, -20, 20, Ex, pmlabel); plotter->Fill2D(rx + "_VertexReconZ_vs_Ef" + ejtag + "_" + topo + sfx, 800, -400, 400, 800, 0, ef_max, vertex_z, Efix, pmlabel); + plotter->Fill2D(rx + "_VertexReconZ_vs_Ex" + ejtag + "_" + topo + sfx, 800, -400, 400, 800, -20, 20, vertex_z, Ex, pmlabel); } } } diff --git a/run_27Al.sh b/run_27Al.sh index 568fc0b..4143c4e 100644 --- a/run_27Al.sh +++ b/run_27Al.sh @@ -38,12 +38,12 @@ process_run() { export -f process_run echo "Starting parallel processing..." +time parallel --bar -j 6 process_run ::: {24..41} time parallel --bar -j 8 process_run ::: {50..59} -time parallel --bar -j 4 process_run ::: 62 63 66 67 68 -time parallel --bar -j 1 process_run ::: 73 -time parallel --bar -j 1 process_run ::: 74 -# time parallel --bar -j 1 process_run ::: 68 -time parallel --bar -j 4 process_run ::: {78..89} +# time parallel --bar -j 4 process_run ::: 62 63 66 67 68 +# time parallel --bar -j 1 process_run ::: 73 +# time parallel --bar -j 1 process_run ::: 74 +# time parallel --bar -j 4 process_run ::: {78..89} echo "Merging files..." hadd -k -j 4 Output_27Al/output_27Al.root Output_27Al/results_run*.root diff --git a/run_tr.sh b/run_tr.sh index 906a130..a35a876 100644 --- a/run_tr.sh +++ b/run_tr.sh @@ -101,8 +101,8 @@ if [[ 1 -eq 1 ]]; then echo "Starting parallel processing for 27Al proton runs..." # process_run 18 - # parallel --bar -j 8 process_run ::: 15 {17..22} - parallel --bar -j 8 process_run ::: {17..22} + parallel --bar -j 8 process_run ::: 15 {17..22} + # parallel --bar -j 8 process_run ::: {17..22} hadd -j 4 -k ${OUT_DIR}/Al_protons.root ${OUT_DIR}/results_run0{15..22}.root unset CATHODE_GAIN # exit