diff --git a/clustering/barrel_clusters.sh b/clustering/barrel_clusters.sh index 2d989861c087369ee6394b4ade11fa7b231485b7..e675ce6924714b3eb18fa13fd92a3608ce818bdc 100644 --- a/clustering/barrel_clusters.sh +++ b/clustering/barrel_clusters.sh @@ -56,5 +56,10 @@ mkdir -p results/clustering root -b -q "clustering/scripts/barrel_clusters.cxx(\"${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}\")" -cp topside/${JUGGLER_REC_FILE} results/clustering/. - +root_filesize=$(stat --format=%s "${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}") +if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then + # file must be less than 10 MB to upload + if [[ "${root_filesize}" -lt "10000000" ]] ; then + cp ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE} results/clustering/. + fi +fi diff --git a/clustering/scripts/barrel_clusters.cxx b/clustering/scripts/barrel_clusters.cxx index b756a970021a7627adb1e887112728bfbdb46b68..c86c5eef6f205404538961029213cff63b0aa766 100644 --- a/clustering/scripts/barrel_clusters.cxx +++ b/clustering/scripts/barrel_clusters.cxx @@ -110,13 +110,13 @@ void barrel_clusters(const char* in_fname = "topside/rec_barrel_clusters.root") auto h_theta_thrown = d0.Histo1D({"h_theta_thrown", "; #theta", 100, 30.0, 180.0}, "thrownTheta"); auto h_momentum_thrown = d0.Histo1D({"h_momentum_thrown", "; E [GeV]", 100, 0.0, 30.0}, "thrownMomentum"); auto h_nclusters = d0.Histo1D({"h_nclusters", "; N clusters", 6, 0, 6}, "nclusters"); - auto h_Ecluster = d0.Histo1D({"h_Ecluster", "; cluster E [GeV]", 100, 0, 1}, "Ecluster"); - auto h_Ecluster1 = d1.Histo1D({"h_Ecluster1", "One cluster events; cluster E [GeV]", 100, 0, 30}, "Ecluster"); - auto h_momentum_thrown1 = d1.Histo1D({"h_momentum_thrown", "; E [GeV]", 100, 0.0, 30.0},"thrownMomentum"); + auto h_Ecluster = d0.Histo1D({"h_Ecluster", "; cluster E [GeV]", 100, 0.1, 30}, "Ecluster"); + auto h_Ecluster1 = d1.Histo1D({"h_Ecluster1", "One cluster events; cluster E [GeV]", 100, 0.1, 30}, "Ecluster"); + auto h_momentum_thrown1 = d1.Histo1D({"h_momentum_thrown", "; E [GeV]", 100, 0.1, 30.0},"thrownMomentum"); auto h_delta_E = d0.Histo1D({"h_delta_E", "; #Delta E [GeV]", 100, -3, 3}, "delta_E"); auto h_delta_E_over_E = - d0.Histo1D({"h_delta_E_over_E", "; #frac{E_{thrown}-E_{cluster}}{E_{thrown}} ", 100, -1, 1}, "delta_E_over_E"); + d0.Histo1D({"h_delta_E_over_E", "; #frac{E_{thrown}-E_{cluster}}{E_{thrown}} ", 100, -0.5, 0.5}, "delta_E_over_E"); //auto h_Ecluster2 = d1.Filter("thrownMomentum > 4").Histo1D({"h_Ecluster1", "One cluster events; cluster E [GeV]",100, 0,30},"Ecluster"); //auto h_momentum_thrown2 = d1.Filter("thrownMomentum > 4").Histo1D({"h_momentum_thrown", "; E [GeV]", 100, 0.0, 30.0},"thrownMomentum"); diff --git a/ecal/emcal_electrons.sh b/ecal/emcal_electrons.sh index 8ebe539155e819f6c987f7270585ba07bf415205..132f3fe80f29e20e648a49d12ef4b2378d2621aa 100644 --- a/ecal/emcal_electrons.sh +++ b/ecal/emcal_electrons.sh @@ -107,8 +107,11 @@ fi #paste results/sim_${JUGGLER_FILE_NAME_TAG}.txt results/rec_${JUGGLER_FILE_NAME_TAG}.txt > results/eng_${JUGGLER_FILE_NAME_TAG}.txt #root -b -q "ecal/scripts/read_eng.C(\"results/eng_${JUGGLER_FILE_NAME_TAG}.root\", \"results/eng_${JUGGLER_FILE_NAME_TAG}.txt\")" #root -b -q "ecal/scripts/cal_eng_res.C(\"results/eng_${JUGGLER_FILE_NAME_TAG}.root\")" - +root_filesize=$(stat --format=%s "${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}") if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then -cp ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE} results/. + # file must be less than 10 MB to upload + if [[ "${root_filesize}" -lt "10000000" ]] ; then + cp ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE} results/. + fi fi diff --git a/ecal/emcal_pi0s.sh b/ecal/emcal_pi0s.sh index e64b76a52ce090f5e6a0d894ab44202b253cb6cf..94c6ac08d541b8f4e0dcfbd46c79a475a11a03a7 100644 --- a/ecal/emcal_pi0s.sh +++ b/ecal/emcal_pi0s.sh @@ -84,7 +84,11 @@ if [[ "$?" -ne "0" ]] ; then exit 1 fi +root_filesize=$(stat --format=%s "${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}") if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then -cp ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE} results/. + # file must be less than 10 MB to upload + if [[ "${root_filesize}" -lt "10000000" ]] ; then + cp ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE} results/. + fi fi diff --git a/rich/forward_hadrons.sh b/rich/forward_hadrons.sh index 784a1c34cb315dffbb442beab4fdbe7dceb434a5..c4248ff0746cf8dcfc94d4588426b11c22a02105 100644 --- a/rich/forward_hadrons.sh +++ b/rich/forward_hadrons.sh @@ -51,4 +51,11 @@ ls -l popd # @TODO add analysis scripts +#root_filesize=$(stat --format=%s "${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}") +#if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then +# # file must be less than 10 MB to upload +# if [[ "${root_filesize}" -lt "10000000" ]] ; then +# cp ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE} results/. +# fi +#fi diff --git a/tracking/central_electrons.sh b/tracking/central_electrons.sh index 2aa4eeb7a908c9671f3610f9f2a7e232155eaee7..c3ad2cc99a77343b8bf4035d45b6e305474d9c1f 100644 --- a/tracking/central_electrons.sh +++ b/tracking/central_electrons.sh @@ -75,7 +75,11 @@ if [[ "$?" -ne "0" ]] ; then exit 1 fi +root_filesize=$(stat --format=%s "${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}") if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then -cp ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE} results/. + # file must be less than 10 MB to upload + if [[ "${root_filesize}" -lt "10000000" ]] ; then + cp ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE} results/. + fi fi diff --git a/tracking/scripts/rec_central_electrons.cxx b/tracking/scripts/rec_central_electrons.cxx index 9983c76b0cde926c7e83a1958c01774664a7e39e..fdcb0d6b18913bab627446a3875e00ba3c724228 100644 --- a/tracking/scripts/rec_central_electrons.cxx +++ b/tracking/scripts/rec_central_electrons.cxx @@ -9,37 +9,6 @@ using ROOT::RDataFrame; using namespace ROOT::VecOps; -//namespace edm4hep { -// -//std::vector<float> pt (std::vector<MCParticleData> const& in){ -// std::vector<float> result; -// for (size_t i = 0; i < in.size(); ++i) { -// result.push_back(std::sqrt(in[i].momentum.x * in[i].momentum.x + in[i].momentum.y * in[i].momentum.y)); -// } -// return result; -//} -// -//std::vector<float> eta(std::vector<MCParticleData> const& in){ -// std::vector<float> result; -// ROOT::Math::PxPyPzMVector lv; -// for (size_t i = 0; i < in.size(); ++i) { -// lv.SetCoordinates(in[i].momentum.x, in[i].momentum.y, in[i].momentum.z, in[i].mass); -// result.push_back(lv.Eta()); -// } -// return result; -//} -// -//std::vector<float> cos_theta(std::vector<MCParticleData> const& in){ -// std::vector<float> result; -// ROOT::Math::PxPyPzMVector lv; -// for (size_t i = 0; i < in.size(); ++i) { -// lv.SetCoordinates(in[i].momentum.x, in[i].momentum.y, in[i].momentum.z, in[i].mass); -// result.push_back(cos(lv.Theta())); -// } -// return result; -//} -// -//} auto p_track = [](std::vector<eic::TrackParametersData> const& in) { std::vector<double> result; for (size_t i = 0; i < in.size(); ++i) {