Changeset 8684 for trunk/MagicSoft

Timestamp:

08/20/07 18:03:54 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mars.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mars.cc

@@ -45 +45 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << " mars [options] filename|number [path]" << endl << endl;
+    gLog << " mars [options] filename|number" << endl << endl;
     gLog << " Arguments:" << endl;
-    gLog << "   filename: Name of a merpped raw file, a calibrated (Y)," << endl;
+    gLog << "   filename: Name of a merpped raw file, a calibrated (Y) file," << endl;
     gLog << "             sequence file or sequence number." << endl;
-    gLog << "   path:     Path where the data is stored in case of a" << endl;
-    gLog << "             sequence (datacenter default if omitted)." << endl << endl;
     gLog << " Options:" << endl;
+    gLog << "   --ind=path                Path to files, valid if sequence file or number given." << endl;
     gLog << "   --config=mars.rc:         Change configuration file" << endl;
     gLog << "                             <not yet implemented!>" << endl;
@@ -104 +103 @@
 
     //const Bool_t  kIsSequence = arg.HasOnlyAndRemove("--seq");
-    const TString kConfig = arg.GetStringAndRemove("--config=", "mars.rc");
+    const TString kConfig  = arg.GetStringAndRemove("--config=", "mars.rc");
+    const TString kInpathD = arg.GetStringAndRemove("--ind=", "");
 
     if (arg.GetNumOptions()>0)
@@ -117 +117 @@
     // check for the right usage of the program
     //
-    if (arg.GetNumArguments()>2)
+    if (arg.GetNumArguments()>1)
     {
         gLog << warn << "WARNING - Too many arguments..." << endl;
@@ -128 +128 @@
     //
     const TString kFilename = arg.GetArgumentStr(0);
-    const TString kInpathD  = arg.GetArgumentStr(1);
 
     //if (!kIsSequence && !InflateRun(kFilename))
@@ -144 +143 @@
     if (gROOT->IsBatch() || !gClient)
     {
-        gLog << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;
+        gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl;
         return 1;
     }