Changeset dd514ae in git for modules/EnergySmearing.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/EnergySmearing.cc (modified) (3 diffs)

modules/EnergySmearing.cc

@@ -96 +96 @@
 {
   Candidate *candidate, *mother;
-  Double_t energy, eta, phi;
+  Double_t pt, energy, eta, phi;
 
   fItInputArray->Reset();
@@ -103 +103 @@
     const TLorentzVector &candidatePosition = candidate->Position;
     const TLorentzVector &candidateMomentum = candidate->Momentum;
+    
+    pt = candidatePosition.Pt();
     eta = candidatePosition.Eta();
     phi = candidatePosition.Phi();
@@ -108 +110 @@
  
     // apply smearing formula
-    energy = gRandom->Gaus(energy, fFormula->Eval(0.0, eta, 0.0, energy));
+    energy = gRandom->Gaus(energy, fFormula->Eval(pt, eta, phi, energy));
      
     if(energy <= 0.0) continue;