Changeset 7c5b8f3 in git for modules

Timestamp:

Mar 27, 2020, 9:21:22 AM (5 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, master

Children:

354b7f3

Parents:

288a5fc (diff), 36fb740 (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:

Pavel Demin <pavel-demin@…> (03/27/20 09:21:22)

git-committer:

GitHub <noreply@…> (03/27/20 09:21:22)

Message:

Merge pull request #71 from preghenella/rdev

Radius and particle-density dependence of formula parameterisations

Location:

modules

Files:

• AngularSmearing.cc (modified) (1 diff)
• Efficiency.cc (modified) (2 diffs)
• ModulesLinkDef.h (modified) (2 diffs)
• MomentumSmearing.cc (modified) (1 diff)
• ParticleDensity.cc (added)
• ParticleDensity.h (added)
• TrackSmearing.cc (modified) (7 diffs)

modules/AngularSmearing.cc

@@ -112 +112 @@
     // apply smearing formula for eta,phi
 
-    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e));
-    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e));
+    eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e, candidate));
+    phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e, candidate));
 
     if(pt <= 0.0) continue;

modules/Efficiency.cc

@@ -95 +95 @@
 {
   Candidate *candidate;
-  Double_t pt, eta, phi, e, d0, dz, ctgTheta;
+  Double_t pt, eta, phi, e;
 
   fItInputArray->Reset();
@@ -106 +106 @@
     pt = candidateMomentum.Pt();
     e = candidateMomentum.E();
-    d0 = candidate->D0;
-    dz = candidate->DZ;
-    ctgTheta = candidate->CtgTheta;
-
+    
     // apply an efficency formula
-    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, d0, dz, ctgTheta)) continue;
+    if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, candidate)) continue;
 
     fOutputArray->Add(candidate);

modules/ModulesLinkDef.h

@@ -74 +74 @@
 #include "modules/VertexFinderDA4D.h"
 #include "modules/DecayFilter.h"
+#include "modules/ParticleDensity.h"
 #include "modules/ExampleModule.h"
 
@@ -130 +131 @@
 #pragma link C++ class VertexFinderDA4D+;
 #pragma link C++ class DecayFilter+;
+#pragma link C++ class ParticleDensity+;
 #pragma link C++ class ExampleModule+;
 

modules/MomentumSmearing.cc

@@ -106 +106 @@
     pt = candidateMomentum.Pt();
     e = candidateMomentum.E();
-    res = fFormula->Eval(pt, eta, phi, e);
+    res = fFormula->Eval(pt, eta, phi, e, candidate);
 
     // apply smearing formula

modules/TrackSmearing.cc

@@ -158 +158 @@
   TLorentzVector beamSpotPosition;
   Candidate *candidate, *mother;
-  Double_t pt, eta, d0, d0Error, trueD0, dz, dzError, trueDZ, p, pError, trueP, ctgTheta, ctgThetaError, trueCtgTheta, phi, phiError, truePhi;
+  Double_t pt, eta, e, d0, d0Error, trueD0, dz, dzError, trueDZ, p, pError, trueP, ctgTheta, ctgThetaError, trueCtgTheta, phi, phiError, truePhi;
   Double_t x, y, z, t, px, py, pz, theta;
   Double_t q, r;
@@ -223 +223 @@
     pt = momentum.Pt();
     eta = momentum.Eta();
-
+    e = momentum.E();
+    
     d0 = trueD0 = candidate->D0;
     dz = trueDZ = candidate->DZ;
@@ -232 +233 @@
 
     if(fUseD0Formula)
-      d0Error = fD0Formula->Eval(pt, eta);
+      d0Error = fD0Formula->Eval(pt, eta, phi, e, candidate);
     else
     {
@@ -247 +248 @@
 
     if(fUseDZFormula)
-      dzError = fDZFormula->Eval(pt, eta);
+      dzError = fDZFormula->Eval(pt, eta, phi, e, candidate);
     else
     {
@@ -262 +263 @@
 
     if(fUsePFormula)
-      pError = fPFormula->Eval(pt, eta) * p;
+      pError = fPFormula->Eval(pt, eta, phi, e, candidate) * p;
     else
     {
@@ -277 +278 @@
 
     if(fUseCtgThetaFormula)
-      ctgThetaError = fCtgThetaFormula->Eval(pt, eta);
+      ctgThetaError = fCtgThetaFormula->Eval(pt, eta, phi, e, candidate);
     else
     {
@@ -292 +293 @@
 
     if(fUsePhiFormula)
-      phiError = fPhiFormula->Eval(pt, eta);
+      phiError = fPhiFormula->Eval(pt, eta, phi, e, candidate);
     else
     {