Changeset dd514ae in git for modules/EnergyScale.cc

Timestamp:

Jun 10, 2015, 4:04:47 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8707eeb

Parents:

6ec8d18 (diff), 9c491e1 (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:

resolve conflict in DelphesClasses.h

File:

• modules/EnergyScale.cc (modified) (1 diff)

modules/EnergyScale.cc

@@ -104 +104 @@
     momentum = candidate->Momentum;
 
-    scale = fFormula->Eval(momentum.Pt(), momentum.Eta());
+    scale = fFormula->Eval(momentum.Pt(), momentum.Eta(), momentum.Phi(), momentum.E());
 
     if(scale > 0.0) momentum *= scale;