Changeset bba5aca in git for modules

Timestamp:

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

Author:

Alexandre Mertens <alexandre.mertens@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

2075bc1

Parents:

b25184c (diff), 298734e (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 'dev_01' of ​https://github.com/delphes/delphes into ValidationWorkWithPavel

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);
       }