Changeset 9010 for trunk

Timestamp:

07/17/08 19:15:35 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• datacenter/macros/writesequencefile.C (modified) (1 diff)
• mcamera/MCameraDC.cc (modified) (3 diffs)
• mjobs/MSequenceSQL.cc (modified) (1 diff)

trunk/MagicSoft/Mars/datacenter/macros/writesequencefile.C

@@ -48 +48 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MSequence.h"
+#include "MSQLMagic.h"
 
 using namespace std;
 
-int writeseq(Int_t sequno, Int_t tel, TString sequpath="")
+int writesequencefile(Int_t sequno, Int_t tel, TString sequpath="")
 {
     MSQLMagic serv("sql.rc");

trunk/MagicSoft/Mars/mcamera/MCameraDC.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 5/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -26 +26 @@
 //
 // MCameraDC (PRELIMINARY)
+//
+//
+// Version 2:
+// ----------
+//   + fStatus
+//
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -44 +50 @@
 //
 MCameraDC::MCameraDC(Int_t size, const char *name, const char *title)
-    : fArray(size)
+    : fStatus(0), fArray(size)
 {
     fName  = name  ? name  : "MCameraDC";
     fTitle = title ? title : "Storage container for the pixel currents";
+}
+
+// --------------------------------------------------------------------------
+//
+// Interprete a DC report context
+//
+Int_t MCameraDC::Interprete(TString &str, Int_t len)
+{
+    const char *pos = str.Data()+len;
+    const char *end = pos+577*4;
+
+    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;
+        }
+
+        fArray[i++] = 0.001*c;
+    }
+
+    str.Remove(0, pos-str.Data()); // Remove DC currents
+    str=str.Strip(TString::kLeading);
+
+    return str.IsNull() ? kTRUE : kCONTINUE;
 }
 

trunk/MagicSoft/Mars/mjobs/MSequenceSQL.cc

@@ -179 +179 @@
     // Now prepare queries to request the runs from the database
     TString where(Form(" FROM RunData WHERE"
-                       " fTelescopeTelescope=%d AND fSequenceFirst=%d AND"
+                       " fTelescope=%d AND fSequenceFirst=%d AND"
                        " fExcludedFDAKEY=1 AND fRunTypeKEY%%s",
                        fTelescope, fSequence));