Changeset c1ce3fe in git for classes

Timestamp:

Jun 29, 2015, 10:28:05 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

ff37d75

Parents:

839deb7

Message:

adapt DelphesCylindricalFormula and PhotonConversions to ROOT 6.04

Location:

classes

Files:

• DelphesCylindricalFormula.cc (modified) (3 diffs)
• DelphesCylindricalFormula.h (modified) (1 diff)

classes/DelphesCylindricalFormula.cc

@@ -23 +23 @@
 
 #include <stdexcept>
-#include <string>
 
 using namespace std;
@@ -51 +50 @@
 Int_t DelphesCylindricalFormula::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("r", "x");
+  buffer.ReplaceAll("phi", "y");
+  buffer.ReplaceAll("z", "z");
+  if(TFormula::Compile(buffer) != 0)
   {
     throw runtime_error("Invalid formula.");
@@ -69 +71 @@
 Double_t DelphesCylindricalFormula::Eval(Double_t r, Double_t phi, Double_t z)
 {
-   Double_t x[3] = {r, phi, z};
-   return EvalPar(x);
+  Double_t x[3] = {r, phi, z};
+  return EvalPar(x);
 }
 
 //------------------------------------------------------------------------------
-
-Int_t DelphesCylindricalFormula::DefinedVariable(TString &chaine, Int_t &action)
-{
-  action = kVariable;
-  if(chaine == "r")
-  {
-    if(fNdim < 1) fNdim = 1;
-    return 0;
-  }
-  else if(chaine == "phi")
-  {
-    if(fNdim < 2) fNdim = 2;
-    return 1;
-  }
-  else if(chaine == "z")
-  {
-    if(fNdim < 3) fNdim = 3;
-    return 2;
-  }
-  return -1;
-}
-
-//------------------------------------------------------------------------------

classes/DelphesCylindricalFormula.h

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