Changeset 3e4e196 in git for modules

Timestamp:

Jan 22, 2021, 4:35:07 PM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

8d7319c

Parents:

eee976c2 (diff), 90975be (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:

Aleksander Filip Żarnecki <zarnecki@…> (01/22/21 16:35:07)

git-committer:

GitHub <noreply@…> (01/22/21 16:35:07)

Message:

Merge pull request #4 from delphes/master

Fork update

Location:

modules

Files:

• JetFakeParticle.cc (modified) (1 diff)
• TrackCovariance.cc (modified) (9 diffs)
• TrackCovariance.h (modified) (2 diffs)

modules/JetFakeParticle.cc

@@ -146 +146 @@
   while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
   {
-    const TLorentzVector &candidatePosition = candidate->Position;
     const TLorentzVector &candidateMomentum = candidate->Momentum;
-    eta = candidatePosition.Eta();
-    phi = candidatePosition.Phi();
+    eta = candidateMomentum.Eta();
+    phi = candidateMomentum.Phi();
     pt = candidateMomentum.Pt();
     e = candidateMomentum.E();

modules/TrackCovariance.cc

@@ -21 +21 @@
  *  Smears track parameters according to appropriate covariance matrix.
  *
- *  \authors P. Demin - UCLouvain, Louvain-la-Neuve
+ *  \authors F. Bedeschi - INFN Pisa
+*            P. Demin - UCLouvain, Louvain-la-Neuve
  *           M. Selvaggi - CERN
+ *
  *
  */
@@ -50 +52 @@
 
 TrackCovariance::TrackCovariance() :
-  fGeometry(0), fCovariance(0), fItInputArray(0)
+  fGeometry(0), fCovariance(0), fAcx(0), fItInputArray(0)
 {
   fGeometry = new SolGeom();
@@ -70 +72 @@
   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();
@@ -97 +103 @@
   Double_t mass, p, pt, q, ct;
   Double_t dd0, ddz, dphi, dct, dp, dpt, dC;
-  
+
 
   fItInputArray->Reset();
@@ -107 +113 @@
     const TLorentzVector &candidateMomentum = candidate->Momentum;
 
+    if ( !fCovariance->IsAccepted(candidateMomentum.Vect()) ) continue;
+
     mass = candidateMomentum.M();
 
@@ -112 +120 @@
 
     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);
@@ -130 +138 @@
     candidate->Yd = track.GetObsX().Y()*1e03;
     candidate->Zd = track.GetObsX().Z()*1e03;
-    
+
     candidate->D0       = track.GetObsPar()[0]*1e03;
     candidate->Phi      = track.GetObsPar()[1];
@@ -142 +150 @@
     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))*1e03;
+    ddz       = TMath::Sqrt(track.GetCov()(3, 3))*1e03;
+    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));
@@ -160 +168 @@
     candidate->TrackResolution = dp / p;
 
-
     candidate->AddCandidate(mother);
 

modules/TrackCovariance.h

@@ -36 +36 @@
 class SolGeom;
 class SolGridCov;
+class AcceptanceClx;
 
 class TrackCovariance: public DelphesModule
@@ -49 +50 @@
 private:
   Double_t fBz;
+  Int_t fNMinHits;
 
   SolGeom *fGeometry;
   SolGridCov *fCovariance;
+
+  AcceptanceClx *fAcx;
 
   TIterator *fItInputArray; //!