Changeset 0b8551f in git for modules

Timestamp:

Nov 29, 2021, 4:04:38 PM (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

0c0c9af

Parents:

9a7ea36 (diff), bd376e3 (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:

Michele Selvaggi <michele.selvaggi@…> (11/29/21 16:04:38)

git-committer:

GitHub <noreply@…> (11/29/21 16:04:38)

Message:

Merge pull request #102 from fbedesch/master

Major update to handle highly displaced tracks

File:

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

modules/TrackCovariance.cc

@@ -103 +103 @@
   Double_t mass, p, pt, q, ct;
   Double_t dd0, ddz, dphi, dct, dp, dpt, dC;
+  //
+  // Get cylindrical box for fast track simulation
+  //
+  Double_t Rin = fGeometry->GetRmin();
+  Double_t ZinPos = fGeometry->GetZminPos();
+  Double_t ZinNeg = fGeometry->GetZminNeg();
 
   fItInputArray->Reset();
@@ -115 +121 @@
     const TLorentzVector &candidateMomentum = particle->Momentum;
 
-    if ( !fCovariance->IsAccepted(candidateMomentum.Vect()) ) continue;
+    Bool_t inside = TrkUtil::IsInside(candidatePosition.Vect(), Rin, ZinNeg, ZinPos); // Check if in inner box
+    Bool_t Accept = kTRUE;
+    if(inside) Accept = fCovariance->IsAccepted(candidateMomentum.Vect());
+    else       Accept = fCovariance->IsAccepted(candidatePosition.Vect(),candidateMomentum.Vect(), fGeometry);
+    if(!Accept) continue;
 
     mass = candidateMomentum.M();
 
-    ObsTrk track(candidatePosition.Vect(), candidateMomentum.Vect(), candidate->Charge, fBz, fCovariance);
+    ObsTrk track(candidatePosition.Vect(), candidateMomentum.Vect(), candidate->Charge, fCovariance, fGeometry);
 
     mother    = candidate;