Changeset b3bd4d2 in git

Timestamp:

Aug 25, 2016, 4:30:15 PM (8 years ago)

Author:

Alexandre Mertens <alexandre.mertens@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

eceb415

Parents:

629e819 (diff), bc58cf5 (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 branch 'dev_01' of ​https://github.com/delphes/delphes into ValidationWorkWithPavel

Location:

modules

Files:

• MomentumSmearing.cc (modified) (2 diffs)
• MomentumSmearing.h (modified) (1 diff)

modules/MomentumSmearing.cc

@@ -109 +109 @@
 
     // apply smearing formula
-    pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta, phi, e) * pt);
+    //pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta, phi, e) * pt);
+    pt = LogNormal(pt, fFormula->Eval(pt, eta, phi, e) * pt );
     
-    if(pt <= 0.0) continue;
+    //if(pt <= 0.0) continue;
 
     mother = candidate;
@@ -124 +125 @@
   }
 }
+//----------------------------------------------------------------
+
+Double_t MomentumSmearing::LogNormal(Double_t mean, Double_t sigma)
+{
+  Double_t a, b;
+
+  if(mean > 0.0)
+  {
+    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));
+  }
+  else
+  {
+    return 0.0;
+  }
+}
+
 
 //------------------------------------------------------------------------------

modules/MomentumSmearing.h

@@ -47 +47 @@
 private:
 
+  Double_t LogNormal(Double_t mean, Double_t sigma);
+
   DelphesFormula *fFormula; //!