Changeset 11542 for trunk/FACT++/src

Timestamp:

07/22/11 22:39:32 (13 years ago)

Author:

tbretz

Message:

Replaced BOARDID in fits header by just id (BOARDID is too long); made error messages compile again; another fix to fix the temperature min/max transmission

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (8 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -306 +306 @@
         {
             ostringstream str;
-            str << "ofstream::write() failed for '" << name << "': " << strerror(errno) << " [errno=" << errno << "]";
+
+            str << "ofstream::write() failed for '" << GetFileName() << "': " << strerror(errno) << " [errno=" << errno << "]";
             Error(str);
 
@@ -317 +318 @@
         {
             ostringstream str;
-            str << "ofstream::close() failed for '" << name << "': " << strerror(errno) << " [errno=" << errno << "]";
+            str << "ofstream::close() failed for '" << GetFileName() << "': " << strerror(errno) << " [errno=" << errno << "]";
             Error(str);
 
@@ -544 +545 @@
 
             // Header values whihc won't change during the run
-            WriteKey("BOARDID", i, hh.board_id,   "ID");
-            WriteKey("DNA",     i, hh.DNA,        "DNA");
-            WriteKey("FWVER",   i, hh.version_no, "Firmware Version");
+            WriteKey("ID",    i, hh.board_id,   "Board ID");
+            WriteKey("DNA",   i, hh.DNA,        "DNA");
+            WriteKey("FWVER", i, hh.version_no, "Firmware Version");
         }
 
@@ -1578 +1579 @@
             }
 
-            if (*val<*min)
-                min = val;
-
-            if (*val>*max)
-                max = val;
+            if (*ref<*min)
+                min = ref;
+
+            if (*ref>*max)
+                max = ref;
 
             if (*val!=*ref)
@@ -1706 +1707 @@
         if (old.fStatus != h.fStatus || changed)
         {
+            cout << "Send" << endl;
             const array<uint16_t,42> sts = CompareBits(&h, &h.fStatus);
             Update(fDimStatus, sts);
@@ -1741 +1743 @@
             data.insert(data.end(), tmp[0].data(), tmp[0].data()+40);   // val: 42-81
 
-            for (int j=0; j<=3; j++)
+            for (int j=1; j<=3; j++)
             {
                 const array<int16_t,42> &ref = tmp[j];
@@ -1750 +1752 @@
 
                 // Global max
-                if (ref[41]>data[40])          // 41=max
-                    data[40] = ref[41];
-
-                for (int i=0; i<40; i++)       
+                if (ref[41]>data[41])          // 41=max
+                    data[41] = ref[41];
+
+                for (int i=0; i<40; i++)
                 {
                     // min per board
@@ -1763 +1765 @@
                         data[i+42] = ref[i];   // ref:   0-39
                 }
-            }
+
+
+           }
 
             vector<float> deg(82);              //  0: global min,  1-40: min