Changeset 9207 for trunk

Timestamp:

01/05/09 17:46:30 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (2 diffs)
• merpp.cc (modified) (1 diff)
• sponde.cc (modified) (3 diffs)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
    * mhbase/MH.h:
      - commited missing changes from last year
+
+   * merpp.cc:
+     - fixed a description
+
+   * sponde.cc:
+     - added "Multiple dataset at once"
+
+   * star.cc:
+     - removed obsolete -ff option from output

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -297 +297 @@
         {
         case MStatusDisplay::kLoopPause:
-            fDisplay->SetStatusLine1("Paused.");
+            fDisplay->SetStatusLine1(MString::Format("Paused after %d", num-1));
             while (fDisplay && fDisplay->CheckStatus()==MStatusDisplay::kLoopPause)
             {
@@ -303 +303 @@
                 gSystem->Sleep(1);
             }
-            break;
+            // FALLTHROUGH
         case MStatusDisplay::kLoopStep:
-            fDisplay->SetPause();
+            if (fDisplay && fDisplay->CheckStatus()==MStatusDisplay::kLoopStep)
+                fDisplay->SetPause();
+            // FALLTHROUGH
         case MStatusDisplay::kLoopNone:
             break;

trunk/MagicSoft/Mars/merpp.cc

@@ -59 +59 @@
     gLog << " Arguments:" << endl;
     gLog << "   [tel:]seqnumber           Telescope and sequence number to mbe merpped." << endl;
-    gLog << "   inpath                    The input files whether the CC files are." << endl;
+    gLog << "   inpath                    The input  path where the CC files   are." << endl;
     gLog << "   outpath                   The output path where the outputfile are or stored." << endl;
     gLog << "   sumfile.txt               A central control report summary file (--summary can be omitted)." << endl;

trunk/MagicSoft/Mars/sponde.cc

@@ -68 +68 @@
     gLog << "   --print-files             Print Files taken from Sequences ('+' found, '-' missing)" << endl;
     gLog << "   --config=sponde.rc        Resource file [default=sponde.rc]" << endl;
+    gLog << "   --ind=path                Path to mc/star files [default=datacenter path]"  << endl;
+    gLog << "   --ins=path                Path to sequence files [default=datacenter path]"   << endl;
+    gLog << "   --dataset=number          Choose a dataset from a collection of datasets"     << endl;
+    gLog << "                             in your file (for more details see MDataSet)"       << endl;
     gLog << endl;
     gLog << "   --version, -V             Show startup message with version number" << endl;
@@ -112 +116 @@
     const Bool_t  kPrintSeq     =  arg.HasOnlyAndRemove("--print-ds");
     const Bool_t  kPrintFiles   =  arg.HasOnlyAndRemove("--print-files");
+    const Int_t   kNumDataset    = arg.GetIntAndRemove("--dataset=", -1);
+    const TString kPathDataFiles = arg.GetStringAndRemove("--ind=",  "");
+    const TString kPathSequences = arg.GetStringAndRemove("--ins=",  "");
     const Bool_t  kDebugMem     =  arg.HasOnlyAndRemove("--debug-mem");
     Int_t  kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0;
@@ -193 +200 @@
     // Setup sequence and check its validity
     //
-    MDataSet seq(kDataset);
+    MDataSet seq(kDataset, (UInt_t)kNumDataset, kPathSequences, kPathDataFiles);
     if (kPrintSeq || kPrintFiles)
     {

trunk/MagicSoft/Mars/star.cc

@@ -63 +63 @@
     gLog << "   -q                        Quit when job is finished" << endl;
     gLog << "   -f                        Force overwrite of existing files" << endl;
-    gLog << "   -ff                       Force execution if not all files found" << endl;
+//    gLog << "   -ff                       Force execution if not all files found" << endl;
     gLog << "   --ind=path                Path where to search for the calibrated data (Y)" << endl;
     gLog << "                             [default=standard path in datacenter]" << endl;
     gLog << "   --out=path                Path to write the all results to [def=local path]" << endl;
-    gLog << "                             (overwrites --outc and --outy)" << endl;
     gLog << "   --dev-null                Suppress output of I-files (for test purpose)" << endl;
     gLog << "   --no-muons                Switch off Muon analysis (for fast tests)" << endl;