Changeset 11379

Timestamp:

07/13/11 18:37:57 (13 years ago)

Author:

tbretz

Message:

Updated the behaviour of the configure command; allow all possible values to be send as trigger rate; fixed increasing of the run-number when a new run is started.

File:

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

trunk/FACT++/src/fadctrl.cc

@@ -802 +802 @@
             return T::kSM_FatalError;
 
-        if (evt.GetUShort()>0xff)
+        if (evt.GetUShort()>0xffff)
         {
             ostringstream msg;
-            msg << hex << "Value " << evt.GetUShort() << " out of range, max=" << 0xff << "(?)";
+            msg << hex << "Value " << evt.GetUShort() << " out of range, max=" << 0xffff << "(?)";
             T::Error(msg);
             return false;
@@ -1080 +1080 @@
         }
 
-        T::Message("Starting configuration for '"+name+"'");
+        ostringstream str;
+        str << "Starting configuration for run " << GetRunNumber() << " (" << name << ")";
+        T::Message(str.str());
+
+        const uint32_t runno = IncreaseRunNumber();
 
         for (BoardList::iterator it=fBoards.begin(); it!=fBoards.end(); it++)
@@ -1105 +1109 @@
 
             fad.CmdSetTriggerRate(conf.fTriggerRate);
-            fad.CmdSetRunNumber(IncreaseRunNumber());
+            fad.CmdSetRunNumber(runno);
             fad.Cmd(FAD::kCmdResetEventCounter);
             fad.Cmd(FAD::kCmdSingleTrigger);
@@ -1615 +1619 @@
             "|val[short]:Value to be set");
 
-        T::AddEvent("CONFIGURE", "C", FAD::kConnected)
+        T::AddEvent("CONFIGURE", "C", FAD::kConnected, FAD::kConfigured)
             (boost::bind(&StateMachineFAD::StartConfigure, this, _1))
             ("");
 
-        T::AddEvent("RESET_CONFIGURE", FAD::kConfiguring)
+        T::AddEvent("RESET_CONFIGURE", FAD::kConfiguring, FAD::kConfigured)
             (boost::bind(&StateMachineFAD::ResetConfig, this))
             ("");