Fork me on GitHub

Changeset eceb415 in git


Ignore:
Timestamp:
Aug 26, 2016, 10:10:52 AM (8 years ago)
Author:
Alexandre Mertens <alexandre.mertens@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
b25184c
Parents:
b3bd4d2 (diff), 79d4123 (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/MomentumSmearing.cc

    rb3bd4d2 receb415  
    9696{
    9797  Candidate *candidate, *mother;
    98   Double_t pt, eta, phi, e;
     98  Double_t pt, eta, phi, e, res;
    9999
    100100  fItInputArray->Reset();
     
    107107    pt = candidateMomentum.Pt();
    108108    e = candidateMomentum.E();
    109 
     109    res = fFormula->Eval(pt, eta, phi, e);
     110 
    110111    // apply smearing formula
    111112    //pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta, phi, e) * pt);
    112     pt = LogNormal(pt, fFormula->Eval(pt, eta, phi, e) * pt );
     113   
     114    res = ( res > 1.0 ) ? 1.0 : res;
     115
     116    pt = LogNormal(pt, res * pt );
    113117   
    114118    //if(pt <= 0.0) continue;
Note: See TracChangeset for help on using the changeset viewer.