Fork me on GitHub

Changes in / [04290b1:f688c89] in git


Ignore:
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • external/PUPPI/PuppiAlgo.cc

    r04290b1 rf688c89  
    1 //#include "FWCore/ParameterSet/interface/ParameterSet.h"
    2 //#include "FWCore/PythonParameterSet/interface/MakeParameterSets.h"
    31#include "PuppiAlgo.hh"
    4 #include "external/fastjet/internal/base.hh"
    52#include "Math/QuantFuncMathCore.h"
    63#include "Math/SpecFuncMathCore.h"

  • external/PUPPI/PuppiAlgo.hh

    r04290b1 rf688c89  
    1 #include "external/fastjet/internal/base.hh"
    2 #include "external/fastjet/PseudoJet.hh"
     1#include "fastjet/PseudoJet.hh"
    32#include "AlgoObj.hh"
    43#include <vector>

  • external/PUPPI/PuppiContainer.cc

    r04290b1 rf688c89  
    11#include "PuppiContainer.hh"
    2 #include "external/fastjet/internal/base.hh"
    3 #include "external/fastjet/Selector.hh"
    4 //#include "external/fastjet/FunctionOfPseudoJet.hh"
     2#include "fastjet/Selector.hh"
    53#include "Math/ProbFunc.h"
    64#include "TMath.h"

  • external/PUPPI/PuppiContainer.hh

    r04290b1 rf688c89  
    11#include "PuppiAlgo.hh"
    22#include "RecoObj2.hh"
    3 //#include "external/fastjet/internal/base.hh"
    4 #include "external/fastjet/PseudoJet.hh"
     3#include "fastjet/PseudoJet.hh"
    54#include <vector>
    65

  • external/PUPPI/puppiCleanContainer.hh

    r04290b1 rf688c89  
    77#include "PUPPI/puppiAlgoBin.hh"
    88
    9 #include "fastjet/internal/base.hh"
    109#include "fastjet/PseudoJet.hh"
    1110#include <algorithm>

  • modules/RunPUPPI.cc

    r04290b1 rf688c89  
    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

    r04290b1 rf688c89  
    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.