Changeset 15115 for trunk


Ignore:
Timestamp:
03/18/13 21:23:13 (12 years ago)
Author:
tbretz
Message:
Uncommented the _right_ lines :S
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/ftmctrl.cc

    r15055 r15115  
    19961996        }
    19971997
    1998         /*
    1999         if (T::GetCurrentState()==FTM::State::kConfigured)
     1998        if (T::GetCurrentState()==FTM::State::kConfigured &&
    20001999            fFTM.GetState()==ConnectionFTM::kTriggerOn)
    20012000        {
    2002             if (!fFTM.IsLocked())
    2003             {
    2004                 T::Warn("Configuration successfull, but clock conditioner not locked.");
    2005                 return FTM::State::kConfigError3;
    2006             }
     2001//            if (!fFTM.IsLocked())
     2002//            {
     2003//                T::Warn("Configuration successfull, but clock conditioner not locked.");
     2004//                return FTM::State::kConfigError3;
     2005//            }
    20072006
    20082007            return FTM::State::kTriggerOn;
    20092008        }
    2010         */
     2009
    20112010        return T::GetCurrentState();
    20122011    }
Note: See TracChangeset for help on using the changeset viewer.