Changeset 9462 for trunk/MagicSoft/Mars/mreport

Timestamp:

06/20/09 10:14:33 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReport.cc (modified) (2 diffs)
• MReportDrive.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -169 +169 @@
 //    200805190  | 54711.5 |         |  200809030
 //    200812040  | 54814.5 |         |  200812140
+//    200902210  | 54968.5 |         |  200905170
 //
 Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver)
@@ -208 +209 @@
         ver=200812140;
 
+    if (ver==200902210 && GetMjd()>54968.5)
+        ver=200905170;
+
     // Interprete body (contents) of report
     const Int_t rc = InterpreteBody(str, ver);

trunk/MagicSoft/Mars/mreport/MReportDrive.cc

@@ -135 +135 @@
     }
 
+    if (ver>=200805170)
+    {
+        Int_t dummy; // Starguider switched on or not
+        n=sscanf(str.Data(), "%d %n", &dummy, &len);
+        if (n!=1)
+        {
+            *fLog << warn << "WARNING - Not enough arguments." << endl;
+            return kCONTINUE;
+        }
+
+        str.Remove(0, len);
+        str = str.Strip(TString::kBoth);
+    }
+
     return str.IsNull() ? kTRUE : kCONTINUE;
 }