Changeset d38348d in git for classes

Timestamp:

Jun 26, 2015, 11:46:42 AM (10 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fe0273c

Parents:

1d9974e (diff), f53a4d2 (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 pull request #14 from delphes/master

synchronize mergeCMS with master

Location:

classes

Files:

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

classes/DelphesFormula.cc

@@ -23 +23 @@
 
 #include <stdexcept>
-#include <string>
 
 using namespace std;
@@ -51 +50 @@
 Int_t DelphesFormula::Compile(const char *expression)
 {
-  string buffer;
+  TString buffer;
   const char *it;
   for(it = expression; *it; ++it)
   {
     if(*it == ' ' || *it == '\t' || *it == '\r' || *it == '\n' || *it == '\\' ) continue;
-    buffer.push_back(*it);
+    buffer.Append(*it);
   }
-  if(TFormula::Compile(buffer.c_str()) != 0)
+  buffer.ReplaceAll("pt", "x");
+  buffer.ReplaceAll("eta", "y");
+  buffer.ReplaceAll("phi", "z");
+  buffer.ReplaceAll("energy", "t");
+  if(TFormula::Compile(buffer) != 0)
   {
     throw runtime_error("Invalid formula.");
@@ -74 +77 @@
 
 //------------------------------------------------------------------------------
-
-Int_t DelphesFormula::DefinedVariable(TString &chaine, Int_t &action)
-{
-  action = kVariable;
-  if(chaine == "pt")
-  {
-    if(fNdim < 1) fNdim = 1;
-    return 0;
-  }
-  else if(chaine == "eta")
-  {
-    if(fNdim < 2) fNdim = 2;
-    return 1;
-  }
-  else if(chaine == "phi")
-  {
-    if(fNdim < 3) fNdim = 3;
-    return 2;
-  }
-  else if(chaine == "energy")
-  {
-    if(fNdim < 4) fNdim = 4;
-    return 3;
-  }
-  return -1;
-}
-
-//------------------------------------------------------------------------------

classes/DelphesFormula.h

@@ -35 +35 @@
 
   Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0, Double_t energy = 0);
-
-  Int_t DefinedVariable(TString &variable, Int_t &action);
 };
 

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;
 }
 

classes/DelphesTF2.h

@@ -21 +21 @@
 
 #include "TF2.h"
-#include "TFormula.h"
-
-#include <string>
 
 class DelphesTF2: public TF2
@@ -35 +32 @@
   ~DelphesTF2();
 
-  Int_t DefinedVariable(TString &variable, Int_t &action);
-
+  Int_t Compile(const char *expression);
 };
 
 #endif /* DelphesTF2_h */
-