Changes in classes/DelphesFormula.cc [730bc64:3b5d79a] in git

File:

• classes/DelphesFormula.cc (modified) (4 diffs)

classes/DelphesFormula.cc

@@ -16 +16 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 
 #include "classes/DelphesFormula.h"
@@ -54 +53 @@
   for(it = expression; *it; ++it)
   {
-    if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
+    if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\') continue;
     buffer.Append(*it);
   }
@@ -61 +60 @@
   buffer.ReplaceAll("phi", "z");
   buffer.ReplaceAll("energy", "t");
+  buffer.ReplaceAll("d0", "[0]");
+  buffer.ReplaceAll("dz", "[1]");
+  buffer.ReplaceAll("ctgTheta", "[2]");
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
+  TFormula::SetMaxima(100000, 1000, 1000000);
+#endif
 
-
-  #if ROOT_VERSION_CODE < ROOT_VERSION(6,0,0)
-    TFormula::SetMaxima(100000,1000,1000000);
-  #endif
-  
   if(TFormula::Compile(buffer) != 0)
   {
@@ -77 +77 @@
 //------------------------------------------------------------------------------
 
-Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi, Double_t energy)
+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 x[4] = {pt, eta, phi, energy};
-   return EvalPar(x);
+  Double_t x[4] = {pt, eta, phi, energy};
+  Double_t params[3] = {d0, dz, ctgTheta};
+  return EvalPar(x, params);
 }