Changeset 60e1de6 in git for modules/DenseTrackFilter.cc

Timestamp:

Jun 6, 2018, 11:54:55 AM (6 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

5b51d33

Parents:

748ce07

Message:

simplify DenseTrackFilter

File:

• modules/DenseTrackFilter.cc (modified) (4 diffs)

modules/DenseTrackFilter.cc

@@ -204 +204 @@
       // switch to next tower
       towerEtaPhi = hitEtaPhi;
-     
+
       // saving track with highest pT that hit the tower
       FillTrack();
@@ -213 +213 @@
     }
     // check for track hits
-    
+
     if(flags & 1)
     {
@@ -220 +220 @@
       momentum = track->Momentum;
 
-      if (momentum.Pt() > ptmax) 
+      if(momentum.Pt() > ptmax)
       {
-        ptmax = momentum.Pt();
+        ptmax = momentum.Pt();
         fBestTrack = track;
       }
       continue;
     }
-  
-  }
-  
+
+  }
+
   // here fill last tower
   FillTrack();
-  
-}
-
-
+
+}
 
 //------------------------------------------------------------------------------
@@ -241 +239 @@
 void DenseTrackFilter::FillTrack()
 {
-  
-  Candidate *candidate, *track, *mother, *trackRef, *bestTrackRef;
+
+  Candidate *candidate, *track;
   Double_t pt, eta, phi;
-  Bool_t matched;
-  
+  Int_t numberOfCandidates;
+
+  numberOfCandidates = fBestTrack->GetCandidates()->GetEntriesFast();
+
   // saving track with highest pT that hit the tower
-  if(fTowerTrackHits > 0)
-  {
-     bestTrackRef = static_cast<Candidate*>(fBestTrack->GetCandidates()->At(0));
-
-     // find corresponding track in properly propagated tracks
-     fItTrackInputArray->Reset();
-     matched = kFALSE;
-     int ntrack = 0;
-     while((track = static_cast<Candidate*>(fItTrackInputArray->Next())))
-     {
-       ntrack++;
-       trackRef = static_cast<Candidate*>(track->GetCandidates()->At(0));
-
-       if (trackRef->GetUniqueID() == bestTrackRef->GetUniqueID())
-       {
-         mother = track;
-         candidate = static_cast<Candidate*>(track->Clone());
-         pt = candidate->Momentum.Pt();
-         eta = candidate->Momentum.Eta();
-         phi = candidate->Momentum.Phi();
-         eta = gRandom->Gaus(eta, fEtaPhiRes);
-         phi = gRandom->Gaus(phi, fEtaPhiRes);
-         candidate->Momentum.SetPtEtaPhiE(pt, eta, phi, pt*TMath::CosH(eta));
-         candidate->AddCandidate(mother);
-         fTrackOutputArray->Add(candidate);
-         matched = kTRUE;
-       }
-       if (matched) break;
-     }
-  } 
-
-
-}
+  if(fTowerTrackHits > 0 && numberOfCandidates > 1)
+  {
+    track = static_cast<Candidate*>(fBestTrack->GetCandidates()->At(numberOfCandidates - 2));
+    candidate = static_cast<Candidate*>(track->Clone());
+    pt = candidate->Momentum.Pt();
+    eta = candidate->Momentum.Eta();
+    phi = candidate->Momentum.Phi();
+    eta = gRandom->Gaus(eta, fEtaPhiRes);
+    phi = gRandom->Gaus(phi, fEtaPhiRes);
+    candidate->Momentum.SetPtEtaPhiE(pt, eta, phi, pt*TMath::CosH(eta));
+    candidate->AddCandidate(track);
+    fTrackOutputArray->Add(candidate);
+  }
+}