Changeset 9141 for trunk/MagicSoft/Mars

Timestamp:

10/13/08 15:54:30 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• callisto.cc (modified) (1 diff)
• ganymed.cc (modified) (1 diff)
• mars.cc (modified) (1 diff)
• mbase/MArgs.cc (modified) (9 diffs)
• mbase/MArgs.h (modified) (2 diffs)
• merpp.cc (modified) (1 diff)
• mhist/MHEvent.cc (modified) (1 diff)
• mjobs/MJMerpp.cc (modified) (1 diff)
• mraw/MRawRunHeader.cc (modified) (1 diff)
• mreport/MReport.cc (modified) (2 diffs)
• mreport/MReportCC.cc (modified) (2 diffs)
• readdaq.cc (modified) (1 diff)
• readraw.cc (modified) (1 diff)
• showlog.cc (modified) (1 diff)
• showplot.cc (modified) (1 diff)
• sinope.cc (modified) (2 diffs)
• sponde.cc (modified) (1 diff)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -41 +41 @@
 
    * mreport/MReport.cc:
-     - implemented a new version fix, namely 20080930
+     - implemented a new version fix, namely 200809300
 
    * mreport/MReportCC.cc:
-     - implemented interpretation of new format 200805190
+     - implemented interpretation of new format 200809030
 
 

trunk/MagicSoft/Mars/NEWS

@@ -3 +3 @@
 == <cvs> ==
 
-  ;Database
+ ;general
+
+   * All command line options after -- are now interpreted as 
+     arguments (usually everything which doesn't start with a minus)
+     rather than options (usually everything which starts with a
+     minus). This allows to use file names starting with a -
+
+ ;Database
 
    * Added informations about the DC currents (fMinCurrents, fMedCurrents
-     and fMaxCurrents)
+     and fMaxCurrents). The values are retrieved from the plots showing
+     the average DC currents of all pixels versus time.
 
  ;automatic analyis
@@ -21 +29 @@
      now steered via database. Consequently the plots are faster and 
      reliable up-to-date. 
+
+ ;merpp
+
+   * Fixed merpping of raw-files (the runheader tree got the name RunHeader
+     instead of RunHeaders)
+
+   * Now allows to merpp files newer than 2008/09/03.
 
 

trunk/MagicSoft/Mars/callisto.cc

@@ -153 +153 @@
     // Evaluate arguments
     //
-    MArgs arg(argc, argv, kTRUE);
+    MArgs arg(argc, argv);
     gLog.Setup(arg);
 

trunk/MagicSoft/Mars/ganymed.cc

@@ -116 +116 @@
     // Evaluate arguments
     //
-    MArgs arg(argc, argv, kTRUE);
+    MArgs arg(argc, argv);
     gLog.Setup(arg);
 

trunk/MagicSoft/Mars/mars.cc

@@ -89 +89 @@
     // Evaluate arguments
     //
-    MArgs arg(argc, argv, kTRUE);
+    MArgs arg(argc, argv);
     gLog.Setup(arg);
 

trunk/MagicSoft/Mars/mbase/MArgs.cc

@@ -31 +31 @@
 //
 // Arguments beginning with a trailing '-' are called 'options'.
+//
 // Arguments without a trailing '-' are considered 'arguments'
+//
+// All arguments appearing after '--' on the commandline are
+//  also cosidered as 'arguments'
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -57 +61 @@
 //  fArgv: A TList containing all other command line arguments
 //
-//  If root==kFALSE all root commandline options are deleted from
-//  the list, namely: -b
-//
-MArgs::MArgs(int argc, char **argv, Bool_t root) : fArgc(argc)
+MArgs::MArgs(int argc, char **argv) : fArgc(argc)
 {
     TString cmdline;
@@ -76 +77 @@
         fArgv.Add(new MArgsEntry(argv[i]));
     }
