Changes in modules/MomentumSmearing.cc [27197df:341014c] in git

File:

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

modules/MomentumSmearing.cc

@@ -78 +78 @@
   fItInputArray = fInputArray->MakeIterator();
 
-  // switch to compute momentum smearing based on momentum vector eta, phi
-  fUseMomentumVector = GetBool("UseMomentumVector", false);
-
   // create output array
 
@@ -98 +95 @@
 {
   Candidate *candidate, *mother;
-  Double_t pt, eta, phi, e, m, res;
+  Double_t pt, eta, phi, e, res;
 
   fItInputArray->Reset();
@@ -107 +104 @@
     eta = candidatePosition.Eta();
     phi = candidatePosition.Phi();
-
-    if (fUseMomentumVector){
-      eta = candidateMomentum.Eta();
-      phi = candidateMomentum.Phi();
-    }
-
     pt = candidateMomentum.Pt();
     e = candidateMomentum.E();
-    m = candidateMomentum.M();
-    res = fFormula->Eval(pt, eta, phi, e, candidate);
+    res = fFormula->Eval(pt, eta, phi, e);
 
     // apply smearing formula
@@ -131 +121 @@
     eta = candidateMomentum.Eta();
     phi = candidateMomentum.Phi();
-    candidate->Momentum.SetPtEtaPhiM(pt, eta, phi, m);
+    candidate->Momentum.SetPtEtaPhiE(pt, eta, phi, pt * TMath::CosH(eta));
     //candidate->TrackResolution = fFormula->Eval(pt, eta, phi, e);
     candidate->TrackResolution = res;