Changeset 298734e in git for modules

Timestamp:

Aug 26, 2016, 11:51:11 AM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

5076b1b, bba5aca

Parents:

4827699

Message:

add better definition for Etrk estimate

File:

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

modules/Calorimeter.cc

@@ -212 +212 @@
   Double_t ecalFraction, hcalFraction;
   Double_t ecalEnergy, hcalEnergy;
+  Double_t ecalSigma, hcalSigma;
+  Double_t energyGuess;
   Int_t pdgCode;
 
@@ -398 +400 @@
       {
         fECalTrackEnergy += ecalEnergy;
-        fECalTrackSigma += (track->TrackResolution)*momentum.E()*(track->TrackResolution)*momentum.E();
+        ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());        
+        if(ecalSigma/momentum.E() < track->TrackResolution) energyGuess = ecalEnergy;        
+        else energyGuess = momentum.E();
+
+        fECalTrackSigma += (track->TrackResolution)*energyGuess*(track->TrackResolution)*energyGuess;
         fECalTowerTrackArray->Add(track);
       }
@@ -405 +411 @@
       {
         fHCalTrackEnergy += hcalEnergy;
-        fHCalTrackSigma += (track->TrackResolution)*momentum.E()*(track->TrackResolution)*momentum.E();
+        hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
+        if(hcalSigma/momentum.E() < track->TrackResolution) energyGuess = hcalEnergy;
+        else energyGuess = momentum.E();
+
+        fHCalTrackSigma += (track->TrackResolution)*energyGuess*(track->TrackResolution)*energyGuess;
         fHCalTowerTrackArray->Add(track);
       }