Changeset eceb415 in git for modules

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:

• modules/MomentumSmearing.cc (modified) (2 diffs)

modules/MomentumSmearing.cc

@@ -96 +96 @@
 {
   Candidate *candidate, *mother;
-  Double_t pt, eta, phi, e;
+  Double_t pt, eta, phi, e, res;
 
   fItInputArray->Reset();
@@ -107 +107 @@
     pt = candidateMomentum.Pt();
     e = candidateMomentum.E();
-
+    res = fFormula->Eval(pt, eta, phi, e);
+ 
     // apply smearing formula
     //pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta, phi, e) * pt);
-    pt = LogNormal(pt, fFormula->Eval(pt, eta, phi, e) * pt );
+    
+    res = ( res > 1.0 ) ? 1.0 : res; 
+
+    pt = LogNormal(pt, res * pt );
     
     //if(pt <= 0.0) continue;