Changeset 9005 for trunk/MagicSoft/Mars/mreport

Timestamp:

07/17/08 15:58:20 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mreport

Files:

• MReportCamera.cc (modified) (7 diffs)
• MReportCamera.h (modified) (4 diffs)
• MReportCurrents.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mreport/MReportCamera.cc

@@ -33 +33 @@
 // there.
 //
+// Version 2:
+// ----------
+//   - fStstusDC
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MReportCamera.h"
@@ -43 +47 @@
 #include "MCameraCalibration.h"
 #include "MCameraCooling.h"
+#include "MCameraDC.h"
 #include "MCameraHV.h"
 #include "MCameraLV.h"
@@ -53 +58 @@
 
 using namespace std;
-
-const Int_t  MReportCamera::gkActiveLoadControlVersNum = 200504130;
 
 // --------------------------------------------------------------------------
@@ -94 +97 @@
         return kFALSE;
 
+    fDC = (MCameraDC*)plist.FindCreateObj("MCameraDC");
+    if (!fDC)
+        return kFALSE;
+
     fLV = (MCameraLV*)plist.FindCreateObj("MCameraLV");
     if (!fLV)
@@ -122 +129 @@
         return kFALSE;
 
-    str.Remove(0, 577*4); // Remove DC currents
-    str=str.Strip(TString::kLeading);
-    return kTRUE;
+    return fDC->Interprete(str);
 }
 
@@ -548 +553 @@
     fCalibration->fStatusLoVoltage = (Bool_t)clv;
     fStatus                        = (Byte_t)stat;
-    fStatusDC                      = (Byte_t)dc;
+    fDC->fStatus                   = (Byte_t)dc;
     fActiveLoad->fStatus           = 0xff;
 
     Int_t len2=0;
-    if (ver > gkActiveLoadControlVersNum)
+    if (ver > 200504130)
     {
         Short_t actl;
@@ -608 +613 @@
     }
 
-    if (ver > gkActiveLoadControlVersNum)
+    if (ver > 200504130)
     {
          if (!InterpreteActiveLoad(str))

trunk/MagicSoft/Mars/mreport/MReportCamera.h

@@ -9 +9 @@
 class MCameraLids;
 class MCameraHV;
+class MCameraDC;
 class MCameraLV;
 class MCameraAUX;
@@ -18 +19 @@
 {
 private:
-    
-    static const Int_t gkActiveLoadControlVersNum; //!
-
     Byte_t fStatus;   // CaCo monitored status of the sentinel (0-9), Sentinel_state
-    Byte_t fStatusDC; // CaCo monitored status of the DC currents (0-9), Cam.DC_state
 
     MCameraCooling     *fCooling;     //!
@@ -28 +25 @@
     MCameraAUX         *fAUX;         //!
     MCameraHV          *fHV;          //!
+    MCameraDC          *fDC;          //!
     MCameraLV          *fLV;          //!
     MCameraActiveLoad  *fActiveLoad;  //!
@@ -56 +54 @@
 
     Byte_t GetStatus() const { return  fStatus; }
-    Byte_t GetStatusDC() const { return fStatusDC; }
 
-    ClassDef(MReportCamera, 1) // Class for CAMERA-REPORT information
+    ClassDef(MReportCamera, 2) // Class for CAMERA-REPORT information
 };
 

trunk/MagicSoft/Mars/mreport/MReportCurrents.cc

@@ -84 +84 @@
     fStatus2 = (Byte_t)err2;
 
-    const char *pos = str.Data()+len;
-    const char *end = pos+577*4;
+    // FIXME: Set fDC->fStatus ???
 
-    Int_t i=0;
-    while (pos<end)
-    {
-        Int_t c;
-        const Char_t hex[5] = { pos[0], pos[1], pos[2], pos[3], 0 };
-        pos += 4;
-
-        const Int_t nn=sscanf(hex, "%4x", &c);
-        if (nn!=1)
-        {
-            *fLog << warn << "WARNING - Reading hexadecimal DC information." << endl;
-            return kCONTINUE;
-        }
-
-        (*fDC)[i++] = 0.001*c;
-    }
-
-    str.Remove(0, pos-str.Data()); // Remove DC currents
-    str=str.Strip(TString::kLeading);
-
-    return str.IsNull() ? kTRUE : kCONTINUE;
+    return fDC->Interprete(str, len);
 }