-
-    if (root)
-        return;
-
-    HasOnlyAndRemove("-b");
+}
+
+// --------------------------------------------------------------------------
+//
+//  Remove all root commandline options from the list,
+//  namely: -b, -n, -q, -l, -?, -h, --help, -config
+//
+//  Returns the number of found root options (max 8)
+//
+Int_t MArgs::RemoveRootArgs()
+{
+    Int_t n = 0;
+
+    n += HasOnlyAndRemove("-b");
+    n += HasOnlyAndRemove("-n");
+    n += HasOnlyAndRemove("-q");
+    n += HasOnlyAndRemove("-l");
+    n += HasOnlyAndRemove("-?");
+    n += HasOnlyAndRemove("-h");
+    n += HasOnlyAndRemove("--help");
+    n += HasOnlyAndRemove("-config");
+
+    return n;
 }
 
@@ -109 +128 @@
         TString *s = NULL;
         while ((s=dynamic_cast<TString*>(Next())))
-            if (s->BeginsWith("-"))
+            if (*s!="--" && s->BeginsWith("-"))
                 gLog << *s << endl;
         return;
@@ -119 +138 @@
         TString *s = NULL;
         while ((s=dynamic_cast<TString*>(Next())))
-            if (!s->BeginsWith("-"))
+            if (*s!="--" && !s->BeginsWith("-"))
                 gLog << *s << endl;
         return;
@@ -283 +302 @@
     Int_t num = 0;
 
-    TIter Next(&fArgv);
-    TString *s = NULL;
-    while ((s=dynamic_cast<TString*>(Next())))
-    {
-        if (s->BeginsWith("-"))
+    Bool_t allarg = kFALSE;
+
+    TIter Next(&fArgv);
+    TString *s = NULL;
+    while ((s=dynamic_cast<TString*>(Next())))
+    {
+        if (*s=="--")
+        {
+            allarg = kTRUE;
+            continue;
+        }
+
+        if (s->BeginsWith("-") && !allarg)
             continue;
 
@@ -305 +332 @@
     Int_t num = 0;
 
-    TIter Next(&fArgv);
-    TString *s = NULL;
-    while ((s=dynamic_cast<TString*>(Next())))
-        if (!s->BeginsWith("-"))
-            num++;
+    Bool_t allarg = kFALSE;
+
+    TIter Next(&fArgv);
+    TString *s = NULL;
+    while ((s=dynamic_cast<TString*>(Next())))
+    {
+        if (*s=="--")
+        {
+            allarg = kTRUE;
+            continue;
+        }
+
+        if (s->BeginsWith("-") && !allarg)
+            continue;
+
+        num++;
+    }
 
     return num;
@@ -325 +364 @@
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
+    {
+        if (*s=="--")
+            return num;
+
         if (s->BeginsWith("-"))
             num++;
+    }
 
     return num;
@@ -337 +381 @@
 Int_t MArgs::GetNumEntries() const
 {
-    return fArgv.GetSize();
+    return fArgv.FindObject("--") ? fArgv.GetSize()-1 : fArgv.GetSize();
 }
 

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -31 +31 @@
 
 public:
-    MArgs(int argc, char **argv, Bool_t root=kFALSE);
+    MArgs(int argc, char **argv);
 
     // TObject
@@ -40 +40 @@
 
     // MArgs
+    Int_t    RemoveRootArgs();
+
     Int_t    GetInt(const TString name) const;
     Double_t GetFloat(const TString name) const;

trunk/MagicSoft/Mars/merpp.cc

@@ -152 +152 @@
         return 2;
     }
+
+    arg.RemoveRootArgs();
 
     const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -266 +266 @@
         s += fRawEvtHeader->GetDAQEvtNumber();
     }
+
     if (fRawEvtHeader && fRawRunHeader)
         s += " of ";
 
     if (fRawRunHeader)
