Changeset 9289 for trunk/MagicSoft/Mars/mreport/MReportCamera.cc

Timestamp:

02/02/09 17:34:21 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mreport/MReportCamera.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mreport/MReportCamera.cc

@@ -400 +400 @@
     str.Remove(0, len);
     str=str.Strip(TString::kBoth);
-    return kTRUE;
-
+
+    return kTRUE;
 }
 
@@ -443 +443 @@
 // Interprete the Central Pixel part
 //
-Bool_t MReportCamera::InterpreteCentralPix(TString &str)
+Bool_t MReportCamera::InterpreteCentralPix(TString &str, Int_t ver)
 {
     if (!CheckTag(str, "CPIX "))
@@ -450 +450 @@
     Int_t len;
     Short_t status;
-    Int_t n=sscanf(str.Data(), " %hd %n",
-                   &status, &len);
+
+    Int_t n=sscanf(str.Data(), " %hd %n", &status, &len);
     if (n!=1)
     {
         *fLog << warn << "WARNING - Reading information of 'CPIX' section." << endl;
-        return kFALSE;
+            return kFALSE;
+    }
+
+    if (ver>=200812140)
+    {
+        Int_t len2;
+        Int_t dc;
+        n=sscanf(str.Data()+len, " %d %n", &dc, &len2);
+        if (n!=1)
+        {
+            *fLog << warn << "WARNING - Reading information of 'CPIX' section." << endl;
+            return kFALSE;
+        }
+
+        fCentralPix->fDC = dc;
+
+        len += len2;
     }
 
@@ -518 +534 @@
 
     str.Remove(0, pos);
+    str=str.Strip(TString::kBoth);
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// ps: Camera cabinet power supply
+// v1: PS sensor v1
+// v2: PS sensor v2
+//
+Bool_t MReportCamera::InterpretePSSEN(TString &str)
+{
+    if (!CheckTag(str, "PSSEN "))
+        return kFALSE;
+
+    Int_t len;
+    Int_t ps, v1, v2;
+
+    const Int_t n=sscanf(str.Data(), "%d %d %d %n", &ps, &v1, &v2, &len);
+    if (n!=3)
+    {
+        *fLog << warn << "WARNING - Reading information of 'PSSEN' section." << endl;
+        return kFALSE;
+    }
+
+    str.Remove(0, len);
+    str=str.Strip(TString::kBoth);
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// liq: Liquid inside camera
+//
+Bool_t MReportCamera::InterpreteLIQ(TString &str)
+{
+    if (!CheckTag(str, "LIQ "))
+        return kFALSE;
+
+    Int_t len;
+    Int_t liq;
+
+    const Int_t n=sscanf(str.Data(), "%d %n", &liq, &len);
+    if (n!=1)
+    {
+        *fLog << warn << "WARNING - Reading information of 'LIQ' section." << endl;
+        return kFALSE;
+    }
+
+    str.Remove(0, len);
     str=str.Strip(TString::kBoth);
 
@@ -621 +689 @@
          if (!InterpreteActiveLoad(str))
             return kCONTINUE;
-         if (!InterpreteCentralPix(str))
+         if (!InterpreteCentralPix(str, ver))
             return kCONTINUE;
     }
@@ -633 +701 @@
     }
 
+    if (ver >= 200812140)
+    {
+        if (!InterpretePSSEN(str))
+            return kCONTINUE;
+        if (!InterpreteLIQ(str))
+            return kCONTINUE;
+    }
+
     if (str!="OVER")
     {
-        *fLog << warn << "WARNING - 'OVER' tag not found." << endl;
-        return kCONTINUE;
-    }
-
-    return kTRUE;
-}
+        *fLog << warn << "WARNING - 'OVER' tag not found... remaining: " << str << endl;
+        return kCONTINUE;
+    }
+
+    return kTRUE;
+}