Changeset 7487 for trunk/MagicSoft/Mars

Timestamp:

02/09/06 10:35:38 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mreport/MReport.cc (modified) (1 diff)
• mreport/MReportCC.cc (modified) (1 diff)
• mreport/MReportStarguider.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/02/09 Thomas Bretz
+
+   * mreport/MReport.cc:
+     - invented new fake CC report file version 200509300 for a change
+       in the starguider format (the already implemented last values
+       dissapeared again!) which is not noticed in the format version.
+
+   * mreport/MReportCC.cc, mreport/MReportStarguider.cc:
+     - fixed support for ver 200510250
+
+
+
  2006/02/08 Daniela Dorner
 

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -143 +143 @@
         ver=200502240;
 
+    if (ver==200508290 && GetMjd()>53643.5)
+        ver=200509300;
+
     // Interprete body (contents) of report
     const Int_t rc = InterpreteBody(str, ver);

trunk/MagicSoft/Mars/mreport/MReportCC.cc

@@ -244 +244 @@
         return kCONTINUE;
 
-    if (ver>200510250)
+    if (ver>=200510250)
         if (!InterpreteRecTemp(str))
             return kCONTINUE;

trunk/MagicSoft/Mars/mreport/MReportStarguider.cc

@@ -99 +99 @@
     str = str.Strip(TString::kBoth);
 
-    if (ver < 200503170)
+    if (ver<200503170)
     {
         // Fix a problem with the units
@@ -110 +110 @@
     MAstro::String2Angle(str, fNominalAz);   // Nom Az
 
-    if (ver < 200503220)
+    if (ver<200503220)
     {
         // Until a fix in the software the written position was nonsense
@@ -129 +129 @@
     str = str.Strip(TString::kBoth);
 
-    if (ver >= 200508290)
-    {
+    // Seems that hasn't yet been implemented
+    if (ver>=200508290 && ver<200509300)
+    {          
         // For the momment this are only placeholders....
         Float_t dx, dy;