Changeset 914fb04 in git for modules/Calorimeter.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/Calorimeter.cc (modified) (2 diffs)

modules/Calorimeter.cc

@@ -426 +426 @@
   Double_t ecalEnergy, hcalEnergy;
   Double_t ecalSigma, hcalSigma;
+  Double_t ecalTrkSigma, hcalTrkSigma;
+  Double_t ecalFraction, hcalFraction;
+  
+  Int_t pdgCode;
+  TLorentzVector momentum;
+  TFractionMap::iterator itFractionMap;
+  
   Float_t weight, sumWeightedTime, sumWeight;
 
   if(!fTower) return;
 
+  
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
   hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy);
@@ -501 +509 @@
   // fill energy flow candidates
 
-  // save all the tracks as energy flow tracks
-  fItTowerTrackArray->Reset();
-  while((track = static_cast<Candidate*>(fItTowerTrackArray->Next())))
-  {
-    fEFlowTrackOutputArray->Add(track);
-  }
-
-  ecalEnergy -= fTrackECalEnergy;
-  hcalEnergy -= fTrackHCalEnergy;
+  // save as eflowtracks only tracks that have better resolution than calo 
+ 
+   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);
+     }
+
+     ecalFraction = itFractionMap->second.first;
+     hcalFraction = itFractionMap->second.second;
+
+     // charged particle has to deposit either in ECAL or HCAL
+ 
+     if(ecalFraction < 1.0E-9 && hcalFraction < 1.0E-9) continue;  
+     if(ecalFraction > 1.0E-9 && hcalFraction > 1.0E-9) continue;  
+ 
+     if(ecalFraction > 1.0E-9)
+     {
+       if(track->TrackResolution < ecalTrkSigma/momentum.E()) 
+       {
+         ecalTrkSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());  
+         ecalEnergy -= momentum.E();
+         fEFlowTrackOutputArray->Add(track);        
+       }
+    
+     }
+    
+     if(hcalFraction > 1.0E-9)
+     {
+       if(track->TrackResolution < hcalTrkSigma/momentum.E())
+       {
+         hcalTrkSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());  
+         hcalEnergy -= momentum.E();
+         fEFlowTrackOutputArray->Add(track);        
+       }
+     }
+  }
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);