Changeset d77b51d in git for classes/DelphesTF2.cc

Timestamp:

Sep 29, 2015, 2:08:10 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a98c7ef

Parents:

d870fc5 (diff), 06ec139 (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.

Message:

Merge remote-tracking branch 'upstream/master'

File:

• classes/DelphesTF2.cc (modified) (3 diffs)

classes/DelphesTF2.cc

@@ -18 +18 @@
 
 #include "classes/DelphesTF2.h"
+
+#include "RVersion.h"
 #include "TString.h"
+
 #include <stdexcept>
-#include <string>
 
 using namespace std;
@@ -34 +36 @@
 
 DelphesTF2::DelphesTF2(const char *name, const char *expression) :
-  TF2(name,expression)
+  TF2(name, expression)
 {
 }
@@ -46 +48 @@
 //------------------------------------------------------------------------------
 
-Int_t DelphesTF2::DefinedVariable(TString &chaine, Int_t &action)
+Int_t DelphesTF2::Compile(const char *expression)
 {
-  action = kVariable;
-  if(chaine == "z")
+  TString buffer;
+  const char *it;
+  for(it = expression; *it; ++it)
   {
-    if(fNdim < 1) fNdim = 1;
-    return 0;
+    if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
+    buffer.Append(*it);
   }
-  else if(chaine == "t")
+  buffer.ReplaceAll("z", "x");
+  buffer.ReplaceAll("t", "y");
+#if  ROOT_VERSION_CODE < ROOT_VERSION(6,04,00)
+  if(TF2::Compile(buffer) != 0)
+#else
+  if(TF2::GetFormula()->Compile(buffer) != 0)
+#endif
   {
-    if(fNdim < 2) fNdim = 2;
-    return 1;
+    throw runtime_error("Invalid formula.");
   }
-  return -1;
+  return 0;
 }