Fork me on GitHub

Changes in / [52315d4:e0f8f99] in git


Ignore:
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • external/PUPPI/PuppiAlgo.cc

    r52315d4 re0f8f99  
     1//#include "FWCore/ParameterSet/interface/ParameterSet.h"
     2//#include "FWCore/PythonParameterSet/interface/MakeParameterSets.h"
    13#include "PuppiAlgo.hh"
     4#include "external/fastjet/internal/base.hh"
    25#include "Math/QuantFuncMathCore.h"
    36#include "Math/SpecFuncMathCore.h"

  • external/PUPPI/PuppiAlgo.hh

    r52315d4 re0f8f99  
    1 #include "fastjet/PseudoJet.hh"
     1#include "external/fastjet/internal/base.hh"
     2#include "external/fastjet/PseudoJet.hh"
    23#include "AlgoObj.hh"
    34#include <vector>

  • external/PUPPI/PuppiContainer.cc

    r52315d4 re0f8f99  
    11#include "PuppiContainer.hh"
    2 #include "fastjet/Selector.hh"
     2#include "external/fastjet/internal/base.hh"
     3#include "external/fastjet/Selector.hh"
     4//#include "external/fastjet/FunctionOfPseudoJet.hh"
    35#include "Math/ProbFunc.h"
    46#include "TMath.h"

  • external/PUPPI/PuppiContainer.hh

    r52315d4 re0f8f99  
    11#include "PuppiAlgo.hh"
    22#include "RecoObj2.hh"
    3 #include "fastjet/PseudoJet.hh"
     3//#include "external/fastjet/internal/base.hh"
     4#include "external/fastjet/PseudoJet.hh"
    45#include <vector>
    56

  • external/PUPPI/puppiCleanContainer.hh

    r52315d4 re0f8f99  
    77#include "PUPPI/puppiAlgoBin.hh"
    88
     9#include "fastjet/internal/base.hh"
    910#include "fastjet/PseudoJet.hh"
    1011#include <algorithm>

  • modules/RunPUPPI.cc

    r52315d4 re0f8f99  
    33#include "PUPPI/RecoObj2.hh"
    44#include "PUPPI/AlgoObj.hh"
    5 #include "PUPPI/PuppiContainer.hh"
    6 
    7 #include "fastjet/PseudoJet.hh"
     5//#include "PUPPI/puppiParticle.hh"
     6//#include "PUPPI/puppiAlgoBin.hh"
    87
    98#include "classes/DelphesClasses.h"
    … …  
    1817
    1918using namespace std;
    20 using namespace fastjet;
    2119
    2220//------------------------------------------------------------------------------
    … …  
    240238  fPuppi->initialize(puppiInputVector);
    241239  fPuppi->puppiWeights();
    242   std::vector<PseudoJet> puppiParticles = fPuppi->puppiParticles();
     240  std::vector<fastjet::PseudoJet> puppiParticles = fPuppi->puppiParticles();
    243241
    244242  // Loop on final particles
    245   for (std::vector<PseudoJet>::iterator it = puppiParticles.begin() ; it != puppiParticles.end() ; it++) {
     243  for (std::vector<fastjet::PseudoJet>::iterator it = puppiParticles.begin() ; it != puppiParticles.end() ; it++) {
    246244    if(it->user_index() <= int(InputParticles.size())){     
    247245      candidate = static_cast<Candidate *>(InputParticles.at(it->user_index())->Clone());

  • modules/RunPUPPI.h

    r52315d4 re0f8f99  
    33
    44#include "classes/DelphesModule.h"
     5#include "PUPPI/PuppiContainer.hh"
    56#include <vector>
    67
    78class TObjArray;
    89class TIterator;
    9 class PuppiContainer;
     10
    1011
    1112class RunPUPPI: public DelphesModule {
Note: See TracChangeset for help on using the changeset viewer.