Changeset b25184c in git

Timestamp:

Aug 26, 2016, 10:23:56 AM (8 years ago)

Author:

Alexandre Mertens <alexandre.mertens@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

bba5aca

Parents:

eceb415 (diff), 4827699 (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) (1 diff)

modules/MomentumSmearing.cc

@@ -123 +123 @@
     phi = candidateMomentum.Phi();
     candidate->Momentum.SetPtEtaPhiE(pt, eta, phi, pt*TMath::CosH(eta));
-    candidate->TrackResolution = fFormula->Eval(pt, eta, phi, e);
+    //candidate->TrackResolution = fFormula->Eval(pt, eta, phi, e);
+    candidate->TrackResolution = res;
     candidate->AddCandidate(mother);