Changeset 7208 for trunk/MagicSoft/Mars/mreport

Timestamp:

07/22/05 11:11:26 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReport.cc (modified) (3 diffs)
• MReport.h (modified) (2 diffs)
• MReportCamera.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -29 +29 @@
 //  This is a base class for all reports comming from subsystems stored in
 //  a report file.
+//
+//
+// Due to wrong assignment by arehucas the veriosn number for some
+// cases is replaced.
+//
+//   Old Version | MjdMin  | MjdMax  | New Version
+//  -------------+---------+---------+-------------
+//   200504130   | 53548.0 | 53567.0 | 200506300
+//   200503170   | 53446.5 | 53447.5 | 200502240
+//
 //
 //  Be carefull: The class name of all classes derived from this class
@@ -105 +115 @@
 // SetupReading must be called successfully before.
 //
+// Due to wrong assignment by arehucas the veriosn number for some
+// cases is replaced.
+//
+//   Old Version | MjdMin  | MjdMax  | New Version
+//  -------------+---------+---------+-------------
+//   200504130   | 53548.0 | 53567.0 | 200506300
+//   200503170   | 53446.5 | 53447.5 | 200502240
+//
 Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver)
 {
+    // Interprete header (time, status, etc) of report
     if (!InterpreteHeader(str))
         return kFALSE;
@@ -116 +135 @@
         return -1;
 
+    // Due to wrong assignment by arehucas the veriosn number for some
+    // cases is replaced.
+    if (ver==200504130 && GetMjd()>53548 && GetMjd()<53567)
+        ver=200506300;
+
+    if (ver==200503170 && GetMjd()>53446.5 && GetMjd()<53447.5)
+        ver=200502240;
+
+    // Interprete body (contents) of report
     const Int_t rc = InterpreteBody(str, ver);
     if (rc != kTRUE)

trunk/MagicSoft/Mars/mreport/MReport.h

@@ -5 +5 @@
 #include "MParContainer.h"
 #endif
-
+#include "MTime.h"
 class MTime;
 class MParList;
@@ -42 +42 @@
 
     Byte_t GetState() const { return fState; }
+    Double_t GetMjd() const { return fTime ? fTime->GetMjd() : -1; }
 
     ClassDef(MReport, 1) // Base class for control reports

trunk/MagicSoft/Mars/mreport/MReportCamera.cc

@@ -622 +622 @@
         return kCONTINUE;
 
-    if (ver >= gkActiveLoadControlVersNum)
+    if (ver > gkActiveLoadControlVersNum)
     {
          if (!InterpreteActiveLoad(str))