Changeset 19256 for trunk/Mars

Timestamp:

10/22/18 18:49:04 (6 years ago)

Author:

tbretz

Message:

Compatibility with root 6 -- untested

File:

• trunk/Mars/mdata/MDataPhrase.cc (modified) (2 diffs)

trunk/Mars/mdata/MDataPhrase.cc

@@ -116 +116 @@
 #include <TFormula.h>
 #if ROOT_VERSION_CODE >= ROOT_VERSION(5,26,00)
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
 #include <TFormulaPrimitive.h>
+#else
+#include <v5/TFormulaPrimitive.h>
+#endif
 #endif
 
@@ -472 +476 @@
 MDataPhrase::MDataPhrase(const char *rule, const char *name, const char *title) : fFormula(0)
 {
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
+#define TFP TFormulaPrimtive
+#else
+#define TFP ROOT::v5::TFormulaPrimitive
+#endif
+
     // More in TFormulaPrimitive.cxx
     // More in TFormulaMathInterface
-    if (!TFormulaPrimitive::FindFormula("isnan"))
-    {
-        TFormulaPrimitive::AddFormula(new TFormulaPrimitive("log2",   "log2",   (TFormulaPrimitive::GenFunc10)TMath::Log2));
-        TFormulaPrimitive::AddFormula(new TFormulaPrimitive("fabs",   "fabs",   (TFormulaPrimitive::GenFunc10)TMath::Abs));
-        TFormulaPrimitive::AddFormula(new TFormulaPrimitive("floor",  "floor",  (TFormulaPrimitive::GenFunc10)TMath::Floor));
-        TFormulaPrimitive::AddFormula(new TFormulaPrimitive("ceil",   "ceil",   (TFormulaPrimitive::GenFunc10)TMath::Ceil));
-
-        TFormulaPrimitive::AddFormula(new TFormulaPrimitive("nint",   "nint",   (TFormulaPrimitive::GenFunc10)MFastFun::Nint));
-        TFormulaPrimitive::AddFormula(new TFormulaPrimitive("round",  "round",  (TFormulaPrimitive::GenFunc10)MFastFun::Nint));
-        TFormulaPrimitive::AddFormula(new TFormulaPrimitive("sgn",    "sgn",    (TFormulaPrimitive::GenFunc10)MFastFun::Sign));
-
-        TFormulaPrimitive::AddFormula(new TFormulaPrimitive("isnan",  "isnan",  (TFormulaPrimitive::GenFunc10)MFastFun::IsNaN));
-        TFormulaPrimitive::AddFormula(new TFormulaPrimitive("finite", "finite", (TFormulaPrimitive::GenFunc10)MFastFun::Finite));
+    if (!TFP::FindFormula("isnan"))
+    {
+        TFP::AddFormula(new TFP("log2",   "log2",   (TFP::GenFunc10)TMath::Log2));
+        TFP::AddFormula(new TFP("fabs",   "fabs",   (TFP::GenFunc10)TMath::Abs));
+        TFP::AddFormula(new TFP("floor",  "floor",  (TFP::GenFunc10)TMath::Floor));
+        TFP::AddFormula(new TFP("ceil",   "ceil",   (TFP::GenFunc10)TMath::Ceil));
+
+        TFP::AddFormula(new TFP("nint",   "nint",   (TFP::GenFunc10)MFastFun::Nint));
+        TFP::AddFormula(new TFP("round",  "round",  (TFP::GenFunc10)MFastFun::Nint));
+        TFP::AddFormula(new TFP("sgn",    "sgn",    (TFP::GenFunc10)MFastFun::Sign));
+
+        TFP::AddFormula(new TFP("isnan",  "isnan",  (TFP::GenFunc10)MFastFun::IsNaN));
+        TFP::AddFormula(new TFP("finite", "finite", (TFP::GenFunc10)MFastFun::Finite));
     }