Changeset ebf057e in git for modules

Timestamp:

Aug 26, 2016, 2:17:11 PM (8 years ago)

Author:

Alexandre Mertens <alexandre.mertens@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

058006a

Parents:

1160e4f (diff), 7da1826 (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/SimpleCalorimeter.cc (modified) (2 diffs)

modules/SimpleCalorimeter.cc

@@ -190 +190 @@
   Double_t fraction;
   Double_t energy;
+  Double_t sigma;
+  Double_t energyGuess;
+
   Int_t pdgCode;
 
@@ -364 +367 @@
        // compute total charged energy   
        fTrackEnergy += energy;
-       fTrackSigma += ((track->TrackResolution)*momentum.E())*((track->TrackResolution)*momentum.E());
-       
+       sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
+       if(sigma/momentum.E() < track->TrackResolution) energyGuess = energy;
+       else energyGuess = momentum.E();
+
+       fTrackSigma += ((track->TrackResolution)*energyGuess)*((track->TrackResolution)*energyGuess);
        fTowerTrackArray->Add(track);
-      
       }