From 05cadeb331875a464e5cc054608f93c25a0f9e02 Mon Sep 17 00:00:00 2001 From: kduffy Date: Wed, 6 Feb 2019 16:44:54 -0600 Subject: [PATCH 1/2] Changes to make AnalysisTree work with new particleID class. --- icaruscode/Analysis/AnalysisTree_module.cc | 93 +++++++++++++++++----- 1 file changed, 74 insertions(+), 19 deletions(-) diff --git a/icaruscode/Analysis/AnalysisTree_module.cc b/icaruscode/Analysis/AnalysisTree_module.cc index a9d94b7f5..da979c7e5 100644 --- a/icaruscode/Analysis/AnalysisTree_module.cc +++ b/icaruscode/Analysis/AnalysisTree_module.cc @@ -2182,25 +2182,80 @@ void icarus::AnalysisTree::analyze(const art::Event& evt) // find particle ID info art::FindMany fmpid(trackListHandle[iTracker], evt, fParticleIDModuleLabel[iTracker]); if(fmpid.isValid()) { - std::vector pids = fmpid.at(iTrk); - if(pids.size() > 1) { - mf::LogError("AnalysisTree:limits") - << "the " << fTrackModuleLabel[iTracker] << " track #" << iTrk - << " has " << pids.size() - << " set of ParticleID variables. Only one stored in the tree"; - } - for (size_t ipid = 0; ipid < pids.size(); ++ipid){ - if (!pids[ipid]->PlaneID().isValid) continue; - int planenum = pids[ipid]->PlaneID().Plane; - if (planenum<0||planenum>2) continue; - TrackerData.trkpidpdg[iTrk][planenum] = pids[ipid]->Pdg(); - TrackerData.trkpidchi[iTrk][planenum] = pids[ipid]->MinChi2(); - TrackerData.trkpidchipr[iTrk][planenum] = pids[ipid]->Chi2Proton(); - TrackerData.trkpidchika[iTrk][planenum] = pids[ipid]->Chi2Kaon(); - TrackerData.trkpidchipi[iTrk][planenum] = pids[ipid]->Chi2Pion(); - TrackerData.trkpidchimu[iTrk][planenum] = pids[ipid]->Chi2Muon(); - TrackerData.trkpidpida[iTrk][planenum] = pids[ipid]->PIDA(); - } + std::vector pids = fmpid.at(iTrk); + if (pids.size() == 0){ + mf::LogError("AnalysisTree:limits") + << "No track-PID association found for " << fTrackModuleLabel[iTracker] + << " track " << iTrk << ". Not saving particleID information."; + } + // Set dummy values + double pidpdg[3] = {-1,-1,-1}; + double pidchi[3] = {99999.,99999.,99999.}; + for (size_t ipid=0; ipid AlgScoresVec = pids[ipid]->ParticleIDAlgScores(); + + // Loop though AlgScoresVec and find the variables we want + for (size_t i_algscore=0; i_algscore 1) continue; + int planenum = -1; + if (AlgScore.fPlaneMask.test(0)) planenum = 0; + if (AlgScore.fPlaneMask.test(1)) planenum = 1; + if (AlgScore.fPlaneMask.test(2)) planenum = 2; + if (planenum<0 || planenum>2) continue; + + if (AlgScore.fAlgName == "Chi2"){ + if (TMath::Abs(AlgScore.fAssumedPdg) == 13){ // chi2mu + TrackerData.trkpidchimu[iTrk][planenum] = AlgScore.fValue; + if (AlgScore.fValue Date: Thu, 2 Dec 2021 10:40:02 -0600 Subject: [PATCH 2/2] Update AnalysisTree_module.cc. --- icaruscode/Analysis/AnalysisTree_module.cc | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/icaruscode/Analysis/AnalysisTree_module.cc b/icaruscode/Analysis/AnalysisTree_module.cc index 6381ffdb0..1f6279b68 100644 --- a/icaruscode/Analysis/AnalysisTree_module.cc +++ b/icaruscode/Analysis/AnalysisTree_module.cc @@ -2159,8 +2159,15 @@ void icarus::AnalysisTree::analyze(const art::Event& evt) << " track " << iTrk << ". Not saving particleID information."; } // Set dummy values - double pidpdg[3] = {-1,-1,-1}; - double pidchi[3] = {99999.,99999.,99999.}; + double pidpdg[3] = {0,0,0}; + double pidchi[3] = {0.,0.,0.}; + for(size_t planenum=0; planenum<3; ++planenum) { + TrackerData.trkpidchimu[iTrk][planenum] = 0.; + TrackerData.trkpidchipi[iTrk][planenum] = 0.; + TrackerData.trkpidchika[iTrk][planenum] = 0.; + TrackerData.trkpidchipr[iTrk][planenum] = 0.; + TrackerData.trkpidpida[iTrk][planenum] = 0.; + } for (size_t ipid=0; ipid AlgScoresVec = pids[ipid]->ParticleIDAlgScores(); @@ -2186,28 +2193,28 @@ void icarus::AnalysisTree::analyze(const art::Event& evt) if (AlgScore.fAlgName == "Chi2"){ if (TMath::Abs(AlgScore.fAssumedPdg) == 13){ // chi2mu TrackerData.trkpidchimu[iTrk][planenum] = AlgScore.fValue; - if (AlgScore.fValue0.)){ pidchi[planenum] = AlgScore.fValue; pidpdg[planenum] = TMath::Abs(AlgScore.fAssumedPdg); } } else if (TMath::Abs(AlgScore.fAssumedPdg) == 2212){ // chi2pr TrackerData.trkpidchipr[iTrk][planenum] = AlgScore.fValue; - if (AlgScore.fValue0.)){ pidchi[planenum] = AlgScore.fValue; pidpdg[planenum] = TMath::Abs(AlgScore.fAssumedPdg); } } else if (TMath::Abs(AlgScore.fAssumedPdg) == 211){ // chi2pi TrackerData.trkpidchipi[iTrk][planenum] = AlgScore.fValue; - if (AlgScore.fValue0.)){ pidchi[planenum] = AlgScore.fValue; pidpdg[planenum] = TMath::Abs(AlgScore.fAssumedPdg); } } else if (TMath::Abs(AlgScore.fAssumedPdg) == 321){ // chi2ka TrackerData.trkpidchika[iTrk][planenum] = AlgScore.fValue; - if (AlgScore.fValue0.)){ pidchi[planenum] = AlgScore.fValue; pidpdg[planenum] = TMath::Abs(AlgScore.fAssumedPdg); }