Changeset 12214 for trunk/FACT++

Timestamp:

10/20/11 11:33:55 (13 years ago)

Author:

tbretz

Message:

Improved error messages; replaces PostClose by CloseImp in handlers.

File:

• trunk/FACT++/src/biasctrl.cc (modified) (17 diffs)

trunk/FACT++/src/biasctrl.cc

@@ -152 +152 @@
         Error(str);
 
-        PostClose(false);
         return false;
     }
@@ -184 +183 @@
             {
                 ostringstream msg;
-                msg << "Corrupted answer (id=" << id << "): received wrap counter " << wrap << " doesn't match last received counter " << fWrapCounter << ".";
+                msg << "Corrupted answer (id=" << id << "): received wrap counter " << wrap << " doesn't match last one " << fWrapCounter << " ";
+                msg << " (fSendCounter=" << fSendCounter << ")";
                 Error(msg);
                 return false;
@@ -323 +323 @@
             (cmd==kCmdChannelSet    && !CheckMessageLength(bytes_received, 3*kNumChannels,   "CmdChannelSet"))   ||
             (cmd==kExpertChannelSet && !CheckMessageLength(bytes_received, 3,                "CmdExpertChannelSet")))
-            return;
+        {
+            CloseImp(false);
+            return;
+        }
 
         // Now evaluate the whole bunch of messages
@@ -330 +333 @@
             if (!EvalAnswer(buf.data(), i, command))
             {
-                PostClose(false);
+                CloseImp(false);
                 return;
             }
@@ -354 +357 @@
             msg << "Corrupted answer: received wrap counter " << fWrapCounter  << " is not send counter " << send_counter << "%8.";
             Error(msg);
-            PostClose(false);
+            CloseImp(false);
         }
 
@@ -441 +444 @@
                 Error(str);
             }
-            PostClose(false);//err!=ba::error::basic_errors::operation_aborted);
+            CloseImp(false);//err!=ba::error::basic_errors::operation_aborted);
             return;
         }
@@ -450 +453 @@
         {
             Error("Number of received bytes not a multiple of 3, can't read data.");
-            PostClose(false);
+            CloseImp(false);
             return;
         }
@@ -516 +519 @@
             Error(str);
 
-            PostClose(false);
+            CloseImp(false);
             return;
         }
@@ -537 +540 @@
             {
                 Error("Synchronization attempt timed out.");
-                PostClose(false);
+                CloseImp(false);
                 return;
             }
@@ -823 +826 @@
         if (volt<0 || volt>90)
         {
-            Error("ChannelSetVolt - Voltage out of range [0V,90V].");
+            ostringstream msg;
+            msg << "ChannelSetVolt - Given voltage " << volt << "V out of range [0V,90V].";
+            Error(msg);
             return false;
         }
@@ -867 +872 @@
             if (fVoltRef[ch]+dac[ch]>kMaxDac)
             {
-                Error("AddDac - New voltage reference out of range.");
+                ostringstream msg;
+                msg << "AddDac - New voltage reference " << fVoltRef[ch] << "+" << dac[ch] << " out of range [0," << kMaxDac << " for channel " << ch << ".";
+                Error(msg);
                 return false;
             }
@@ -891 +898 @@
             if (offset[ch]<-90 || offset[ch]>90)
             {
-                Error("AddVolt - Offset " << offset[ch] << " for channel " << ch << " out of range [-90V,90V].");
+                ostringstream msg;
+                msg << "AddVolt - Offset voltage " << offset[ch] << "V for channel " << ch << " out of range [-90V,90V].";
+                Error(msg);
                 return false;
             }
@@ -940 +949 @@
             if (volt[ch]<0 || volt[ch]>90)
             {
-                Error("SetVolt - Voltage out of range [0V,90V].");
+                ostringstream msg;
+                msg << "SetVolt - Voltage " << volt[ch] << "V out of range [0V,90V] for channel " << ch << ".";
+                Error(msg);
                 return false;
             }
@@ -966 +977 @@
         if (offset<-90 || offset>90)
         {
-            Error("SetGapdVoltage - Offset " << offset << " out of range [-90V,90V].");
+            ostringstream msg;
+            msg << "SetGapdVoltage - Offset voltage " << offset << "V out of range [-90V,90V].";
+            Error(msg);
             return false;
         }
@@ -975 +988 @@
             if (fVoltGapd[ch]+dac>kMaxDac)
             {
-                Error("SetGapdVoltage - New voltage reference out of range.");
+                ostringstream msg;
+                msg << "SetGapdVoltage - New voltage reference " << fVoltGapd[ch] << "+" << dac << " out of range [0," << kMaxDac << " for channel " << ch << ".";
+                Error(msg);
                 return false;
             }
@@ -1041 +1056 @@
         if (fIsRamping)
         {
-            Warn("RampStart - Ramping in progress... ignored.");
+            Warn("RampStart - Ramping already in progress... ignored.");
             return;
         }
@@ -1127 +1142 @@
         if (fGlobalVoltCmd>=0)
         {
-            Error("ExpertGlobalSetDac - Still waiting for previous global-set's answer.");
+            Error("ExpertGlobalSetDac - Still waiting for previous answer to 'GlobalSet'");
             return false;
         }