Changeset 19817 for trunk

Timestamp:

10/27/19 20:23:49 (5 years ago)

Author:

tbretz

Message:

Sorry, works with 6.18 and not 6.14

File:

• trunk/FACT++/src/root2csv.cc (modified) (2 diffs)

trunk/FACT++/src/root2csv.cc

@@ -113 +113 @@
         "   --add.Area='TMath::TwoPi()*Width*Length'\n"
         "\n"
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,18,00)
         "Note that functions which require two arguments (e.g. atan2) can be used in "
         "a column (i.e. with --add) but can not be references in an alias.\n"
@@ -523 +523 @@
         const string val  = conf.Get<string>(*it);
 
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,18,00)
         if (val.find_first_of(',')!=string::npos)
         {
-            cerr << "\nERROR - Alias contains comma... functions with two arguments do not work as alias in root 5!\n";
+            cerr << "\nERROR - Alias contains comma: Functions with two arguments";
+            cerr << "\ndo not work as alias with root versions less than v6.18!\n";
             cerr << "   " << name << " = " << val << endl;
             return 2;