Changeset fe0273c in git for classes

Timestamp:

Jun 26, 2015, 12:08:48 PM (9 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:

• DelphesClasses.cc (modified) (3 diffs)
• DelphesClasses.h (modified) (2 diffs)

classes/DelphesClasses.cc

@@ -121 +121 @@
   Charge(0), Mass(0.0),
   IsPU(0), IsRecoPU(0), IsConstituent(0),
-  BTag(0), BTagAlgo(0), BTagDefault(0), BTagPhysics(0), BTagNearest2(0), BTagNearest3(0), BTagHeaviest(0), BTagHighestPt(0),
-  FlavorAlgo(0), FlavorDefault(0), FlavorPhysics(0), FlavorNearest2(0), FlavorNearest3(0), FlavorHeaviest(0), FlavorHighestPt(0),
+  Flavor(0), FlavorAlgo(0), FlavorPhys(0),
+  BTag(0), BTagAlgo(0), BTagPhys(0),
   TauTag(0), Eem(0.0), Ehad(0.0),
   DeltaEta(0.0), DeltaPhi(0.0),
@@ -243 +243 @@
   object.IsPU = IsPU;
   object.IsConstituent = IsConstituent;
+  object.Flavor = Flavor;
+  object.FlavorAlgo = FlavorAlgo;
+  object.FlavorPhys = FlavorPhys;
   object.BTag = BTag;
   object.BTagAlgo = BTagAlgo;
-  object.BTagDefault = BTagDefault;
-  object.BTagPhysics = BTagPhysics;
-  object.BTagNearest2 = BTagNearest2;
-  object.BTagNearest3 = BTagNearest3;
-  object.BTagHeaviest = BTagHeaviest;
-  object.BTagHighestPt = BTagHighestPt;
-  object.FlavorAlgo = FlavorAlgo;
-  object.FlavorDefault = FlavorDefault;
-  object.FlavorPhysics = FlavorPhysics;
-  object.FlavorNearest2 = FlavorNearest2;
-  object.FlavorNearest3 = FlavorNearest3;
-  object.FlavorHeaviest = FlavorHeaviest;
-  object.FlavorHighestPt = FlavorHighestPt;
+  object.BTagPhys = BTagPhys;
   object.TauTag = TauTag;
   object.Eem = Eem;
@@ -352 +343 @@
   IsPU = 0;
   IsConstituent = 0;
+  Flavor = 0;
+  FlavorAlgo = 0;
+  FlavorPhys = 0;
   BTag = 0;
   BTagAlgo = 0;
-  BTagDefault = 0;
-  BTagPhysics = 0;
-  BTagNearest2 = 0;
-  BTagNearest3 = 0;
-  BTagHeaviest = 0;
-  BTagHighestPt = 0;
-  FlavorAlgo = 0;
-  FlavorDefault = 0;
-  FlavorPhysics = 0;
-  FlavorNearest2 = 0;
-  FlavorNearest3 = 0;
-  FlavorHeaviest = 0;
-  FlavorHighestPt = 0;
+  BTagPhys = 0;
   TauTag = 0;
   Eem = 0.0;

classes/DelphesClasses.h

@@ -344 +344 @@
   Float_t DeltaPhi;  // jet radius in azimuthal angle
 
+  UInt_t Flavor;
+  UInt_t FlavorAlgo;
+  UInt_t FlavorPhys;
+
   UInt_t BTag; // 0 or 1 for a jet that has been tagged as containing a heavy quark
-
   UInt_t BTagAlgo;
-  UInt_t BTagDefault;
-  UInt_t BTagPhysics;
-  UInt_t BTagNearest2;
-  UInt_t BTagNearest3;
-  UInt_t BTagHeaviest;
-  UInt_t BTagHighestPt;
-
-  UInt_t FlavorAlgo;
-  UInt_t FlavorDefault;
-  UInt_t FlavorPhysics;
-  UInt_t FlavorNearest2;
-  UInt_t FlavorNearest3;
-  UInt_t FlavorHeaviest;
-  UInt_t FlavorHighestPt;
+  UInt_t BTagPhys;
 
   UInt_t TauTag; // 0 or 1 for a jet that has been tagged as a tau
@@ -517 +507 @@
   Int_t IsConstituent;
 
+  UInt_t Flavor;
+  UInt_t FlavorAlgo;
+  UInt_t FlavorPhys;
+
   UInt_t BTag;
-
   UInt_t BTagAlgo;
-  UInt_t BTagDefault;
-  UInt_t BTagPhysics;
-  UInt_t BTagNearest2;
-  UInt_t BTagNearest3;
-  UInt_t BTagHeaviest;
-  UInt_t BTagHighestPt;
-
-  UInt_t FlavorAlgo;
-  UInt_t FlavorDefault;
-  UInt_t FlavorPhysics;
-  UInt_t FlavorNearest2;
-  UInt_t FlavorNearest3;
-  UInt_t FlavorHeaviest;
-  UInt_t FlavorHighestPt;
+  UInt_t BTagPhys;
 
   UInt_t TauTag;