Fork me on GitHub

Changeset bba5aca in git


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • modules/Calorimeter.cc

    rb25184c rbba5aca  
    212212  Double_t ecalFraction, hcalFraction;
    213213  Double_t ecalEnergy, hcalEnergy;
     214  Double_t ecalSigma, hcalSigma;
     215  Double_t energyGuess;
    214216  Int_t pdgCode;
    215217
     
    398400      {
    399401        fECalTrackEnergy += ecalEnergy;
    400         fECalTrackSigma += (track->TrackResolution)*momentum.E()*(track->TrackResolution)*momentum.E();
     402        ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());       
     403        if(ecalSigma/momentum.E() < track->TrackResolution) energyGuess = ecalEnergy;       
     404        else energyGuess = momentum.E();
     405
     406        fECalTrackSigma += (track->TrackResolution)*energyGuess*(track->TrackResolution)*energyGuess;
    401407        fECalTowerTrackArray->Add(track);
    402408      }
     
    405411      {
    406412        fHCalTrackEnergy += hcalEnergy;
    407         fHCalTrackSigma += (track->TrackResolution)*momentum.E()*(track->TrackResolution)*momentum.E();
     413        hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
     414        if(hcalSigma/momentum.E() < track->TrackResolution) energyGuess = hcalEnergy;
     415        else energyGuess = momentum.E();
     416
     417        fHCalTrackSigma += (track->TrackResolution)*energyGuess*(track->TrackResolution)*energyGuess;
    408418        fHCalTowerTrackArray->Add(track);
    409419      }
Note: See TracChangeset for help on using the changeset viewer.