Changeset 8011 for trunk/MagicSoft/Mars/callisto.cc

Timestamp:

10/07/06 14:57:12 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/callisto.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/callisto.cc

@@ -33 +33 @@
     gLog << "                 Callisto - MARS V" << MARSVER            << endl;
     gLog << "    MARS -- CALibrate LIght Signals and Time Offsets"     << endl;
-    gLog << "      Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
+    gLog << "      Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
     gLog << "========================================================" << endl;
     gLog << endl;
@@ -142 +142 @@
 int main(int argc, char **argv)
 {
+    if (!MARS::CheckRootVer())
+        return 0xff;
+
     //
     // Evaluate arguments
@@ -198 +201 @@
         kModeC = kTRUE;
 
+    //
+    // check for the right usage of the program
+    //
+    if (arg.GetNumArguments()!=1)
+    {
+        Usage();
+        return 2;
+    }
+
+    if (arg.GetNumOptions()>0)
+    {
+        gLog << warn << "WARNING - Unknown commandline options..." << endl;
+        arg.Print("options");
+        gLog << endl;
+        return 2;
+    }
+
     if (!kModeC && !kModeY /*&& !kUseTest*/)
     {
-        gLog << err << "Neither calibration (-c) nor signal extraction (-y) or test-mode (--use-test) specified!" << endl;
+        gLog << err << "Neither calibration (-c), signal extraction (-y) or test-mode (--use-test)" << endl;
+        gLog <<        "specified! You can also give the operation mode by the options defining the" << endl;
+        gLog <<        "output path --outc, --outy or --out." << endl;
         Usage();
         return 2;
@@ -228 +250 @@
     if (kModeC && kModeY)
         kInpathY = kOutpathC;
-
-    if (arg.GetNumOptions()>0)
-    {
-        gLog << warn << "WARNING - Unknown commandline options..." << endl;
-        arg.Print("options");
-        gLog << endl;
-        return 2;
-    }
-
-    //
-    // check for the right usage of the program
-    //
-    if (arg.GetNumArguments()!=1)
-    {
-        Usage();
-        return 2;
-    }
 
     //