Changeset f688c89 in git for modules

Timestamp:

Jun 21, 2016, 4:37:17 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

52315d4

Parents:

04290b1 (diff), 659c7b6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into dev_01

Location:

modules

Files:

• RunPUPPI.cc (modified) (3 diffs)
• RunPUPPI.h (modified) (1 diff)

modules/RunPUPPI.cc

@@ -3 +3 @@
 #include "PUPPI/RecoObj2.hh"
 #include "PUPPI/AlgoObj.hh"
-//#include "PUPPI/puppiParticle.hh"
-//#include "PUPPI/puppiAlgoBin.hh"
+#include "PUPPI/PuppiContainer.hh"
+
+#include "fastjet/PseudoJet.hh"
 
 #include "classes/DelphesClasses.h"
@@ -17 +18 @@
 
 using namespace std;
+using namespace fastjet;
 
 //------------------------------------------------------------------------------
@@ -238 +240 @@
   fPuppi->initialize(puppiInputVector);
   fPuppi->puppiWeights();
-  std::vector<fastjet::PseudoJet> puppiParticles = fPuppi->puppiParticles();
+  std::vector<PseudoJet> puppiParticles = fPuppi->puppiParticles();
 
   // Loop on final particles
-  for (std::vector<fastjet::PseudoJet>::iterator it = puppiParticles.begin() ; it != puppiParticles.end() ; it++) {
+  for (std::vector<PseudoJet>::iterator it = puppiParticles.begin() ; it != puppiParticles.end() ; it++) {
     if(it->user_index() <= int(InputParticles.size())){      
       candidate = static_cast<Candidate *>(InputParticles.at(it->user_index())->Clone());

modules/RunPUPPI.h

@@ -3 +3 @@
 
 #include "classes/DelphesModule.h"
-#include "PUPPI/PuppiContainer.hh"
 #include <vector>
 
 class TObjArray;
 class TIterator;
-
+class PuppiContainer;
 
 class RunPUPPI: public DelphesModule {