Changeset 3364 for trunk/MagicSoft/Mars/merpp.cc

Timestamp:

03/01/04 10:26:20 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/merpp.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/merpp.cc

@@ -85 +85 @@
     Int_t y=0, ms=0, mon=0, d=0, h=0, m=0, s=0;
 
-    if (7!=sscanf(str.Data(), "%d-%d-%d/%d:%d:%d.%d", &y, &mon, &d, &h, &m, &s, &ms))
+    const Int_t n = sscanf(str.Data(), "%d-%d-%d/%d:%d:%d.%d", &y, &mon, &d, &h, &m, &s, &ms);
+
+    if (n<6 || n>7)
+    {
+        gLog << warn << "'" << str << "' no valid Time... ignored." << endl;
         return MTime();
+    }
 
     MTime t;
@@ -122 +127 @@
     MTime kTimeStart(AnalyseTime(arg.GetStringAndRemove("--start=")));
     MTime kTimeStop(AnalyseTime(arg.GetStringAndRemove("--stop=")));
-    kTimeStart.SetName("MTimeStart");
-    kTimeStop.SetName("MTimeStop");
 
     const Int_t   kRunNumber   = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1;
@@ -150 +153 @@
     const Bool_t isreport = kNamein.EndsWith(".rep");
     const Bool_t isdc     = kNamein.EndsWith(".txt");
-    const Bool_t israw    = !isreport && !israw;
+    const Bool_t israw    = !isreport && !isdc;
 
     if (!kNamein.EndsWith(".raw") && israw)