Fork me on GitHub

Changeset 9be57d9 in git


Ignore:
Timestamp:
Feb 27, 2015, 1:41:42 PM (10 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
fa33983
Parents:
d5cae2b (diff), 532016b (diff), 76ab6be (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', remote branch 'origin' into mergeCMS

Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rd5cae2b r9be57d9  
    2929OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    3030endif
    31 OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
     31OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
    3232endif
    3333
  • doc/genMakefile.tcl

    rd5cae2b r9be57d9  
    219219OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    220220endif
    221 OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
     221OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
    222222endif
    223223
  • modules/ModulesLinkDef.h

    rd5cae2b r9be57d9  
    5050#include "modules/JetPileUpSubtractor.h"
    5151#include "modules/TrackPileUpSubtractor.h"
     52#include "modules/TaggingParticlesSkimmer.h"
    5253#include "modules/PileUpJetID.h"
    5354#include "modules/ConstituentFilter.h"
     
    8990#pragma link C++ class JetPileUpSubtractor+;
    9091#pragma link C++ class TrackPileUpSubtractor+;
     92#pragma link C++ class TaggingParticlesSkimmer+;
    9193#pragma link C++ class PileUpJetID+;
    9294#pragma link C++ class ConstituentFilter+;
  • modules/TauTagging.cc

    rd5cae2b r9be57d9  
    3333#include "classes/DelphesFactory.h"
    3434#include "classes/DelphesFormula.h"
    35 
    36 #include "ExRootAnalysis/ExRootResult.h"
    37 #include "ExRootAnalysis/ExRootFilter.h"
    38 #include "ExRootAnalysis/ExRootClassifier.h"
    3935
    4036#include "TMath.h"
     
    5349using namespace std;
    5450
    55 //------------------------------------------------------------------------------
    56 
    57 class TauTaggingPartonClassifier : public ExRootClassifier
    58 {
    59 public:
    60 
    61   TauTaggingPartonClassifier(const TObjArray *array);
    62 
    63   Int_t GetCategory(TObject *object);
    64 
    65   Double_t fEtaMax, fPTMin;
    66 
    67   const TObjArray *fParticleInputArray;
    68 };
    6951
    7052//------------------------------------------------------------------------------
     
    7961{
    8062  Candidate *tau = static_cast<Candidate *>(object);
    81   Candidate *daughter = 0;
     63  Candidate *daughter1 = 0;
     64  Candidate *daughter2 = 0;
     65 
    8266  const TLorentzVector &momentum = tau->Momentum;
    83   Int_t pdgCode, i;
     67  Int_t pdgCode, i, j;
    8468
    8569  pdgCode = TMath::Abs(tau->PID);
     
    9882  for(i = tau->D1; i <= tau->D2; ++i)
    9983  {
    100     daughter = static_cast<Candidate *>(fParticleInputArray->At(i));
    101     pdgCode = TMath::Abs(daughter->PID);
    102     if(pdgCode == 11 || pdgCode == 13 || pdgCode == 15 || pdgCode == 24) return -1;
     84    daughter1 = static_cast<Candidate *>(fParticleInputArray->At(i));
     85    pdgCode = TMath::Abs(daughter1->PID);
     86    if(pdgCode == 11 || pdgCode == 13 || pdgCode == 15) return -1;
     87    else if(pdgCode == 24)
     88    {
     89     if(daughter1->D1 < 0) return -1;
     90     for(j = daughter1->D1; j <= daughter1->D2; ++j)
     91     {
     92       daughter2 = static_cast<Candidate*>(fParticleInputArray->At(j));
     93       pdgCode = TMath::Abs(daughter2->PID);
     94       if(pdgCode == 11 || pdgCode == 13) return -1;
     95     }
     96       
     97    }
    10398  }
    10499
  • modules/TauTagging.h

    rd5cae2b r9be57d9  
    3131
    3232#include "classes/DelphesModule.h"
     33#include "ExRootAnalysis/ExRootResult.h"
     34#include "ExRootAnalysis/ExRootFilter.h"
     35#include "ExRootAnalysis/ExRootClassifier.h"
    3336
    3437#include <map>
     
    7679};
    7780
     81
     82//------------------------------------------------------------------------------
     83
     84class TauTaggingPartonClassifier : public ExRootClassifier
     85{
     86public:
     87
     88  TauTaggingPartonClassifier(const TObjArray *array);
     89
     90  Int_t GetCategory(TObject *object);
     91
     92  Double_t fEtaMax, fPTMin;
     93
     94  const TObjArray *fParticleInputArray;
     95};
     96
     97
    7898#endif
Note: See TracChangeset for help on using the changeset viewer.