Changeset 11498 for trunk/FACT++/src/fadctrl.cc

Timestamp:

07/20/11 20:20:31 (13 years ago)

Author:

tbretz

Message:

Propagate the maximum number of events and the maximum run-type together with the run-type when configuring/starting a run.

File:

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

trunk/FACT++/src/fadctrl.cc

@@ -1066 +1066 @@
     int StartConfigure(const EventImp &evt)
     {
-        const string name = evt.GetText();
+        const string name = evt.Ptr<char>(16);
 
         fTargetConfig = fConfigs.find(name);
@@ -1075 +1075 @@
         }
 
-        const uint32_t runno = StartNewRun();
+        const uint32_t runno = StartNewRun(evt.Get<uint64_t>(), evt.Get<uint64_t>(8));
 
         ostringstream str;
@@ -1616 +1616 @@
             "|val[short]:Value to be set");
 
-        T::AddEvent("CONFIGURE", "C", FAD::kConnected, FAD::kConfigured)
+        T::AddEvent("CONFIGURE", "X:2;C", FAD::kConnected, FAD::kConfigured)
             (bind(&StateMachineFAD::StartConfigure, this, placeholders::_1))
             ("");