Fork me on GitHub

Changeset 52315d4 in git for modules


Ignore:
Timestamp:
Jun 22, 2016, 10:42:37 AM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
18a7403
Parents:
e0f8f99 (diff), f688c89 (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 'dev_01' of github.com:delphes/delphes into dev_01

Location:
modules
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • modules/RunPUPPI.cc

    re0f8f99 r52315d4  
    33#include "PUPPI/RecoObj2.hh"
    44#include "PUPPI/AlgoObj.hh"
    5 //#include "PUPPI/puppiParticle.hh"
    6 //#include "PUPPI/puppiAlgoBin.hh"
     5#include "PUPPI/PuppiContainer.hh"
     6
     7#include "fastjet/PseudoJet.hh"
    78
    89#include "classes/DelphesClasses.h"
     
    1718
    1819using namespace std;
     20using namespace fastjet;
    1921
    2022//------------------------------------------------------------------------------
     
    238240  fPuppi->initialize(puppiInputVector);
    239241  fPuppi->puppiWeights();
    240   std::vector<fastjet::PseudoJet> puppiParticles = fPuppi->puppiParticles();
     242  std::vector<PseudoJet> puppiParticles = fPuppi->puppiParticles();
    241243
    242244  // Loop on final particles
    243   for (std::vector<fastjet::PseudoJet>::iterator it = puppiParticles.begin() ; it != puppiParticles.end() ; it++) {
     245  for (std::vector<PseudoJet>::iterator it = puppiParticles.begin() ; it != puppiParticles.end() ; it++) {
    244246    if(it->user_index() <= int(InputParticles.size())){     
    245247      candidate = static_cast<Candidate *>(InputParticles.at(it->user_index())->Clone());
  • modules/RunPUPPI.h

    re0f8f99 r52315d4  
    33
    44#include "classes/DelphesModule.h"
    5 #include "PUPPI/PuppiContainer.hh"
    65#include <vector>
    76
    87class TObjArray;
    98class TIterator;
    10 
     9class PuppiContainer;
    1110
    1211class RunPUPPI: public DelphesModule {
Note: See TracChangeset for help on using the changeset viewer.