Changeset 12555

Timestamp:

11/18/11 15:07:48 (13 years ago)

Author:

tbretz

Message:

Added the UNIX start-time to the report.

File:

• trunk/FACT++/src/ratescan.cc (modified) (5 diffs)

trunk/FACT++/src/ratescan.cc

@@ -82 +82 @@
     double fOnTime;
 
+    uint64_t fStartTime;
+
     float fResolution;
 
@@ -208 +210 @@
             const uint32_t th   = fThresholdMin+fCounter*fThresholdStep;
 
-            float data[3+1+40+160];
-            memcpy(data, &th, 4);
-            data[1] = time;         // total elapsed time
-            data[2] = fOnTime/time; // relative on time
-            data[3] = fRate/fSeconds;
+            float data[2+3+1+40+160];
+            memcpy(data,   &fStartTime, 8);
+            memcpy(data+2, &th, 4);
+            data[3] = time;         // total elapsed time
+            data[4] = fOnTime/time; // relative on time
+            data[5] = fRate/fSeconds;
             for (int i=0; i<40; i++)
-                data[i+4] = fRateBoard[i]/fSeconds;
+                data[i+6] = fRateBoard[i]/fSeconds;
             for (int i=0; i<160; i++)
-                data[i+44] = fRatePatch[i]/fSeconds;
+                data[i+46] = fRatePatch[i]/fSeconds;
 
             ostringstream sout1, sout2, sout3;
 
-            sout1 << th << " " << data[3];
+            sout1 << th << " " << data[5];
             for (int i=0; i<200; i++)
-                sout2 << " " << data[i+4];
-            sout3 << " " << data[1] << " " << data[2];
+                sout2 << " " << data[i+6];
+            sout3 << " " << data[3] << " " << data[4];
 
             Info(sout1.str());
@@ -297 +300 @@
 
         const Time now;
-
+        fStartTime = trunc(now.UnixTime());
 
         ofstream fout("ratescan.txt", ios::app);
-        fout << "# ----- " << now << " -----\n";
+        fout << "# ----- " << now << " (" << fStartTime << ") -----\n";
         fout << "# Command: " << fCommand << '\n';
         fout << "# Reference: ";
@@ -325 +328 @@
 
         ostringstream msg;
-        msg << "Rate scan " << now << " from " << fThresholdMin << " to ";
+        msg << "Rate scan " << now << "(" << fStartTime << ") from " << fThresholdMin << " to ";
         msg << fThresholdMax << " in steps of " << fThresholdStep;
         msg << " started.";
@@ -438 +441 @@
         fFTM("FTM_CONTROL/STATE",       (void*)NULL, 0, this),
         fRates("FTM_CONTROL/TRIGGER_RATES", (void*)NULL, 0, this),
-        fDimData("RATE_SCAN/DATA", "I:1;F:1;F:1;F:1;F:40;F:160", ""),
+        fDimData("RATE_SCAN/DATA", "X:1;I:1;F:1;F:1;F:1;F:40;F:160", ""),
         fDimProc("RATE_SCAN/PROCESS_DATA", "I:1;I:1;I:1",
                  "Rate scan process data"