Changeset 12342 for trunk


Ignore:
Timestamp:
10/31/11 02:07:16 (13 years ago)
Author:
tbretz
Message:
Improved output; removed obsolste ?: operators.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/src/biasctrl.cc

    r12338 r12342  
    2626using namespace BIAS;
    2727
    28 #define DEBUG
     28//#define DEBUG
    2929
    3030// ------------------------------------------------------------------------
    … …  
    668668
    669669        if (special)
    670             fWaitingForAnswer = special ? kResetChannels : kCmdChannelSet;
     670            fWaitingForAnswer = kResetChannels;
    671671    }
    672672
    … …  
    793793        {
    794794            ostringstream msg;
    795             msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
     795            msg << "OverCurrentReset - Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
    796796            Error(msg);
    797797            return;
    … …  
    817817        {
    818818            ostringstream msg;
    819             msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
     819            msg << "ReadAllChannels - Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
    820820            Error(msg);
    821821            return;
    … …  
    838838
    839839        if (!special)
    840             fWaitingForAnswer = special ? kUpdate : kCmdRead;
     840            fWaitingForAnswer = kCmdRead;
    841841    }
    842842
    … …  
    11231123        {
    11241124            ostringstream msg;
    1125             msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
     1125            msg << "ExpertReset - Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
    11261126            Error(msg);
    11271127            return;
    … …  
    11421142        {
    11431143            ostringstream msg;
    1144             msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
     1144            msg << "ExpertChannelSetDac - Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
    11451145            Error(msg);
    11461146            return false;
    … …  
    11741174        {
    11751175            ostringstream msg;
    1176             msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
     1176            msg << "ExpertGlobalSetDac - Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
    11771177            Error(msg);
    11781178            return false;
Note: See TracChangeset for help on using the changeset viewer.