Changeset 4e5ed02 in git for classes/DelphesClasses.cc

Timestamp:

Jul 22, 2020, 9:04:47 PM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

25291dd, a3261d7

Parents:

c18dca6 (diff), cbeb9b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Stephen Sekula <stephensekula@…> (07/22/20 21:04:47)

git-committer:

GitHub <noreply@…> (07/22/20 21:04:47)

Message:

Merge pull request #1 from delphes/master

Synchronizing to delphes upstream master

File:

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

classes/DelphesClasses.cc

@@ -139 +139 @@
   PositionError(0.0, 0.0, 0.0, 0.0),
   Area(0.0, 0.0, 0.0, 0.0),
-  TrackCovarianceACTS(6),
+  TrackCovariance(5),
   L(0),
   D0(0), ErrorD0(0),
   DZ(0), ErrorDZ(0),
   P(0), ErrorP(0),
+  C(0), ErrorC(0),
   PT(0), ErrorPT(0),
   CtgTheta(0), ErrorCtgTheta(0),
@@ -313 +314 @@
   object.P = P;
   object.ErrorP = ErrorP;
+  object.C = C;
+  object.ErrorC = ErrorC;
   object.PT = PT;
   object.ErrorPT = ErrorPT;
@@ -377 +380 @@
   object.SoftDroppedSubJet1 = SoftDroppedSubJet1;
   object.SoftDroppedSubJet2 = SoftDroppedSubJet2;
-  object.TrackCovarianceACTS = TrackCovarianceACTS;
+  object.TrackCovariance = TrackCovariance;
   object.fFactory = fFactory;
   object.fArray = 0;
@@ -434 +437 @@
   InitialPosition.SetXYZT(0.0, 0.0, 0.0, 0.0);
   Area.SetXYZT(0.0, 0.0, 0.0, 0.0);
-  TrackCovarianceACTS.Zero();
+  TrackCovariance.Zero();
   L = 0.0;
   ErrorT = 0.0;
@@ -443 +446 @@
   P = 0.0;
   ErrorP = 0.0;
+  C = 0.0;
+  ErrorC = 0.0;
   PT = 0.0;
   ErrorPT = 0.0;