Changeset 914fb04 in git for modules/SimpleCalorimeter.cc

Timestamp:

Oct 1, 2015, 3:32:32 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

c62695e

Parents:

122e1e5 (diff), fa7f333 (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 pull request #16 from selvaggi/master

fixed eflow at high pt

File:

• modules/SimpleCalorimeter.cc (modified) (3 diffs)

modules/SimpleCalorimeter.cc

@@ -168 +168 @@
   // create output arrays
   fTowerOutputArray = ExportArray(GetString("TowerOutputArray", "towers"));
+ 
+  fEFlowTrackOutputArray = ExportArray(GetString("EFlowTrackOutputArray", "eflowTracks"));
   fEFlowTowerOutputArray = ExportArray(GetString("EFlowTowerOutputArray", "eflowTowers"));
 }
@@ -395 +397 @@
 void SimpleCalorimeter::FinalizeTower()
 {
-  Candidate *tower;
+  Candidate *tower, *track;
   Double_t energy, pt, eta, phi;
   Double_t sigma;
   Double_t time;
 
+  Double_t trkSigma, fraction;
+  
+  Int_t pdgCode;
+  TLorentzVector momentum;
+  TFractionMap::iterator itFractionMap;
+ 
   if(!fTower) return;
 
@@ -439 +447 @@
   if(energy > 0.0) fTowerOutputArray->Add(fTower);
 
-  // fill energy flow candidates
-  energy -= fTrackEnergy;
+
+
+  // fill e-flow candidates 
+  fItTowerTrackArray->Reset();
+  while((track = static_cast<Candidate*>(fItTowerTrackArray->Next())))
+  {
+     momentum = track->Momentum;
+   
+     pdgCode = TMath::Abs(track->PID);
+
+     itFractionMap = fFractionMap.find(pdgCode);
+     if(itFractionMap == fFractionMap.end())
+     {
+       itFractionMap = fFractionMap.find(0);
+     }
+
+     fraction = itFractionMap->second;
+   
+     // charged particle has to deposit either in ECAL or HCAL
+     if(fraction < 1.0E-9) continue;  
+    
+     trkSigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());       
+  
+     if(track->TrackResolution < trkSigma/momentum.E()) 
+     {
+        energy -= momentum.E();
+        fEFlowTrackOutputArray->Add(track);
+     }
+
+  }
+
 
   sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy);
-
   if(energy < fEnergyMin || energy < fEnergySignificanceMin*sigma) energy = 0.0;