Changeset 5a69ba1d in git for modules

Timestamp:

Jan 12, 2018, 5:43:01 PM (7 years ago)

Author:

Ulrike Schnoor <schnooru@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

3037765

Parents:

ae061c1 (diff), 1f7223c (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.

Message:

Merge branch 'master' of github.com:delphes/delphes

Location:

modules

Files:

• DenseTrackFilter.cc (modified) (8 diffs)
• DenseTrackFilter.h (modified) (2 diffs)
• FastJetFinder.cc (modified) (1 diff)
• TimeSmearing.cc (modified) (1 diff)
• TreeWriter.cc (modified) (1 diff)

modules/DenseTrackFilter.cc

@@ -54 +54 @@
 
 DenseTrackFilter::DenseTrackFilter() :
-  fItTrackInputArray(0)
+  fItTrackInputArray(0),   fItDenseChargedInputArray(0)
 {
 }
@@ -111 +111 @@
 
   // Eta x Phi smearing to be applied
-  fEtaPhiRes = GetDouble("EtaPhiRes", 0.005);
-
-  fTrackInputArray = ImportArray(GetString("TrackInputArray", "ParticlePropagator/tracks"));
+  fEtaPhiRes = GetDouble("EtaPhiRes", 0.003);
+
+  fTrackInputArray = ImportArray(GetString("TrackInputArray", "TrackMergerProp/tracks"));
   fItTrackInputArray = fTrackInputArray->MakeIterator();
+
+  fDenseChargedInputArray = ImportArray(GetString("DenseChargedInputArray", "DenseMergeTracks/tracks"));
+  fItDenseChargedInputArray = fDenseChargedInputArray->MakeIterator();
 
   fTrackOutputArray = ExportArray(GetString("TrackOutputArray", "tracks"));
@@ -125 +128 @@
   vector< vector< Double_t >* >::iterator itPhiBin;
   if(fItTrackInputArray) delete fItTrackInputArray;
+  if(fItDenseChargedInputArray) delete fItDenseChargedInputArray;
   for(itPhiBin = fPhiBins.begin(); itPhiBin != fPhiBins.end(); ++itPhiBin)
   {
@@ -135 +139 @@
 void DenseTrackFilter::Process()
 {
-  Candidate *candidate, *track, *bestTrack, *mother;
+  Candidate *track;
   TLorentzVector position, momentum;
   Short_t etaBin, phiBin, flags;
-  Int_t number, towerTrackHits;
+  Int_t number;
   Long64_t towerHit, towerEtaPhi, hitEtaPhi;
-
-  Double_t pt, ptmax, eta, phi;
+  Double_t ptmax;
 
   vector< Double_t >::iterator itEtaBin;
@@ -152 +155 @@
 
   // loop over all tracks
-  fItTrackInputArray->Reset();
+  fItDenseChargedInputArray->Reset();
   number = -1;
-  while((track = static_cast<Candidate*>(fItTrackInputArray->Next())))
+  while((track = static_cast<Candidate*>(fItDenseChargedInputArray->Next())))
   {
     const TLorentzVector &trackPosition = track->Position;
@@ -186 +189 @@
   // loop over all hits
   towerEtaPhi = 0;
-  bestTrack = 0;
-  fTower = 0;
+  fBestTrack = 0;
   ptmax = 0.0;
-  towerTrackHits = 0;
+  fTowerTrackHits = 0;
 
   for(itTowerHits = fTowerHits.begin(); itTowerHits != fTowerHits.end(); ++itTowerHits)
@@ -197 +199 @@
     number = (towerHit) & 0x0000000000FFFFFFLL;
     hitEtaPhi = towerHit >> 32;
+
     if(towerEtaPhi != hitEtaPhi)
     {
       // switch to next tower
       towerEtaPhi = hitEtaPhi;
-      
+     
       // saving track with highest pT that hit the tower
-      if(towerTrackHits > 0)
-      {
-         mother = bestTrack;
-         candidate = static_cast<Candidate*>(bestTrack->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);
-      }
+      FillTrack();
 
       ptmax = 0.0;
-      towerTrackHits = 0;
-      bestTrack = 0;
+      fTowerTrackHits = 0;
+      fBestTrack = 0;
     }
     // check for track hits
@@ -225 +216 @@
     if(flags & 1)
     {
-      ++towerTrackHits;
-      track = static_cast<Candidate*>(fTrackInputArray->At(number));
+      ++fTowerTrackHits;
+      track = static_cast<Candidate*>(fDenseChargedInputArray->At(number));
       momentum = track->Momentum;
 
       if (momentum.Pt() > ptmax) 
       {
-        ptmax = momentum.Pt();
-        bestTrack = track;
+        ptmax = momentum.Pt();
+        fBestTrack = track;
       }
       continue;
     }
-  }
-}
+  
+  }
+  
+  // here fill last tower
+  FillTrack();
+  
+}
+
+
+
+//------------------------------------------------------------------------------
+
+void DenseTrackFilter::FillTrack()
+{
+  
+  Candidate *candidate, *track, *mother, *trackRef, *bestTrackRef;
+  Double_t pt, eta, phi;
+  Bool_t matched;
+  
+  // 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;
+     }
+  } 
+
+
+}

modules/DenseTrackFilter.h

@@ -53 +53 @@
   typedef std::map< Double_t, std::set< Double_t > > TBinMap; //!
 
-  Candidate *fTower;
+  Candidate *fBestTrack;
+
+  Int_t fTowerTrackHits;
 
   Double_t fEtaPhiRes;
@@ -70 +72 @@
   TObjArray *fTrackOutputArray; //!
 
+
+  const TObjArray *fDenseChargedInputArray;
+  TIterator *fItDenseChargedInputArray;
+  
+  void FillTrack();
   ClassDef(DenseTrackFilter, 1)
 };

modules/FastJetFinder.cc

@@ -539 +539 @@
       candidate->NSubJetsSoftDropped = softdrop_jet.pieces().size();
 
+      candidate->SoftDroppedJet = candidate->SoftDroppedP4[0];
+
       for (size_t i = 0; i < subjets.size()  and i < 4; i++)
       {
             if(subjets.at(i).pt() < 0) continue ; 
             candidate->SoftDroppedP4[i+1].SetPtEtaPhiM(subjets.at(i).pt(), subjets.at(i).eta(), subjets.at(i).phi(), subjets.at(i).m());
+            if(i==0) candidate->SoftDroppedSubJet1 = candidate->SoftDroppedP4[i+1];
+            if(i==1) candidate->SoftDroppedSubJet2 = candidate->SoftDroppedP4[i+1];
       }
     }

modules/TimeSmearing.cc

@@ -108 +108 @@
     tf_smeared = gRandom->Gaus(tf, fTimeResolution);
     ti = ti + tf_smeared - tf;
-
+    tf = tf_smeared;
+    
     mother = candidate;
     candidate = static_cast<Candidate*>(candidate->Clone());

modules/TreeWriter.cc

@@ -681 +681 @@
     entry->NSubJetsSoftDropped = candidate->NSubJetsSoftDropped;
 
+    entry->SoftDroppedJet     = candidate->SoftDroppedJet ;
+    entry->SoftDroppedSubJet1 = candidate->SoftDroppedSubJet1 ;
+    entry->SoftDroppedSubJet2 = candidate->SoftDroppedSubJet2;
+
+
     for(i = 0; i < 5; i++)
     {