From a6db2db9af1764d14e62823ef70b72cecb585216 Mon Sep 17 00:00:00 2001 From: Savannah Rose Shively <sshively@lxplus760.cern.ch> Date: Wed, 18 Jan 2023 17:11:49 +0100 Subject: [PATCH] move things to the correct loop. big sads. --- .../PairVertex/scripts/PairVertexReader.py | 2 +- .../PairVertex/src/PairVertexAlg.cxx | 35 +++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Tracker/TrackerRecAlgs/PairVertex/scripts/PairVertexReader.py b/Tracker/TrackerRecAlgs/PairVertex/scripts/PairVertexReader.py index 7bb21a7e..f855b860 100644 --- a/Tracker/TrackerRecAlgs/PairVertex/scripts/PairVertexReader.py +++ b/Tracker/TrackerRecAlgs/PairVertex/scripts/PairVertexReader.py @@ -381,7 +381,7 @@ def GeneralPlotter(arrDict,dcuts=[],lcuts=[],showplot=True,savefig=False): #EXECUTE if __name__ == "__main__": - DP_fnames=['Ntuple_Amm_316MeV_2Em6_']# Ntuple_Aee_10MeV_1Em5_ Ntuple_Amm_316MeV_2Em6_ Ntuple_Aee_10MeV_1Em4_ Ntuple_Aee_100MeV_1Em5_ + DP_fnames=['Ntuple_Aee_10MeV_1Em4_']# Ntuple_Aee_10MeV_1Em5_ Ntuple_Aee_100MeV_1Em5_ Ntuple_Amm_316MeV_2Em6_ for f in DP_fnames: user_input=f t = TChain("events") diff --git a/Tracker/TrackerRecAlgs/PairVertex/src/PairVertexAlg.cxx b/Tracker/TrackerRecAlgs/PairVertex/src/PairVertexAlg.cxx index f923da18..284e3cb1 100644 --- a/Tracker/TrackerRecAlgs/PairVertex/src/PairVertexAlg.cxx +++ b/Tracker/TrackerRecAlgs/PairVertex/src/PairVertexAlg.cxx @@ -447,7 +447,7 @@ StatusCode PairVertexAlg::execute(const EventContext &ctx) const //loop over all clusters if (clusterContainer->size()>0) { - for (auto collection : *clusterContainer) + for (auto collection : *clusterContainer) // { Identifier id = collection->identify(); int station = m_idHelper->station(id); @@ -489,25 +489,24 @@ StatusCode PairVertexAlg::execute(const EventContext &ctx) const if (pdgID<0){TotalEnergyDeposited_daughterPos+=edeposit;} } - } - m_clusterETotPos.push_back(TotalEnergyDeposited_daughterPos); - m_clusterETotNeg.push_back(TotalEnergyDeposited_daughterNeg); - m_clusterETot.push_back(TotalEnergyDeposited); - m_clusterLocation.push_back(clusterLocation); - m_clusterIsDaughter.push_back(isDaughter); - if (TotalEnergyDeposited>0) - { - m_clusterEFracPos.push_back(TotalEnergyDeposited_daughterPos/TotalEnergyDeposited); - m_clusterEFracNeg.push_back(TotalEnergyDeposited_daughterNeg/TotalEnergyDeposited); - } - else - { - m_clusterEFracPos.push_back(NaN); - m_clusterEFracNeg.push_back(NaN); - } - + } } } + m_clusterETotPos.push_back(TotalEnergyDeposited_daughterPos); + m_clusterETotNeg.push_back(TotalEnergyDeposited_daughterNeg); + m_clusterETot.push_back(TotalEnergyDeposited); + m_clusterLocation.push_back(clusterLocation); + m_clusterIsDaughter.push_back(isDaughter); + if (TotalEnergyDeposited>0) + { + m_clusterEFracPos.push_back(TotalEnergyDeposited_daughterPos/TotalEnergyDeposited); + m_clusterEFracNeg.push_back(TotalEnergyDeposited_daughterNeg/TotalEnergyDeposited); + } + else + { + m_clusterEFracPos.push_back(NaN); + m_clusterEFracNeg.push_back(NaN); + } clustercount++; } m_clusterCount=clustercount; -- GitLab