Changeset e2dd4c5 in git for modules/Calorimeter.cc

Timestamp:

Oct 7, 2015, 6:02:09 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

00e8dca

Parents:

c4b2aae

Message:

new attempt to fix eflow for high pt

File:

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

modules/Calorimeter.cc

@@ -422 +422 @@
 void Calorimeter::FinalizeTower()
 {
-  Candidate *track, *tower;
+  Candidate *track, *tower, *mother;
   Double_t energy, pt, eta, phi;
   Double_t ecalEnergy, hcalEnergy;
@@ -428 +428 @@
   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);
@@ -509 +509 @@
   // fill energy flow candidates
 
-  // 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 )
-     {
-       ecalTrkSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());     
-       if(track->TrackResolution < ecalTrkSigma/momentum.E()) 
-       {
-         ecalEnergy -= momentum.E();
-         fEFlowTrackOutputArray->Add(track);        
-       }   
-     }
-     else if(ecalFraction < 1.0E-9 && hcalFraction > 1.0E-9 )
-     {
-       hcalTrkSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());   
-       if(track->TrackResolution < hcalTrkSigma/momentum.E())
-       {
-         hcalEnergy -= momentum.E();
-         fEFlowTrackOutputArray->Add(track);        
-       }
-     }
-     else if(pdgCode == 13) 
-     {
-       fEFlowTrackOutputArray->Add(track); 
-     }
-  }
+  // save as eflowtracks only tracks that have better resolution than calo
+
+  fItTowerTrackArray->Reset();
+  while((track = static_cast<Candidate*>(fItTowerTrackArray->Next())))
+  {
+    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;
+
+    mother = track;
+    track = static_cast<Candidate*>(track->Clone());
+    track->AddCandidate(mother);
+    momentum = track->Momentum;
+
+    if(ecalFraction > 1.0E-9 && hcalFraction < 1.0E-9 )
+    {
+      ecalTrkSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
+      if(ecalTrkSigma/momentum.E() < track->TrackResolution)
+      {
+        momentum *= ecalEnergy/fTrackECalEnergy;
+      }
+    }
+    else if(ecalFraction < 1.0E-9 && hcalFraction > 1.0E-9 )
+    {
+      hcalTrkSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
+      if(hcalTrkSigma/momentum.E() < track->TrackResolution)
+      {
+        momentum *= hcalEnergy/fTrackHCalEnergy;
+      }
+    }
+
+    fEFlowTrackOutputArray->Add(track);
+  }
+
+  ecalEnergy -= fTrackECalEnergy;
+  hcalEnergy -= fTrackHCalEnergy;
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);