Changes in classes/DelphesClasses.cc [7429c6a:1a4956e] in git

File:

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

classes/DelphesClasses.cc

@@ -16 +16 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 
 /**
@@ -122 +121 @@
   Charge(0), Mass(0.0),
   IsPU(0), IsRecoPU(0), IsConstituent(0), IsFromConversion(0),
-  ClusterIndex(-1), ClusterNDF(0), ClusterSigma(0), SumPT2(0), BTVSumPT2(0), GenDeltaZ(0), GenSumPT2(0),
   Flavor(0), FlavorAlgo(0), FlavorPhys(0),
   BTag(0), BTagAlgo(0), BTagPhys(0),
@@ -129 +127 @@
   Momentum(0.0, 0.0, 0.0, 0.0),
   Position(0.0, 0.0, 0.0, 0.0),
+  InitialPosition(0.0, 0.0, 0.0, 0.0),
   PositionError(0.0, 0.0, 0.0, 0.0),
-  InitialPosition(0.0, 0.0, 0.0, 0.0),
   Area(0.0, 0.0, 0.0, 0.0),
   L(0),
-  D0(0), ErrorD0(0), 
-  DZ(0), ErrorDZ(0), 
-  P(0),  ErrorP(0), 
-  PT(0), ErrorPT(0), 
-  CtgTheta(0), ErrorCtgTheta(0), 
-  Phi(0), ErrorPhi(0),  
-  Xd(0), Yd(0), Zd(0), 
+  D0(0), ErrorD0(0),
+  DZ(0), ErrorDZ(0),
+  P(0), ErrorP(0),
+  PT(0), ErrorPT(0),
+  CtgTheta(0), ErrorCtgTheta(0),
+  Phi(0), ErrorPhi(0),
+  Xd(0), Yd(0), Zd(0),
   TrackResolution(0),
   NCharged(0),
@@ -154 +152 @@
   SumPtChargedPU(-999),
   SumPt(-999),
+  ClusterIndex(-1), ClusterNDF(0), ClusterSigma(0), SumPT2(0), BTVSumPT2(0), GenDeltaZ(0), GenSumPT2(0),
   NSubJetsTrimmed(0),
   NSubJetsPruned(0),
   NSubJetsSoftDropped(0),
+  ExclYmerge23(0),
+  ExclYmerge34(0),
+  ExclYmerge45(0),
+  ExclYmerge56(0),
   fFactory(0),
   fArray(0)
@@ -232 +235 @@
   return kFALSE;
 }
-
 
 //------------------------------------------------------------------------------
@@ -300 +302 @@
   object.PT = PT;
   object.ErrorPT = ErrorPT;
-  object.CtgTheta = CtgTheta ;
+  object.CtgTheta = CtgTheta;
   object.ErrorCtgTheta = ErrorCtgTheta;
   object.Phi = Phi;
-  object.ErrorPhi = ErrorPhi;  
+  object.ErrorPhi = ErrorPhi;
   object.Xd = Xd;
   object.Yd = Yd;
@@ -323 +325 @@
   object.ClusterIndex = ClusterIndex;
   object.ClusterNDF = ClusterNDF;
-  object.ClusterSigma = ClusterSigma; 
+  object.ClusterSigma = ClusterSigma;
   object.SumPT2 = SumPT2;
-  
+
   object.FracPt[0] = FracPt[0];
   object.FracPt[1] = FracPt[1];
@@ -357 +359 @@
   object.NSubJetsSoftDropped = NSubJetsSoftDropped;
 
-  object.SoftDroppedJet =SoftDroppedJet;
+  object.SoftDroppedJet = SoftDroppedJet;
   object.SoftDroppedSubJet1 = SoftDroppedSubJet1;
   object.SoftDroppedSubJet2 = SoftDroppedSubJet2;
@@ -380 +382 @@
 //------------------------------------------------------------------------------
 
-void Candidate::Clear(Option_t* option)
+void Candidate::Clear(Option_t *option)
 {
   int i;
@@ -387 +389 @@
   PID = 0;
   Status = 0;
-  M1 = -1; M2 = -1; D1 = -1; D2 = -1;
+  M1 = -1;
+  M2 = -1;
+  D1 = -1;
+  D2 = -1;
   Charge = 0;
   Mass = 0.0;
@@ -416 +421 @@
   L = 0.0;
   ErrorT = 0.0;
-  D0 = 0.0;  
+  D0 = 0.0;
   ErrorD0 = 0.0;
   DZ = 0.0;
   ErrorDZ = 0.0;
-  P =0.0;
-  ErrorP =0.0;
+  P = 0.0;
+  ErrorP = 0.0;
   PT = 0.0;
   ErrorPT = 0.0;
@@ -451 +456 @@
   ClusterIndex = -1;
   ClusterNDF = -99;
-  ClusterSigma = 0.0; 
+  ClusterSigma = 0.0;
   SumPT2 = 0.0;
   BTVSumPT2 = 0.0;
   GenDeltaZ = 0.0;
-  GenSumPT2 = 0.0; 
-  
+  GenSumPT2 = 0.0;
+
   FracPt[0] = 0.0;
   FracPt[1] = 0.0;
@@ -472 +477 @@
   SoftDroppedSubJet2.SetXYZT(0.0, 0.0, 0.0, 0.0);
 
-
   for(i = 0; i < 5; ++i)
   {