-    {
-        s += "M";
         s += fRawRunHeader->GetStringID();
-    }
+
     if (fTime)
     {

trunk/MagicSoft/Mars/mjobs/MJMerpp.cc

@@ -150 +150 @@
     read.SetForceMode(fForceProcessing);
 
-    write.AddContainer("MRawRunHeader",  "RunHeader");
+    write.AddContainer("MRawRunHeader",  "RunHeaders");
     write.AddContainer("MTime",          "Events");
     write.AddContainer("MRawEvtHeader",  "Events");

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -492 +492 @@
 Bool_t MRawRunHeader::Fixes()
 {
-    if (fFormatVersion>8)
+    if (fFormatVersion>8 && fRunNumber>326152)
     {
         fNumEvents--;
         fNumEventsRead--;
-        *fLog << inf << "Format >V8: Stored number of events decreased by 1." << endl;
+        *fLog << inf << "Format >V8 and No>326152: Stored number of events decreased by 1." << endl;
     }
 

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -167 +167 @@
 //    200510250  | 53813.5 |         |  200603190
 //    200604010  | 53863.5 |         |  200605080
+//    200605190  | 54711.5 |         |  200809030
 //
 Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver)
@@ -200 +201 @@
         ver=200605080;
 
+    if (ver==200605190 && GetMjd()>54711.5)
+        ver=200809030;
+
     // Interprete body (contents) of report
     const Int_t rc = InterpreteBody(str, ver);

trunk/MagicSoft/Mars/mreport/MReportCC.cc

@@ -114 +114 @@
     if (n!=6)
     {
-        cout << n << endl;
         *fLog << warn << "WARNING - Wrong number of arguments (should be 6)." << endl;
         return kFALSE;
@@ -120 +119 @@
 
     str.Remove(0, len);
+
+    if (ver>=200809030)
+    {
+        if (!CheckTag(str, "SCHEDULE "))
+            return kFALSE;
+
+        str = str.Strip(TString::kBoth);
+
+        // [Sourcename] sourcecategory
+        const Ssiz_t pos1 = str.First(' ');
+        if (pos1<0)
+        {
+            *fLog << warn << "WARNING - Wrong number of arguments (should be 1 or 2)." << endl;
+            return kFALSE;
+        }
+
+        const TString str1 = str(0, pos1);
+
+        str.Remove(0, pos1);
+        str = str.Strip(TString::kBoth);
+
+        if (!str1.IsDigit())
+        {
+            const Ssiz_t pos2 = str.First(' ');
+            if (pos2<0)
+            {
+                *fLog << warn << "WARNING - Wrong number of arguments (should be 1 or 2)." << endl;
+                return kFALSE;
+            }
+
+            const TString str2 = str(0, pos2);
+
+            str.Remove(0, pos2);
+
+            if (!str2.IsDigit())
+            {
+                *fLog << warn << "WARNING - Wrong type of second argument." << endl;
+                return kFALSE;
+            }
+        }
+    }
 
     return kTRUE;

trunk/MagicSoft/Mars/readdaq.cc

@@ -79 +79 @@
     }
 
+    arg.RemoveRootArgs();
+
     //
     // Set verbosity to highest level.

trunk/MagicSoft/Mars/readraw.cc

@@ -88 +88 @@
         return 2;
     }
+
+    arg.RemoveRootArgs();
 
     // Set usage of decimal values

trunk/MagicSoft/Mars/showlog.cc

@@ -80 +80 @@
         return 2;
     }
+
+    arg.RemoveRootArgs();
 
     const Bool_t kNoColors = arg.HasOnly("--no-colors") || arg.HasOnly("-a");

trunk/MagicSoft/Mars/showplot.cc

@@ -148 +148 @@
     // Evaluate arguments
     //
-    MArgs arg(argc, argv, kTRUE);
+    MArgs arg(argc, argv);
     gLog.Setup(arg);
 

trunk/MagicSoft/Mars/sinope.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: sinope.cc,v 1.13 2008-06-02 08:46:36 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: sinope.cc,v 1.14 2008-10-13 14:53:24 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -301 +301 @@
     // Evaluate arguments
     //
-    MArgs arg(argc, argv, kTRUE);
+    MArgs arg(argc, argv);
     gLog.Setup(arg);
 

trunk/MagicSoft/Mars/sponde.cc

@@ -94 +94 @@
     // Evaluate arguments
     //
-    MArgs arg(argc, argv, kTRUE);
+    MArgs arg(argc, argv);
     gLog.Setup(arg);
 

trunk/MagicSoft/Mars/star.cc

@@ -102 +102 @@
     // Evaluate arguments
     //
-    MArgs arg(argc, argv, kTRUE);
+    MArgs arg(argc, argv);
     gLog.Setup(arg);