Changeset 11839

Timestamp:

08/07/11 18:44:42 (13 years ago)

Author:

tbretz

Message:

Changed START_RUN service to provide the current run-number (whethe ropen or not) and the next run-number.

File:

• trunk/FACT++/src/fadctrl.cc (modified) (4 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -1085 +1085 @@
         }
 
-        const uint32_t runno = StartNewRun(evt.Get<uint64_t>(), evt.Get<uint64_t>(8), fTargetConfig->second);
+        const uint32_t runno = StartNewRun(evt.Get<uint64_t>(), evt.Get<uint64_t>(8), *fTargetConfig);
 
         ostringstream str;
@@ -1135 +1135 @@
     int ResetConfig()
     {
+        const int64_t runs[2] = { -1, GetRunNumber() };
+        fDimStartRun.Update(runs);
+
         return FAD::kConnected;
+    }
+
+    void CloseRun(uint32_t runid)
+    {
+        if (runid==GetRunNumber()-1)
+            ResetConfig();
     }
 
@@ -1537 +1546 @@
         stat[40] = thread;
 
-        fDimConnection.setData(stat.data(), 41);
-        fDimConnection.updateService();
+        fDimConnection.Update(stat);
     }
 
@@ -1554 +1562 @@
         // previous state but this might introduce some overhead of
         // deletion and creation of threads and more.
-
-        const int64_t runs[2] = { -1, GetRunNumber() };
-        fDimStartRun.Update(runs);
+        ResetConfig();
 
         // State names