Changeset 11824 for trunk/FACT++/src

Timestamp:

08/06/11 18:34:39 (14 years ago)

Author:

tbretz

Message:

Display some statistics in the FAD tab with th ehelp of current-run/next-run from the fadctrl -- in the way the users gets the most important infomration of what is going on.

Location:

trunk/FACT++/src

Files:

• EventBuilderWrapper.h (modified) (2 diffs)
• fadctrl.cc (modified) (3 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -416 +416 @@
     void LoadDrsCalibration(const char *fname)
     {
-        DataCalib::ReadFits(fname, fMsg);
+        if (!DataCalib::ReadFits(fname, fMsg))
+            return;
+        fMsg.Info("Successfully loaded DRS calibration from "+string(fname));
+        DataCalib::Update(fDimDrsCalibration);
     }
 
@@ -813 +816 @@
     }
 
+    uint32_t GetRunNumber() const
+    {
+        return fRunNumber;
+    }
+
     void gotNewRun(int runnr, PEVNT_HEADER */*headers*/)
     {

trunk/FACT++/src/fadctrl.cc

@@ -1123 +1123 @@
         // (Note that we might need another step which only checks if the continous trigger
         //  is wwitched off, too)
-        fDimStartRun.Update(int64_t(runno));
+        const int64_t runs[2] = { runno, runno+1 };
+        fDimStartRun.Update(runs);
 
         T::Info(" ==> TODO: Insert/update run configuration in database!");
@@ -1544 +1545 @@
         T(out, "FAD_CONTROL"), EventBuilderWrapper(*static_cast<MessageImp*>(this)), ba::io_service::work(static_cast<ba::io_service&>(*this)),
         fStatus1(40), fStatus2(40), fStatusC(40), fStatusT(false),
-        fDimStartRun("FAD_CONTROL/START_RUN", "X:1", ""),
+        fDimStartRun("FAD_CONTROL/START_RUN", "X:2", ""),
         fDimConnection("FAD_CONTROL/CONNECTIONS", "C:40;C:1", "")
     {
@@ -1554 +1555 @@
         // deletion and creation of threads and more.
 
-        fDimStartRun.Update(int64_t(-1));
+        const int64_t runs[2] = { -1, GetRunNumber() };
+        fDimStartRun.Update(runs);
 
         // State names