Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7638)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7639)
@@ -18,4 +18,19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/04/13 Thomas Bretz
+
+   * mreport/MReport.cc:
+     - added new fake arehucas versions to fix a problem with the 
+       starguider reports
+
+   * mreport/MReportFileRead.cc:
+     - increased informations in warning output
+
+   * mreport/MReportStarguider.cc:
+     - fixed a problem with the starguider reports between 6.3.2006 and
+       19.3.2006
+
+
 
  2006/04/13 Daniel Hoehne
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 7638)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 7639)
@@ -2,4 +2,6 @@
 
  *** Version  <cvs>
+
+   - merpp: fixed a problem with reading the starguider reports after 6.3.2006
 
    - callisto: At some times six pixels had to be exchanged manually in the
@@ -34,4 +36,7 @@
          (effective on-time divided by the observation time)
 
+   - macros: optim*.C: by skipping some obsolete calles in the eventloop
+     the optimization became a lot faster
+
    - ganymed: In the second loop the MHNewImagePar histograms disapeared.
      To display them just delete the pads displayed on top.
@@ -46,4 +51,7 @@
        + MHDisp.fScaleMin: 0.325
        + MHDisp.fScaleMax: 0.475
+
+   - sponde: Added a new tab showing the effective collection area after
+     trigger (including the software trigger)
 
 
Index: /trunk/MagicSoft/Mars/mreport/MReport.cc
===================================================================
--- /trunk/MagicSoft/Mars/mreport/MReport.cc	(revision 7638)
+++ /trunk/MagicSoft/Mars/mreport/MReport.cc	(revision 7639)
@@ -120,6 +120,9 @@
 //   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,4 +149,10 @@
         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);
Index: /trunk/MagicSoft/Mars/mreport/MReportFileRead.cc
===================================================================
--- /trunk/MagicSoft/Mars/mreport/MReportFileRead.cc	(revision 7638)
+++ /trunk/MagicSoft/Mars/mreport/MReportFileRead.cc	(revision 7639)
@@ -213,8 +213,8 @@
     {
     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
Index: /trunk/MagicSoft/Mars/mreport/MReportStarguider.cc
===================================================================
--- /trunk/MagicSoft/Mars/mreport/MReportStarguider.cc	(revision 7638)
+++ /trunk/MagicSoft/Mars/mreport/MReportStarguider.cc	(revision 7639)
@@ -130,10 +130,11 @@
 
     // 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,5 +147,4 @@
 
     return str.IsNull() ? kTRUE : kCONTINUE;
-
 }