Fork me on GitHub

Changeset 3051ea17 in git


Ignore:
Timestamp:
07/13/20 17:19:21 (4 weeks 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:
3 edited

Legend:

Unmodified
Added
Removed
  • classes/DelphesClasses.cc

    rc18dca6 r3051ea17  
    139139  PositionError(0.0, 0.0, 0.0, 0.0),
    140140  Area(0.0, 0.0, 0.0, 0.0),
    141   TrackCovarianceACTS(6),
     141  TrackCovariance(5),
    142142  L(0),
    143143  D0(0), ErrorD0(0),
    144144  DZ(0), ErrorDZ(0),
    145145  P(0), ErrorP(0),
     146  C(0), ErrorC(0),
    146147  PT(0), ErrorPT(0),
    147148  CtgTheta(0), ErrorCtgTheta(0),
     
    313314  object.P = P;
    314315  object.ErrorP = ErrorP;
     316  object.C = C;
     317  object.ErrorC = ErrorC;
    315318  object.PT = PT;
    316319  object.ErrorPT = ErrorPT;
     
    377380  object.SoftDroppedSubJet1 = SoftDroppedSubJet1;
    378381  object.SoftDroppedSubJet2 = SoftDroppedSubJet2;
    379   object.TrackCovarianceACTS = TrackCovarianceACTS;
     382  object.TrackCovariance = TrackCovariance;
    380383  object.fFactory = fFactory;
    381384  object.fArray = 0;
     
    434437  InitialPosition.SetXYZT(0.0, 0.0, 0.0, 0.0);
    435438  Area.SetXYZT(0.0, 0.0, 0.0, 0.0);
    436   TrackCovarianceACTS.Zero();
     439  TrackCovariance.Zero();
    437440  L = 0.0;
    438441  ErrorT = 0.0;
     
    443446  P = 0.0;
    444447  ErrorP = 0.0;
     448  C = 0.0;
     449  ErrorC = 0.0;
    445450  PT = 0.0;
    446451  ErrorPT = 0.0;
  • classes/DelphesClasses.h

    rc18dca6 r3051ea17  
    651651
    652652  Float_t L; // path length
     653  Float_t DZ;
     654  Float_t ErrorDZ;
    653655  Float_t ErrorT; // path length
    654656  Float_t D0;
    655657  Float_t ErrorD0;
    656   Float_t DZ;
    657   Float_t ErrorDZ;
     658  Float_t C;
     659  Float_t ErrorC;
    658660  Float_t P;
    659661  Float_t ErrorP;
     
    700702  Float_t SumPt;
    701703
    702   // ACTS compliant 6x6 track covariance (D, z0, phi0, theta, q/p, time)
    703 
    704   TMatrixDSym TrackCovarianceACTS;
     704  // ACTS compliant 6x6 track covariance (D0, phi, Curvature, dz, ctg(theta))
     705
     706  TMatrixDSym TrackCovariance;
    705707
    706708  // vertex variables
  • modules/TrackCovariance.cc

    rc18dca6 r3051ea17  
    9696  Candidate *candidate, *mother;
    9797  Double_t mass, p, pt, q, ct;
    98   Double_t dd0, ddz, dphi, dct, dp, dpt;
     98  Double_t dd0, ddz, dphi, dct, dp, dpt, dC;
    9999 
    100100
     
    115115    candidate->InitialPosition.SetXYZT(track.GetObsX().X(),track.GetObsX().Y(),track.GetObsX().Z(),candidatePosition.T());
    116116   
    117     // save full ACTS friendly covariance matrix internally (6x6: D, z0, phi0, theta, q/p, time)
    118     candidate->TrackCovarianceACTS = track.GetCovACTS();
     117    // save full covariance 5x5 matrix internally (D0, phi, Curvature, dz, ctg(theta))
     118    candidate->TrackCovariance = track.GetCov();
    119119
    120120    pt = candidate->Momentum.Pt();
     
    128128   
    129129    candidate->D0 = track.GetObsPar()[0];
     130    candidate->Phi = track.GetObsPar()[1];
     131    candidate->C = track.GetObsPar()[2];
    130132    candidate->DZ = track.GetObsPar()[3];
     133    candidate->CtgTheta = track.GetObsPar()[4];
    131134    candidate->P  = track.GetObsP().Mag();
    132     candidate->CtgTheta = track.GetObsPar()[4];
    133     candidate->Phi = track.GetObsPar()[1];
    134 
    135135    candidate->PT = pt;
    136136    candidate->Charge = q;
     
    142142    dpt       = 2 * TMath::Sqrt( track.GetCov()(2, 2))*pt*pt / (0.2998*fBz);
    143143    dp        = TMath::Sqrt((1.+ct*ct)*dpt*dpt + 4*pt*pt*ct*ct*dct*dct/(1.+ct*ct)/(1.+ct*ct));
     144    dC        = TMath::Sqrt(track.GetCov()(2, 2));
    144145
    145146    candidate->ErrorD0 = dd0;
    146147    candidate->ErrorDZ = ddz;
    147148    candidate->ErrorP = dp;
     149    candidate->ErrorC = dC;
    148150    candidate->ErrorCtgTheta = dct;
    149151    candidate->ErrorPhi = dphi;
Note: See TracChangeset for help on using the changeset viewer.