Changeset 7639 for trunk/MagicSoft/Mars/mreport

Timestamp:

04/13/06 15:59:48 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReport.cc (modified) (2 diffs)
• MReportFileRead.cc (modified) (1 diff)
• MReportStarguider.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -120 +120 @@
 //   Old Version | MjdMin  | MjdMax  | New Version
 //  -------------+---------+---------+-------------
-//   200504130   | 53548.0 | 53567.0 | 200506300
-//   200503170   | 53446.5 | 53447.5 | 200502240
+//    200504130  | 53548.0 | 53567.0 |  200506300
+//    200503170  | 53446.5 | 53447.5 |  200502240
+//    200508290  | 53643.5 |         |  200509300
+//    200510250  | 53801.5 | 53813.5 |  200603080
+//    200510250  | 53813.5 |         |  200603190
 //
 Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver)
@@ -146 +149 @@
         ver=200509300;
 
+    if (ver==200510250 && GetMjd()>53801.5 && GetMjd()<53813.5)
+        ver=200603080;
+
+    if (ver==200510250 && GetMjd()>53813.5)
+        ver=200603190;
+
     // Interprete body (contents) of report
     const Int_t rc = InterpreteBody(str, ver);

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -213 +213 @@
     {
     case kFALSE:
-        *fLog << err << "ERROR - Interpretation of '" << rep->GetName() << "' failed (Line #" << fNumLine << ")... abort." << endl;
+        *fLog << err << "ERROR - Interpreting '" << rep->GetName() << "' failed (l." << fNumLine << ", V" << fVersion << ")... abort." << endl;
         break;
     case kCONTINUE:
-        *fLog << warn << "WARNING - Interpretation of '" << rep->GetName() << "' failed (Line #" << fNumLine << ")... skipped." << endl;
+        *fLog << warn << "WARNING - Interpreting '" << rep->GetName() << "' failed (l." << fNumLine << ", V" << fVersion << ")... skipped." << endl;
         break;
     case -1: // This is the special case: out of time limit

trunk/MagicSoft/Mars/mreport/MReportStarguider.cc

@@ -130 +130 @@
 
     // Seems that hasn't yet been implemented
-    if (ver>=200508290 && ver<200509300)
+    if ((ver>=200508290 && ver<200509300) ||
+        (ver>=200603080))
     {          
         // For the momment this are only placeholders....
         Float_t dx, dy;
         n=sscanf(str.Data(), "%f %f %n", &dx, &dy, &len);
-        if (n!=2)
+        if (n!=2 && ((n!=0&&n!=EOF) || ver!=200603080))
         {
             *fLog << warn << "WARNING - Not enough arguments." << endl;
@@ -146 +147 @@
 
     return str.IsNull() ? kTRUE : kCONTINUE;
-
 }