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

File:

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

modules/MomentumSmearing.cc

@@ -17 +17 @@
  */
 
+
 /** \class MomentumSmearing
  *
@@ -31 +32 @@
 #include "classes/DelphesFormula.h"
 
+#include "ExRootAnalysis/ExRootResult.h"
+#include "ExRootAnalysis/ExRootFilter.h"
 #include "ExRootAnalysis/ExRootClassifier.h"
-#include "ExRootAnalysis/ExRootFilter.h"
-#include "ExRootAnalysis/ExRootResult.h"
 
+#include "TMath.h"
+#include "TString.h"
+#include "TFormula.h"
+#include "TRandom3.h"
+#include "TObjArray.h"
 #include "TDatabasePDG.h"
-#include "TFormula.h"
 #include "TLorentzVector.h"
-#include "TMath.h"
-#include "TObjArray.h"
-#include "TRandom3.h"
-#include "TString.h"
 
-#include <algorithm>
+#include <algorithm> 
+#include <stdexcept>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
 
 using namespace std;
@@ -98 +99 @@
 
   fItInputArray->Reset();
-  while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
+  while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
     const TLorentzVector &candidatePosition = candidate->Position;
@@ -107 +108 @@
     e = candidateMomentum.E();
     res = fFormula->Eval(pt, eta, phi, e);
-
+ 
     // apply smearing formula
     //pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta, phi, e) * pt);
+    
+    res = ( res > 1.0 ) ? 1.0 : res; 
 
-    res = (res > 1.0) ? 1.0 : res;
-
-    pt = LogNormal(pt, res * pt);
-
+    pt = LogNormal(pt, res * pt );
+    
     //if(pt <= 0.0) continue;
 
     mother = candidate;
-    candidate = static_cast<Candidate *>(candidate->Clone());
+    candidate = static_cast<Candidate*>(candidate->Clone());
     eta = candidateMomentum.Eta();
     phi = candidateMomentum.Phi();
-    candidate->Momentum.SetPtEtaPhiE(pt, eta, phi, pt * TMath::CosH(eta));
+    candidate->Momentum.SetPtEtaPhiE(pt, eta, phi, pt*TMath::CosH(eta));
     //candidate->TrackResolution = fFormula->Eval(pt, eta, phi, e);
     candidate->TrackResolution = res;
     candidate->AddCandidate(mother);
-
+        
     fOutputArray->Add(candidate);
   }
@@ -137 +138 @@
   if(mean > 0.0)
   {
-    b = TMath::Sqrt(TMath::Log((1.0 + (sigma * sigma) / (mean * mean))));
-    a = TMath::Log(mean) - 0.5 * b * b;
+    b = TMath::Sqrt(TMath::Log((1.0 + (sigma*sigma)/(mean*mean))));
+    a = TMath::Log(mean) - 0.5*b*b;
 
-    return TMath::Exp(a + b * gRandom->Gaus(0.0, 1.0));
+    return TMath::Exp(a + b*gRandom->Gaus(0.0, 1.0));
   }
   else
@@ -148 +149 @@
 }
 
+
 //------------------------------------------------------------------------------