Fork me on GitHub

Changeset edf10ba in git


Ignore:
Timestamp:
Jun 16, 2015, 12:18:17 PM (9 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
9040259
Parents:
8707eeb
Message:

add JetFlavourAssociation

Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r8707eeb redf10ba  
    339339        modules/Hector.h \
    340340        modules/RunPUPPI.h \
     341        modules/JetFlavourAssociation.h \
    341342        modules/ExampleModule.h
    342343ModulesDict$(PcmSuf): \
    … …  
    657658        external/ExRootAnalysis/ExRootFilter.h \
    658659        external/ExRootAnalysis/ExRootClassifier.h
     660tmp/modules/JetFlavourAssociation.$(ObjSuf): \
     661        modules/JetFlavourAssociation.$(SrcSuf) \
     662        modules/JetFlavourAssociation.h \
     663        classes/DelphesClasses.h \
     664        classes/DelphesFactory.h \
     665        classes/DelphesFormula.h \
     666        external/ExRootAnalysis/ExRootResult.h \
     667        external/ExRootAnalysis/ExRootFilter.h \
     668        external/ExRootAnalysis/ExRootClassifier.h
    659669tmp/modules/JetPileUpSubtractor.$(ObjSuf): \
    660670        modules/JetPileUpSubtractor.$(SrcSuf) \
    … …  
    899909        tmp/modules/ImpactParameterSmearing.$(ObjSuf) \
    900910        tmp/modules/Isolation.$(ObjSuf) \
     911        tmp/modules/JetFlavourAssociation.$(ObjSuf) \
    901912        tmp/modules/JetPileUpSubtractor.$(ObjSuf) \
    902913        tmp/modules/LeptonDressing.$(ObjSuf) \
    … …  
    17511762        @touch $@
    17521763
     1764modules/JetFlavourAssociation.h: \
     1765        classes/DelphesModule.h \
     1766        classes/DelphesClasses.h
     1767        @touch $@
     1768
    17531769modules/TrackCountingBTagging.h: \
    17541770        classes/DelphesModule.h

  • classes/DelphesClasses.cc

    r8707eeb redf10ba  
    121121  Charge(0), Mass(0.0),
    122122  IsPU(0), IsRecoPU(0), IsConstituent(0),
    123   BTag(0), TauTag(0), Eem(0.0), Ehad(0.0),
     123  BTag(0), BTagAlgo(0), BTagDefault(0), BTagPhysics(0), BTagNearest2(0), BTagNearest3(0), BTagHeaviest(0), BTagHighestPt(0),
     124  FlavorAlgo(0), FlavorDefault(0), FlavorPhysics(0), FlavorNearest2(0), FlavorNearest3(0), FlavorHeaviest(0), FlavorHighestPt(0),
     125  TauTag(0), Eem(0.0), Ehad(0.0),
    124126  DeltaEta(0.0), DeltaPhi(0.0),
    125127  Momentum(0.0, 0.0, 0.0, 0.0),
    … …  
    242244  object.IsConstituent = IsConstituent;
    243245  object.BTag = BTag;
     246  object.BTagAlgo = BTagAlgo;
     247  object.BTagDefault = BTagDefault;
     248  object.BTagPhysics = BTagPhysics;
     249  object.BTagNearest2 = BTagNearest2;
     250  object.BTagNearest3 = BTagNearest3;
     251  object.BTagHeaviest = BTagHeaviest;
     252  object.BTagHighestPt = BTagHighestPt;
     253  object.FlavorAlgo = FlavorAlgo;
     254  object.FlavorDefault = FlavorDefault;
     255  object.FlavorPhysics = FlavorPhysics;
     256  object.FlavorNearest2 = FlavorNearest2;
     257  object.FlavorNearest3 = FlavorNearest3;
     258  object.FlavorHeaviest = FlavorHeaviest;
     259  object.FlavorHighestPt = FlavorHighestPt;
    244260  object.TauTag = TauTag;
    245261  object.Eem = Eem;
    … …  
    301317  object.SoftDroppedP4[4] = SoftDroppedP4[4];
    302318
    303   object.NSubJetsTrimmed     = NSubJetsTrimmed;
    304   object.NSubJetsPruned      = NSubJetsPruned;
     319  object.NSubJetsTrimmed = NSubJetsTrimmed;
     320  object.NSubJetsPruned = NSubJetsPruned;
    305321  object.NSubJetsSoftDropped = NSubJetsSoftDropped;
    306322
    … …  
    337353  IsConstituent = 0;
    338354  BTag = 0;
     355  BTagAlgo = 0;
     356  BTagDefault = 0;
     357  BTagPhysics = 0;
     358  BTagNearest2 = 0;
     359  BTagNearest3 = 0;
     360  BTagHeaviest = 0;
     361  BTagHighestPt = 0;
     362  FlavorAlgo = 0;
     363  FlavorDefault = 0;
     364  FlavorPhysics = 0;
     365  FlavorNearest2 = 0;
     366  FlavorNearest3 = 0;
     367  FlavorHeaviest = 0;
     368  FlavorHighestPt = 0;
    339369  TauTag = 0;
    340370  Eem = 0.0;
    … …  
    389419  }
    390420
    391   NSubJetsTrimmed     = 0;
    392   NSubJetsPruned      = 0;
     421  NSubJetsTrimmed = 0;
     422  NSubJetsPruned = 0;
    393423  NSubJetsSoftDropped = 0;
    394424 

  • classes/DelphesClasses.h

    r8707eeb redf10ba  
    243243
    244244  // Isolation variables
    245  
     245
    246246  Float_t IsolationVar;
    247247  Float_t IsolationVarRhoCorr;
    … …  
    278278
    279279  // Isolation variables
    280  
     280
    281281  Float_t IsolationVar;
    282282  Float_t IsolationVarRhoCorr;
    … …  
    311311
    312312   // Isolation variables
    313  
     313
    314314  Float_t IsolationVar;
    315315  Float_t IsolationVarRhoCorr;
    … …  
    345345
    346346  UInt_t BTag; // 0 or 1 for a jet that has been tagged as containing a heavy quark
     347
     348  UInt_t BTagAlgo;
     349  UInt_t BTagDefault;
     350  UInt_t BTagPhysics;
     351  UInt_t BTagNearest2;
     352  UInt_t BTagNearest3;
     353  UInt_t BTagHeaviest;
     354  UInt_t BTagHighestPt;
     355
     356  UInt_t FlavorAlgo;
     357  UInt_t FlavorDefault;
     358  UInt_t FlavorPhysics;
     359  UInt_t FlavorNearest2;
     360  UInt_t FlavorNearest3;
     361  UInt_t FlavorHeaviest;
     362  UInt_t FlavorHighestPt;
     363
    347364  UInt_t TauTag; // 0 or 1 for a jet that has been tagged as a tau
    348365
    … …  
    351368  Float_t EhadOverEem; // ratio of the hadronic versus electromagnetic energy deposited in the calorimeter
    352369
    353   Int_t    NCharged; // number of charged constituents
    354   Int_t    NNeutrals; // number of neutral constituents
    355   Float_t  Beta; // (sum pt of charged pile-up constituents)/(sum pt of charged constituents)
    356   Float_t  BetaStar; // (sum pt of charged constituents coming from hard interaction)/(sum pt of charged constituents)
    357   Float_t  MeanSqDeltaR; // average distance (squared) between constituent and jet weighted by pt (squared) of constituent
    358   Float_t  PTD; // average pt between constituent and jet weighted by pt of constituent
    359   Float_t  FracPt[5]; // (sum pt of constituents within a ring 0.1*i < DeltaR < 0.1*(i+1))/(sum pt of constituents)
     370  Int_t NCharged; // number of charged constituents
     371  Int_t NNeutrals; // number of neutral constituents
     372  Float_t Beta; // (sum pt of charged pile-up constituents)/(sum pt of charged constituents)
     373  Float_t BetaStar; // (sum pt of charged constituents coming from hard interaction)/(sum pt of charged constituents)
     374  Float_t MeanSqDeltaR; // average distance (squared) between constituent and jet weighted by pt (squared) of constituent
     375  Float_t PTD; // average pt between constituent and jet weighted by pt of constituent
     376  Float_t FracPt[5]; // (sum pt of constituents within a ring 0.1*i < DeltaR < 0.1*(i+1))/(sum pt of constituents)
    360377
    361378  Float_t Tau[5]; // N-subjettiness
    362  
    363   TLorentzVector TrimmedP4[5]; //first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
    364   TLorentzVector PrunedP4[5]; //first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
    365   TLorentzVector SoftDroppedP4[5]; //first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
    366  
    367   Int_t    NSubJetsTrimmed; // number of subjets trimmed
    368   Int_t    NSubJetsPruned; // number of subjets pruned
    369   Int_t    NSubJetsSoftDropped; // number of subjets soft-dropped
    370    
     379
     380  TLorentzVector TrimmedP4[5]; // first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
     381  TLorentzVector PrunedP4[5]; // first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
     382  TLorentzVector SoftDroppedP4[5]; // first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
     383
     384  Int_t NSubJetsTrimmed; // number of subjets trimmed
     385  Int_t NSubJetsPruned; // number of subjets pruned
     386  Int_t NSubJetsSoftDropped; // number of subjets soft-dropped
     387
    371388  TRefArray Constituents; // references to constituents
    372389  TRefArray Particles; // references to generated particles
    … …  
    437454  Float_t T; // ecal deposit time, averaged by sqrt(EM energy) over all particles, not smeared
    438455  Int_t   Ntimes; // number of hits contributing to time measurement
    439  
     456
    440457  Float_t Eem; // calorimeter tower electromagnetic energy
    441458  Float_t Ehad; // calorimeter tower hadronic energy
    … …  
    497514  Int_t IsPU;
    498515  Int_t IsRecoPU;
    499  
     516
    500517  Int_t IsConstituent;
    501518
    502519  UInt_t BTag;
     520
     521  UInt_t BTagAlgo;
     522  UInt_t BTagDefault;
     523  UInt_t BTagPhysics;
     524  UInt_t BTagNearest2;
     525  UInt_t BTagNearest3;
     526  UInt_t BTagHeaviest;
     527  UInt_t BTagHighestPt;
     528
     529  UInt_t FlavorAlgo;
     530  UInt_t FlavorDefault;
     531  UInt_t FlavorPhysics;
     532  UInt_t FlavorNearest2;
     533  UInt_t FlavorNearest3;
     534  UInt_t FlavorHeaviest;
     535  UInt_t FlavorHighestPt;
     536
    503537  UInt_t TauTag;
    504538
    … …  
    527561  Float_t  PTD;
    528562  Float_t  FracPt[5];
    529  
     563
    530564  //Timing information
    531  
     565
    532566  Int_t    Ntimes;
    533   std::vector<std::pair<Float_t,Float_t> > Ecal_E_t; 
     567  std::vector<std::pair<Float_t,Float_t> > Ecal_E_t;
    534568
    535569  // Isolation variables
    536  
     570
    537571  Float_t IsolationVar;
    538572  Float_t IsolationVarRhoCorr;
    … …  
    545579
    546580  Float_t Tau[5];
    547  
     581
    548582  // Other Substructure variables
    549  
    550   TLorentzVector TrimmedP4[5]; //first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
    551   TLorentzVector PrunedP4[5]; //first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
    552   TLorentzVector SoftDroppedP4[5]; //first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
    553  
    554   Int_t    NSubJetsTrimmed; // number of subjets trimmed
    555   Int_t    NSubJetsPruned; // number of subjets pruned
    556   Int_t    NSubJetsSoftDropped; // number of subjets soft-dropped
     583
     584  TLorentzVector TrimmedP4[5]; // first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
     585  TLorentzVector PrunedP4[5]; // first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
     586  TLorentzVector SoftDroppedP4[5]; // first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
     587
     588  Int_t NSubJetsTrimmed; // number of subjets trimmed
     589  Int_t NSubJetsPruned; // number of subjets pruned
     590  Int_t NSubJetsSoftDropped; // number of subjets soft-dropped
    557591
    558592

  • modules/ModulesLinkDef.h

    r8707eeb redf10ba  
    5959#include "modules/Hector.h"
    6060#include "modules/RunPUPPI.h"
     61#include "modules/JetFlavourAssociation.h"
    6162#include "modules/ExampleModule.h"
    6263
    … …  
    100101#pragma link C++ class Hector+;
    101102#pragma link C++ class RunPUPPI+;
     103#pragma link C++ class JetFlavourAssociation+;
    102104#pragma link C++ class ExampleModule+;
    103105
Note: See TracChangeset for help on using the changeset viewer.