Changeset 7c5b8f3 in git for classes

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:

classes

Files:

• DelphesClasses.cc (modified) (1 diff)
• DelphesClasses.h (modified) (1 diff)
• DelphesFormula.cc (modified) (3 diffs)
• DelphesFormula.h (modified) (2 diffs)

classes/DelphesClasses.cc

@@ -172 +172 @@
   ExclYmerge45(0),
   ExclYmerge56(0),
+  ParticleDensity(0),
   fFactory(0),
   fArray(0)

classes/DelphesClasses.h

@@ -733 +733 @@
   Double_t ExclYmerge56;
 
+  // event characteristics variables
+  Double_t ParticleDensity; // particle multiplicity density in the proximity of the particle
+  
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }

classes/DelphesFormula.cc

@@ -18 +18 @@
 
 #include "classes/DelphesFormula.h"
+#include "classes/DelphesClasses.h"
 
 #include "TString.h"
@@ -63 +64 @@
   buffer.ReplaceAll("dz", "[1]");
   buffer.ReplaceAll("ctgTheta", "[2]");
+  buffer.ReplaceAll("radius", "[3]");
+  buffer.ReplaceAll("density", "[4]");
 
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
@@ -77 +80 @@
 //------------------------------------------------------------------------------
 
-Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi,
-  Double_t energy, Double_t d0, Double_t dz,
-  Double_t ctgTheta)
+Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi, Double_t energy, Candidate *candidate)
 {
+
+  Double_t d0 = 0., dz = 0., ctgTheta = 0., radius = 0., density = 0.;
+  if (candidate) {
+    d0 = candidate->D0;
+    dz = candidate->DZ;
+    ctgTheta = candidate->CtgTheta;
+    radius = candidate->Position.Pt();
+    density = candidate->ParticleDensity;
+  }
+    
   Double_t x[4] = {pt, eta, phi, energy};
-  Double_t params[3] = {d0, dz, ctgTheta};
+  Double_t params[5] = {d0, dz, ctgTheta, radius, density};
   return EvalPar(x, params);
 }

classes/DelphesFormula.h

@@ -22 +22 @@
 #include "TFormula.h"
 
+class Candidate;
+
 class DelphesFormula: public TFormula
 {
@@ -33 +35 @@
   Int_t Compile(const char *expression);
 
-  Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0,
-    Double_t energy = 0, Double_t d0 = 0, Double_t dz = 0,
-    Double_t ctgTheta = 0);
+  Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0, Double_t energy = 0, Candidate *candidate = nullptr);
 };