Changeset fb4337d in git

Timestamp:

Jul 24, 2015, 4:21:46 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

7aea88d

Parents:

29f8a06

Message:

use pointers for InputParticles in RunPUPPI

File:

• modules/RunPUPPI.cc (modified) (5 diffs)

modules/RunPUPPI.cc

@@ -131 +131 @@
   fPVItInputArray->Reset();
 
-  std::vector<Candidate> InputParticles;
+  std::vector<Candidate *> InputParticles;
   InputParticles.clear();
 
@@ -141 +141 @@
   // Fill input particles for puppi
   std::vector<RecoObj> puppiInputVector;
+  puppiInputVector.clear();
 
   // Loop on charge track candidate
@@ -177 +178 @@
 
       puppiInputVector.push_back(curRecoObj);
-      InputParticles.push_back(*candidate);
+      InputParticles.push_back(candidate);
   }
 
@@ -207 +208 @@
       }
       puppiInputVector.push_back(curRecoObj);
-      InputParticles.push_back(*candidate);
+      InputParticles.push_back(candidate);
   }
 
@@ -247 +248 @@
   for (std::vector<fastjet::PseudoJet>::iterator it = puppiParticles.begin() ; it != puppiParticles.end() ; it++) {
     if(it->user_index() <= int(InputParticles.size())){      
-      candidate = factory->NewCandidate();
-      candidate = dynamic_cast<Candidate*>(InputParticles.at(it->user_index()).Clone());
-      candidate->Momentum.SetXYZT(it->px(),it->py(),it->pz(),it->e());
+      candidate = static_cast<Candidate *>(InputParticles.at(it->user_index())->Clone());
+      candidate->Momentum.SetPxPyPzE(it->px(),it->py(),it->pz(),it->e());
       fOutputArray->Add(candidate);
       if( puppiInputVector.at(it->user_index()).id == 1 or puppiInputVector.at(it->user_index()).id == 2) fOutputTrackArray->Add(candidate);