Changeset 2632 for trunk/MagicSoft/Mars/mreport

Timestamp:

12/10/03 11:56:33 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReport.cc (modified) (2 diffs)
• MReportCurrents.cc (modified) (5 diffs)
• MReportCurrents.h (modified) (2 diffs)
• MReportFileRead.cc (modified) (2 diffs)
• MReportFileRead.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -60 +60 @@
     int n = sscanf(str.Data(),
                    fHasReportTime ?
-                   " %d %d %d %d %d %d %d %d "
-                   "%*d %*d %*d %*d %*d %*d %*d %*d %n" :
-                   " %d %*d %*d %*d %d %d %d %d ",
+                   " %d %d %d %d %d %d %d %d %*d %*d %*d %*d %*d %*d %*d %*d %n" :
+                   " %d %d %d %d %d %d %d %d %n",
                    &state, &yea, &mon, &day, &hor, &min, &sec, &ms, &len);
     if (n!=8)
     {
-        *fLog << err << "ERROR - Cannot interprete Body of " << fIdentifier << endl;
+        *fLog << err << "ERROR - Cannot interprete Body of " << fIdentifier << " (n=" << n << ")" << endl;
         return kFALSE;
     }
@@ -81 +80 @@
 
     str.Remove(0, len);
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/mreport/MReportCurrents.cc

@@ -36 +36 @@
 #include "MLogManip.h"
 
-#include "MAstro.h"
+#include "MParList.h"
+#include "MCameraDC.h"
 
 ClassImp(MReportCurrents);
@@ -42 +43 @@
 using namespace std;
 
-MReportCurrents::MReportCurrents() : MReport("DC-REPORT"), fCurrents(577)
+MReportCurrents::MReportCurrents() : MReport("DC-REPORT", kFALSE)
 {
     fName  = "MReportCurrents";
     fTitle = "Class for DC-REPORT information";
 }
+
+Bool_t MReportCurrents::SetupReading(MParList &plist)
+{
+    fDC = (MCameraDC*)plist.FindCreateObj("MCameraDC");
+    if (!fDC)
+        return kFALSE;
+
+    return MReport::SetupReading(plist);
+}
+
 
 // Currents-REPORT 02 2003 11 04 23 53 34 951 00 0000 00 00 23 53 32 466
@@ -54 +65 @@
     Int_t len;
     Short_t err1, err2;
-    const Int_t n=sscanf(str.Data(), " %hd %hd %n",
-                         &err1, &err2, &len);
+    const Int_t n=sscanf(str.Data(), " %hd %hd %n", &err1, &err2, &len);
     if (n!=2)
     {
-        *fLog << err << "ERROR - Reading information of 'LV' section." << endl;
+        *fLog << err << "ERROR - Reading status information." << endl;
         return kFALSE;
     }
@@ -82 +92 @@
         }
 
-        fCurrents[i++] = 0.001*c;
+        (*fDC)[i++] = 0.001*c;
     }
 
@@ -88 +98 @@
     str=str.Strip(TString::kLeading);
 
-    return kTRUE;
+    return str.IsNull();
 }

trunk/MagicSoft/Mars/mreport/MReportCurrents.h

@@ -6 +6 @@
 #endif
 
-#ifndef ROOT_TArrayF
-#include <TArrayF.h>
-#endif
+class MCameraDC;
 
 class MReportCurrents : public MReport
@@ -16 +14 @@
     Byte_t fStatus2;
 
-    TArrayF fCurrents;
+    MCameraDC *fDC; //!
+
+    Bool_t SetupReading(MParList &plist);
+    Bool_t InterpreteBody(TString &str);
 
 public:
     MReportCurrents();
 
-    Bool_t InterpreteBody(TString &str);
-
-    ClassDef(MReportCurrents, 0) // Class for DC-REPORT information
+    ClassDef(MReportCurrents, 1) // Class for DC-REPORT information
 };
 

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -270 +270 @@
         return kFALSE;
     }
+    if (TestBit(kHasNoHeader))
+        return kTRUE;
 
     return CheckFileHeader();
@@ -287 +289 @@
     while (!GetReport(rep))
     {
-        str.ReadLine(*fIn);
+        // Don't know the reason, but ReadLine and ReadString don't work
+        // for the (at least: converted) DC files.
+        str.ReadToDelim(*fIn);
         if (!*fIn)
         {

trunk/MagicSoft/Mars/mreport/MReportFileRead.h

@@ -27 +27 @@
     THashTable *fList;
 
+    enum { kHasNoHeader = BIT(14) };
+
     Int_t PreProcess(MParList *pList);
     Int_t Process();
@@ -40 +42 @@
     ~MReportFileRead();
 
+    void SetHasNoHeader() { SetBit(kHasNoHeader); }
+
     Bool_t AddToList(const char *name) const;
 

trunk/MagicSoft/Mars/mreport/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mtools -I../mcamera
+INCLUDES = -I. -I../mbase -I../mtools -I../mcamera -I../mgui
+# mgui - MCameraDC <MCamEvent>
 
 #------------------------------------------------------------------------------