Changeset 3b5d79a in git

Timestamp:

Feb 19, 2019, 6:02:00 PM (6 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, llp, master

Children:

2116fdf, af181bf

Parents:

8552d52

Message:

fix ROOT version in DelphesFormula.cc and DelphesTF2.cc

Location:

classes

Files:

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

classes/DelphesFormula.cc

@@ -64 +64 @@
   buffer.ReplaceAll("ctgTheta", "[2]");
 
-#if ROOT_VERSION_CODE < ROOT_VERSION(6, 0, 0)
+#if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
   TFormula::SetMaxima(100000, 1000, 1000000);
 #endif

classes/DelphesTF2.cc

@@ -32 +32 @@
 {
 
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 04, 00)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 3, 0)
   fFormula = new TFormula();
 #endif
@@ -63 +63 @@
   buffer.ReplaceAll("z", "x");
   buffer.ReplaceAll("t", "y");
-#if ROOT_VERSION_CODE < ROOT_VERSION(6, 04, 00)
+#if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0)
   if(TF2::Compile(buffer) != 0)
 #else