Changeset 21eab4f in git for modules/MomentumSmearing.cc

Timestamp:

Aug 26, 2016, 5:17:14 PM (8 years ago)

Author:

GitHub <noreply@…>

Parents:

ec5e04b (diff), 94cacb6 (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.

git-author:

AlexandreMertens <alexandre.mertens@…> (08/26/16 17:17:14)

git-committer:

GitHub <noreply@…> (08/26/16 17:17:14)

Message:

Merge 94cacb6ab322f96b75a06369dfd9b7389d0d6802 into ec5e04b014990ea45a8708f4f726b6b214cdb82b

File:

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

modules/MomentumSmearing.cc

@@ -96 +96 @@
 {
   Candidate *candidate, *mother;
-  Double_t pt, eta, phi, e;
+  Double_t pt, eta, phi, e, res;
 
   fItInputArray->Reset();
@@ -107 +107 @@
     pt = candidateMomentum.Pt();
     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; 
 
-    // apply smearing formula
-    pt = gRandom->Gaus(pt, fFormula->Eval(pt, eta, phi, e) * pt);
+    pt = LogNormal(pt, res * pt );
     
-    if(pt <= 0.0) continue;
+    //if(pt <= 0.0) continue;
 
     mother = candidate;
@@ -118 +123 @@
     phi = candidateMomentum.Phi();
     candidate->Momentum.SetPtEtaPhiE(pt, eta, phi, pt*TMath::CosH(eta));
-    candidate->TrackResolution = fFormula->Eval(pt, eta, phi, e);
+    //candidate->TrackResolution = fFormula->Eval(pt, eta, phi, e);
+    candidate->TrackResolution = res;
     candidate->AddCandidate(mother);
         
@@ -124 +130 @@
   }
 }
+//----------------------------------------------------------------
+
+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;
+  }
+}
+
 
 //------------------------------------------------------------------------------