Changes in modules/AngularSmearing.cc [fd4b326:341014c] in git

File:

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

modules/AngularSmearing.cc

@@ -98 +98 @@
 {
   Candidate *candidate, *mother;
-  Double_t pt, eta, phi, e, m;
+  Double_t pt, eta, phi, e;
 
   fItInputArray->Reset();
   while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
   {
+    const TLorentzVector &candidatePosition = candidate->Position;
     const TLorentzVector &candidateMomentum = candidate->Momentum;
-    eta = candidateMomentum.Eta();
-    phi = candidateMomentum.Phi();
+    eta = candidatePosition.Eta();
+    phi = candidatePosition.Phi();
     pt = candidateMomentum.Pt();
     e = candidateMomentum.E();
-    m = candidateMomentum.M();
 
     // apply smearing formula for eta,phi
-    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e, candidate));
-    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e, candidate));
+
+    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e));
+    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e));
 
     if(pt <= 0.0) continue;
@@ -118 +119 @@
     mother = candidate;
     candidate = static_cast<Candidate *>(candidate->Clone());
-    candidate->Momentum.SetPtEtaPhiM(pt, eta, phi, m);
+    eta = candidateMomentum.Eta();
+    phi = candidateMomentum.Phi();
+    candidate->Momentum.SetPtEtaPhiE(pt, eta, phi, pt * TMath::CosH(eta));
     candidate->AddCandidate(mother);