Changes in classes/DelphesClasses.cc [cab38f6:839deb7] in git

File:

• classes/DelphesClasses.cc (modified) (18 diffs)

classes/DelphesClasses.cc

@@ -45 +45 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector GenParticle::P4()
+TLorentzVector GenParticle::P4() const
 {
   TLorentzVector vec;
@@ -54 +54 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector MissingET::P4()
+TLorentzVector MissingET::P4() const
 {
   TLorentzVector vec;
@@ -63 +63 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Photon::P4()
+TLorentzVector Photon::P4() const
 {
   TLorentzVector vec;
@@ -72 +72 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Electron::P4()
+TLorentzVector Electron::P4() const
 {
   TLorentzVector vec;
@@ -81 +81 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Muon::P4()
+TLorentzVector Muon::P4() const
 {
   TLorentzVector vec;
@@ -90 +90 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Jet::P4()
+TLorentzVector Jet::P4() const
 {
   TLorentzVector vec;
@@ -99 +99 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Track::P4()
+TLorentzVector Track::P4() const
 {
   TLorentzVector vec;
@@ -108 +108 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Tower::P4()
+TLorentzVector Tower::P4() const
 {
   TLorentzVector vec;
@@ -120 +120 @@
   PID(0), Status(0), M1(-1), M2(-1), D1(-1), D2(-1),
   Charge(0), Mass(0.0),
-  IsPU(0), IsConstituent(0),
-  BTag(0), TauTag(0), Eem(0.0), Ehad(0.0),
+  IsPU(0), IsRecoPU(0), IsConstituent(0), IsFromConversion(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),
   Momentum(0.0, 0.0, 0.0, 0.0),
@@ -133 +135 @@
   MeanSqDeltaR(0),
   PTD(0),
+  NTimeHits(-1),
+  IsolationVar(-999),
+  IsolationVarRhoCorr(-999),
+  SumPtCharged(-999),
+  SumPtNeutral(-999),
+  SumPtChargedPU(-999),
+  SumPt(-999),
+  NSubJetsTrimmed(0),
+  NSubJetsPruned(0),
+  NSubJetsSoftDropped(0),
   fFactory(0),
   fArray(0)
 {
+  int i;
   Edges[0] = 0.0;
   Edges[1] = 0.0;
@@ -150 +163 @@
   Tau[3] = 0.0;
   Tau[4] = 0.0;
+  for(i = 0; i < 5; ++i)
+  {
+    TrimmedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0);
+    PrunedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0);
+    SoftDroppedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0);
+  }
 }
 
@@ -224 +243 @@
   object.IsPU = IsPU;
   object.IsConstituent = IsConstituent;
+  object.IsFromConversion = IsFromConversion;
+  object.Flavor = Flavor;
+  object.FlavorAlgo = FlavorAlgo;
+  object.FlavorPhys = FlavorPhys;
   object.BTag = BTag;
+  object.BTagAlgo = BTagAlgo;
+  object.BTagPhys = BTagPhys;
   object.TauTag = TauTag;
   object.Eem = Eem;
@@ -249 +274 @@
   object.MeanSqDeltaR = MeanSqDeltaR;
   object.PTD = PTD;
+  object.NTimeHits = NTimeHits;
+  object.IsolationVar = IsolationVar;
+  object.IsolationVarRhoCorr = IsolationVarRhoCorr;
+  object.SumPtCharged = SumPtCharged;
+  object.SumPtNeutral = SumPtNeutral;
+  object.SumPtChargedPU = SumPtChargedPU;
+  object.SumPt = SumPt;
+
   object.FracPt[0] = FracPt[0];
   object.FracPt[1] = FracPt[1];
@@ -260 +293 @@
   object.Tau[4] = Tau[4];
 
+  object.TrimmedP4[0] = TrimmedP4[0];
+  object.TrimmedP4[1] = TrimmedP4[1];
+  object.TrimmedP4[2] = TrimmedP4[2];
+  object.TrimmedP4[3] = TrimmedP4[3];
+  object.TrimmedP4[4] = TrimmedP4[4];
+  object.PrunedP4[0] = PrunedP4[0];
+  object.PrunedP4[1] = PrunedP4[1];
+  object.PrunedP4[2] = PrunedP4[2];
+  object.PrunedP4[3] = PrunedP4[3];
+  object.PrunedP4[4] = PrunedP4[4];
+  object.SoftDroppedP4[0] = SoftDroppedP4[0];
+  object.SoftDroppedP4[1] = SoftDroppedP4[1];
+  object.SoftDroppedP4[2] = SoftDroppedP4[2];
+  object.SoftDroppedP4[3] = SoftDroppedP4[3];
+  object.SoftDroppedP4[4] = SoftDroppedP4[4];
+
+  object.NSubJetsTrimmed = NSubJetsTrimmed;
+  object.NSubJetsPruned = NSubJetsPruned;
+  object.NSubJetsSoftDropped = NSubJetsSoftDropped;
+
   object.fFactory = fFactory;
   object.fArray = 0;
+
+  // copy cluster timing info
+  copy(ECalEnergyTimePairs.begin(), ECalEnergyTimePairs.end(), back_inserter(object.ECalEnergyTimePairs));
 
   if(fArray && fArray->GetEntriesFast() > 0)
@@ -278 +334 @@
 void Candidate::Clear(Option_t* option)
 {
+  int i;
   SetUniqueID(0);
   ResetBit(kIsReferenced);
@@ -287 +344 @@
   IsPU = 0;
   IsConstituent = 0;
+  IsFromConversion = 0;
+  Flavor = 0;
+  FlavorAlgo = 0;
+  FlavorPhys = 0;
   BTag = 0;
+  BTagAlgo = 0;
+  BTagPhys = 0;
   TauTag = 0;
   Eem = 0.0;
@@ -311 +374 @@
   MeanSqDeltaR = 0.0;
   PTD = 0.0;
+
+  NTimeHits = 0;
+  ECalEnergyTimePairs.clear();
+
+  IsolationVar = -999;
+  IsolationVarRhoCorr = -999;
+  SumPtCharged = -999;
+  SumPtNeutral = -999;
+  SumPtChargedPU = -999;
+  SumPt = -999;
+
   FracPt[0] = 0.0;
   FracPt[1] = 0.0;
@@ -322 +396 @@
   Tau[4] = 0.0;
 
+  for(i = 0; i < 5; ++i)
+  {
+    TrimmedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0);
+    PrunedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0);
+    SoftDroppedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0);
+  }
+
+  NSubJetsTrimmed = 0;
+  NSubJetsPruned = 0;
+  NSubJetsSoftDropped = 0;
+
   fArray = 0;
 }