Changeset d77b51d in git for modules/ImpactParameterSmearing.cc

Timestamp:

Sep 29, 2015, 2:08:10 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a98c7ef

Parents:

d870fc5 (diff), 06ec139 (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 remote-tracking branch 'upstream/master'

File:

• modules/ImpactParameterSmearing.cc (modified) (4 diffs)

modules/ImpactParameterSmearing.cc

@@ -97 +97 @@
   Candidate *candidate, *particle, *mother;
   Double_t xd, yd, zd, dxy, sx, sy, sz, ddxy;
-  Double_t pt, eta, px, py;
+  Double_t pt, eta, px, py, phi, e;
 
   fItInputArray->Reset();
@@ -110 +110 @@
     eta = candidateMomentum.Eta();
     pt = candidateMomentum.Pt();
+    phi = candidateMomentum.Phi();
+    e = candidateMomentum.E();
+    
     px = candidateMomentum.Px();
     py = candidateMomentum.Py();
@@ -119 +122 @@
 
     // calculate smeared values
-    sx = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
-    sy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
-    sz = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+    sx = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
+    sy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
+    sz = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
 
     xd += sx;
@@ -130 +133 @@
     dxy = (xd*py - yd*px)/pt;
 
-    ddxy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta));
+    ddxy = gRandom->Gaus(0.0, fFormula->Eval(pt, eta, phi, e));
 
     // fill smeared values in candidate