Changes in classes/DelphesClasses.cc [edf10ba:2b3ef28] in git

File:

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

classes/DelphesClasses.cc

@@ -120 +120 @@
   PID(0), Status(0), M1(-1), M2(-1), D1(-1), D2(-1),
   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),
-  TauTag(0), Eem(0.0), Ehad(0.0),
+  IsPU(0), IsConstituent(0),
+  BTag(0), TauTag(0), Eem(0.0), Ehad(0.0),
   DeltaEta(0.0), DeltaPhi(0.0),
   Momentum(0.0, 0.0, 0.0, 0.0),
@@ -131 +129 @@
   NCharged(0),
   NNeutrals(0),
-  NSubJetsTrimmed(0),
-  NSubJetsPruned(0), 
-  NSubJetsSoftDropped(0), 
   Beta(0),
   BetaStar(0),
   MeanSqDeltaR(0),
   PTD(0),
-  Ntimes(-1),
-  IsolationVar(-999),
-  IsolationVarRhoCorr(-999),
-  SumPtCharged(-999),
-  SumPtNeutral(-999),
-  SumPtChargedPU(-999),
-  SumPt(-999),
   fFactory(0),
   fArray(0)
 {
-  int i;
   Edges[0] = 0.0;
   Edges[1] = 0.0;
@@ -163 +150 @@
   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);
-  }
 }
 
@@ -244 +225 @@
   object.IsConstituent = IsConstituent;
   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.TauTag = TauTag;
   object.Eem = Eem;
@@ -282 +249 @@
   object.MeanSqDeltaR = MeanSqDeltaR;
   object.PTD = PTD;
-  object.Ntimes = Ntimes; 
-  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];
@@ -300 +259 @@
   object.Tau[3] = Tau[3];
   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(Ecal_E_t.begin(),Ecal_E_t.end(),back_inserter(object.Ecal_E_t));
 
   if(fArray && fArray->GetEntriesFast() > 0)
@@ -342 +278 @@
 void Candidate::Clear(Option_t* option)
 {
-  int i;
   SetUniqueID(0);
   ResetBit(kIsReferenced);
@@ -353 +288 @@
   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;
   TauTag = 0;
   Eem = 0.0;
@@ -390 +311 @@
   MeanSqDeltaR = 0.0;
   PTD = 0.0;
-  
-  Ntimes = 0;
-  Ecal_E_t.clear();
-  
-  IsolationVar = -999;
-  IsolationVarRhoCorr = -999;
-  SumPtCharged = -999;
-  SumPtNeutral = -999;
-  SumPtChargedPU = -999;
-  SumPt = -999;
-  
   FracPt[0] = 0.0;
   FracPt[1] = 0.0;
@@ -411 +321 @@
   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);
-  }
-
-  NSubJetsTrimmed = 0;
-  NSubJetsPruned = 0;
-  NSubJetsSoftDropped = 0;
-  
+
   fArray = 0;
 }