Changeset 3051ea17 in git

Timestamp:

Jul 13, 2020, 5:19:21 PM (4 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

master

Children:

a0f5d71

Parents:

c18dca6

Message:

added track curvature to candidate class and switched back to regular covariance matrix

Files:

• classes/DelphesClasses.cc (modified) (5 diffs)
• classes/DelphesClasses.h (modified) (2 diffs)
• modules/TrackCovariance.cc (modified) (4 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;

classes/DelphesClasses.h

@@ -651 +651 @@
 
   Float_t L; // path length
+  Float_t DZ;
+  Float_t ErrorDZ;
   Float_t ErrorT; // path length
   Float_t D0;
   Float_t ErrorD0;
-  Float_t DZ;
-  Float_t ErrorDZ;
+  Float_t C;
+  Float_t ErrorC;
   Float_t P;
   Float_t ErrorP;
@@ -700 +702 @@
   Float_t SumPt;
 
-  // ACTS compliant 6x6 track covariance (D, z0, phi0, theta, q/p, time)
-
-  TMatrixDSym TrackCovarianceACTS;
+  // ACTS compliant 6x6 track covariance (D0, phi, Curvature, dz, ctg(theta))
+
+  TMatrixDSym TrackCovariance;
 
   // vertex variables

modules/TrackCovariance.cc

@@ -96 +96 @@
   Candidate *candidate, *mother;
   Double_t mass, p, pt, q, ct;
-  Double_t dd0, ddz, dphi, dct, dp, dpt;
+  Double_t dd0, ddz, dphi, dct, dp, dpt, dC;
   
 
@@ -115 +115 @@
     candidate->InitialPosition.SetXYZT(track.GetObsX().X(),track.GetObsX().Y(),track.GetObsX().Z(),candidatePosition.T());
     
-    // save full ACTS friendly covariance matrix internally (6x6: D, z0, phi0, theta, q/p, time)
-    candidate->TrackCovarianceACTS = track.GetCovACTS();
+    // save full covariance 5x5 matrix internally (D0, phi, Curvature, dz, ctg(theta))
+    candidate->TrackCovariance = track.GetCov();
 
     pt = candidate->Momentum.Pt();
@@ -128 +128 @@
     
     candidate->D0 = track.GetObsPar()[0];
+    candidate->Phi = track.GetObsPar()[1];
+    candidate->C = track.GetObsPar()[2];
     candidate->DZ = track.GetObsPar()[3];
+    candidate->CtgTheta = track.GetObsPar()[4];
     candidate->P  = track.GetObsP().Mag();
-    candidate->CtgTheta = track.GetObsPar()[4];
-    candidate->Phi = track.GetObsPar()[1];
-
     candidate->PT = pt;
     candidate->Charge = q;
@@ -142 +142 @@
     dpt       = 2 * TMath::Sqrt( track.GetCov()(2, 2))*pt*pt / (0.2998*fBz);
     dp        = TMath::Sqrt((1.+ct*ct)*dpt*dpt + 4*pt*pt*ct*ct*dct*dct/(1.+ct*ct)/(1.+ct*ct));
+    dC        = TMath::Sqrt(track.GetCov()(2, 2));
 
     candidate->ErrorD0 = dd0;
     candidate->ErrorDZ = ddz;
     candidate->ErrorP = dp;
+    candidate->ErrorC = dC;
     candidate->ErrorCtgTheta = dct;
     candidate->ErrorPhi = dphi;