Changeset f298e48 in git for classes

Timestamp:

Mar 22, 2020, 6:39:09 PM (4 years ago)

Author:

Roberto Preghenella <preghenella@…>

Branches:

ImprovedOutputFile, master

Children:

7e83689

Parents:

288a5fc

git-author:

Roberto Preghenella <preghenella@…> (03/22/20 16:32:29)

git-committer:

Roberto Preghenella <preghenella@…> (03/22/20 18:39:09)

Message:

Add radius (distance from beam line) to formula parameterisations

also redefines the DelphesFormula::Eval function to allow one to
include future parameters for parameterisations that can be
taken from Candidates in a generalised way.

Location:

classes

Files:

• DelphesFormula.cc (modified) (3 diffs)
• DelphesFormula.h (modified) (2 diffs)

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]");
 
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
@@ -77 +79 @@
 //------------------------------------------------------------------------------
 
-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.;
+  if (candidate) {
+    d0 = candidate->D0;
+    dz = candidate->DZ;
+    ctgTheta = candidate->CtgTheta;
+    radius = candidate->Position.Pt();
+  }
+    
   Double_t x[4] = {pt, eta, phi, energy};
-  Double_t params[3] = {d0, dz, ctgTheta};
+  Double_t params[4] = {d0, dz, ctgTheta, radius};
   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);
 };