diff --git a/benchmarks/imaging_ecal/config.yml b/benchmarks/imaging_ecal/config.yml index 796bf2068d7cf3363af5ba8bca3e5106ec9b41bc..992b377d492efb76d90f25177aee5ba7dcd8bc9b 100644 --- a/benchmarks/imaging_ecal/config.yml +++ b/benchmarks/imaging_ecal/config.yml @@ -3,14 +3,14 @@ imaging_ecal_electrons: timeout: 48 hours stage: run script: - - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_electron -p "electron" -n 500 + - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_electron -p "electron" -n 100 imaging_ecal_photons: extends: .rec_benchmark timeout: 48 hours stage: run script: - - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_photon -p "photon" -n 500 + - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_photon -p "photon" -n 100 imaging_ecal_pions: extends: .rec_benchmark @@ -34,7 +34,7 @@ imaging_ecal_energy_scan_e: # - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"' script: - export E_file="sim_output/emcal_barrel_energy_scan_points_${PARTICLE}.txt" - - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 750 -p "${PARTICLE}" -e "${ENERGY}" && echo "${ENERGY}" >> "$E_file" + - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 1000 -p "${PARTICLE}" -e "${ENERGY}" && echo "${ENERGY}" >> "$E_file" parallel: matrix: - ENERGY: ["0.8", "1", "2", "5", "10"] @@ -48,7 +48,7 @@ imaging_ecal_energy_scan_ph: # - if: '$RUN_EXTENDED_RECO_BENCHMARK == "true"' script: - export E_file="sim_output/emcal_barrel_energy_scan_points_${PARTICLE}.txt" - - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 750 -p "${PARTICLE}" -e "${ENERGY}" && echo "${ENERGY}" >> "$E_file" + - bash benchmarks/imaging_ecal/run_emcal_barrel.sh -t emcal_barrel_${PARTICLE}_${ENERGY} -n 1000 -p "${PARTICLE}" -e "${ENERGY}" && echo "${ENERGY}" >> "$E_file" parallel: matrix: - ENERGY: ["0.5", "1", "2", "5", "10"] diff --git a/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx b/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx index 32546bc5ee9e6cef8b2b561c4f626716a63a1d55..879a9f5934bba3cd11dce03d53743f72d0c52a67 100644 --- a/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx +++ b/benchmarks/imaging_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx @@ -222,7 +222,6 @@ std::tuple <double, double, double, double> extract_sampling_fraction_parameters double mean_err = gaus->GetParError(1); double sigma_err = gaus->GetParError(2); save_canvas(c8, "fsamClusterImg", E_label, particle_label); - return std::make_tuple(mean, sigma, mean_err, sigma_err); } { @@ -245,6 +244,7 @@ std::tuple <double, double, double, double> extract_sampling_fraction_parameters double mean_err = gaus->GetParError(1); double sigma_err = gaus->GetParError(2); save_canvas(c7, "fsamClusterScFi", E_label, particle_label); + return std::make_tuple(mean, sigma, mean_err, sigma_err); } }