Fork me on GitHub

Changeset fe0273c in git for classes


Ignore:
Timestamp:
06/26/15 12:08:48 (5 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
28027d5
Parents:
d38348d
Message:

merge BTagging and BTaggingCMS

Location:
classes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • classes/DelphesClasses.cc

    rd38348d rfe0273c  
    121121  Charge(0), Mass(0.0),
    122122  IsPU(0), IsRecoPU(0), IsConstituent(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),
     123  Flavor(0), FlavorAlgo(0), FlavorPhys(0),
     124  BTag(0), BTagAlgo(0), BTagPhys(0),
    125125  TauTag(0), Eem(0.0), Ehad(0.0),
    126126  DeltaEta(0.0), DeltaPhi(0.0),
     
    243243  object.IsPU = IsPU;
    244244  object.IsConstituent = IsConstituent;
     245  object.Flavor = Flavor;
     246  object.FlavorAlgo = FlavorAlgo;
     247  object.FlavorPhys = FlavorPhys;
    245248  object.BTag = BTag;
    246249  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;
     250  object.BTagPhys = BTagPhys;
    260251  object.TauTag = TauTag;
    261252  object.Eem = Eem;
     
    352343  IsPU = 0;
    353344  IsConstituent = 0;
     345  Flavor = 0;
     346  FlavorAlgo = 0;
     347  FlavorPhys = 0;
    354348  BTag = 0;
    355349  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;
     350  BTagPhys = 0;
    369351  TauTag = 0;
    370352  Eem = 0.0;
  • classes/DelphesClasses.h

    rd38348d rfe0273c  
    344344  Float_t DeltaPhi;  // jet radius in azimuthal angle
    345345
     346  UInt_t Flavor;
     347  UInt_t FlavorAlgo;
     348  UInt_t FlavorPhys;
     349
    346350  UInt_t BTag; // 0 or 1 for a jet that has been tagged as containing a heavy quark
    347 
    348351  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;
     352  UInt_t BTagPhys;
    363353
    364354  UInt_t TauTag; // 0 or 1 for a jet that has been tagged as a tau
     
    517507  Int_t IsConstituent;
    518508
     509  UInt_t Flavor;
     510  UInt_t FlavorAlgo;
     511  UInt_t FlavorPhys;
     512
    519513  UInt_t BTag;
    520 
    521514  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;
     515  UInt_t BTagPhys;
    536516
    537517  UInt_t TauTag;
Note: See TracChangeset for help on using the changeset viewer.