Changeset 11014

Timestamp:

06/13/11 17:06:33 (14 years ago)

Author:

tbretz

Message:

Fixed some limits; some improvements to the output

File:

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

trunk/FACT++/src/fadctrl.cc

@@ -563 +563 @@
     bool Check(const uint32_t *dat, uint32_t maxaddr, uint32_t maxval)
     {
-        if (dat[0]>FAD::kMaxRegAddr)
+        if (dat[0]>maxaddr)
         {
             ostringstream msg;
@@ -571 +571 @@
         }
 
-        if (dat[1]>FAD::kMaxRegValue)
+        if (dat[1]>maxval)
         {
             ostringstream msg;
@@ -603 +603 @@
             return T::kSM_FatalError;
 
-        // ---- was uint32_t
         const int32_t *dat = evt.Ptr<int32_t>();
 
-        // ---- -1 for all
-        //if (!Check(dat, FAD::kMaxRoiAddr, FAD::kMaxRoiValue))
-        //            return T::GetCurrentState();
-
         for (BoardList::iterator i=fBoards.begin(); i!=fBoards.end(); i++)
-            i->second.second->CmdSetRoi(dat[0], dat[1]);
+            if (!i->second.second->CmdSetRoi(dat[0], dat[1]))
+            {
+                ostringstream msg;
+                msg << hex << "Channel " << dat[0] << " or Value " << dat[1] << " out of range.";
+                T::Error(msg);
+                return false;
+            }
+
 
         return T::GetCurrentState();
@@ -835 +837 @@
         }
 
-        T::Out() << "Thread :";
+        T::Out() << "Event builder thread:";
         if (!IsThreadRunning())
             T::Out() << " not";
@@ -1027 +1029 @@
 public:
     StateMachineFAD(ostream &out=cout) :
-        T(out, "FAD_CONTROL"), EventBuilderWrapper(static_cast<MessageImp&>(*this)), ba::io_service::work(static_cast<ba::io_service&>(*this)),
+        T(out, "FAD_CONTROL"), EventBuilderWrapper(*static_cast<MessageImp*>(this)), ba::io_service::work(static_cast<ba::io_service&>(*this)),
         fStatus1(40), fStatus2(40),
         fDimConnection("FAD_CONTROL/CONNECTIONS", "C:41", "")