Changes in modules/TrackCovariance.cc [fd4b326:3051ea17] in git

File:

• modules/TrackCovariance.cc (modified) (8 diffs)

modules/TrackCovariance.cc

@@ -1 @@
-  /*
+/*
  *  Delphes: a framework for fast simulation of a generic collider experiment
  *  Copyright (C) 2020  Universite catholique de Louvain (UCLouvain), Belgium
@@ -21 +21 @@
  *  Smears track parameters according to appropriate covariance matrix.
  *
- *  \authors F. Bedeschi - INFN Pisa
-*            P. Demin - UCLouvain, Louvain-la-Neuve
+ *  \authors P. Demin - UCLouvain, Louvain-la-Neuve
  *           M. Selvaggi - CERN
- *
  *
  */
@@ -52 +50 @@
 
 TrackCovariance::TrackCovariance() :
-  fGeometry(0), fCovariance(0), fAcx(0), fItInputArray(0)
+  fGeometry(0), fCovariance(0), fItInputArray(0)
 {
   fGeometry = new SolGeom();
@@ -72 +70 @@
   fBz = GetDouble("Bz", 0.0);
   fGeometry->Read(GetString("DetectorGeometry", ""));
-  fNMinHits = GetInt("NMinHits", 6);
 
-  // load geometry
   fCovariance->Calc(fGeometry);
-  fCovariance->SetMinHits(fNMinHits);
-  // load geometry
-  fAcx = fCovariance->AccPnt();
 
   // import input array
+
   fInputArray = ImportArray(GetString("InputArray", "TrackMerger/tracks"));
   fItInputArray = fInputArray->MakeIterator();
@@ -100 +94 @@
 void TrackCovariance::Process()
 {
-  Candidate *candidate, *mother, *particle;
+  Candidate *candidate, *mother;
   Double_t mass, p, pt, q, ct;
   Double_t dd0, ddz, dphi, dct, dp, dpt, dC;
-
+  
 
   fItInputArray->Reset();
   while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
   {
-
-    // converting to meters
-    particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
-
-    // converting to meters
-    const TLorentzVector &candidatePosition = particle->Position*1e-03;
-    const TLorentzVector &candidateMomentum = particle->Momentum;
-
-    if ( !fCovariance->IsAccepted(candidateMomentum.Vect()) ) continue;
+    const TLorentzVector &candidatePosition = candidate->InitialPosition;
+    const TLorentzVector &candidateMomentum = candidate->Momentum;
 
     mass = candidateMomentum.M();
@@ -123 +110 @@
 
     mother    = candidate;
-    candidate = static_cast<Candidate*>(candidate->Clone());
+    candidate = static_cast<Candidate *>(candidate->Clone());
 
     candidate->Momentum.SetVectM(track.GetObsP(), mass);
-
-    // converting back to mm
-    candidate->InitialPosition.SetXYZT(track.GetObsX().X()*1e03,track.GetObsX().Y()*1e03,track.GetObsX().Z()*1e03,candidatePosition.T()*1e03);
-
+    candidate->InitialPosition.SetXYZT(track.GetObsX().X(),track.GetObsX().Y(),track.GetObsX().Z(),candidatePosition.T());
+    
     // save full covariance 5x5 matrix internally (D0, phi, Curvature, dz, ctg(theta))
     candidate->TrackCovariance = track.GetCov();
@@ -138 +123 @@
     ct = track.GetObsPar()[4];
 
-    candidate->Xd = track.GetObsX().X()*1e03;
-    candidate->Yd = track.GetObsX().Y()*1e03;
-    candidate->Zd = track.GetObsX().Z()*1e03;
+    candidate->Xd = track.GetObsX().X();
+    candidate->Yd = track.GetObsX().Y();
+    candidate->Zd = track.GetObsX().Z();
+    
+    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->PT = pt;
+    candidate->Charge = q;
 
-    candidate->D0       = track.GetObsPar()[0]*1e03;
-    candidate->Phi      = track.GetObsPar()[1];
-
-    // inverse of curvature
-    candidate->C        = track.GetObsPar()[2]*1e-03;
-    candidate->DZ       = track.GetObsPar()[3]*1e03;
-    candidate->CtgTheta = track.GetObsPar()[4];
-    candidate->P        = track.GetObsP().Mag();
-    candidate->PT       = pt;
-    candidate->Charge   = q;
-
-    dd0       = TMath::Sqrt(track.GetCov()(0, 0))*1e03;
-    ddz       = TMath::Sqrt(track.GetCov()(3, 3))*1e03;
-    dphi      = TMath::Sqrt(track.GetCov()(1, 1));
-    dct       = TMath::Sqrt(track.GetCov()(4, 4));
+    dd0       = TMath::Sqrt(track.GetCov()(0, 0)); 
+    ddz       = TMath::Sqrt(track.GetCov()(3, 3)); 
+    dphi      = TMath::Sqrt(track.GetCov()(1, 1)); 
+    dct       = TMath::Sqrt(track.GetCov()(4, 4)); 
     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))*1e-03;
+    dC        = TMath::Sqrt(track.GetCov()(2, 2));
 
     candidate->ErrorD0 = dd0;
@@ -171 +154 @@
     candidate->TrackResolution = dp / p;
 
+
     candidate->AddCandidate(mother);