Changeset 15055


Ignore:
Timestamp:
Mar 13, 2013, 2:24:49 PM (7 years ago)
Author:
tbretz
Message:
Removed the code dealing with the clock conditioner. There is now easy way to check that during configuration. This check has to be done continously somewhere else.
Location:
trunk/FACT++/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/HeadersFTM.h

    r14503 r15055  
    4646            kConfigError1 = 0x101,
    4747            kConfigError2 = 0x102,
    48             kConfigError3 = 0x103,
     48            //kConfigError3 = 0x103,
    4949        };
    5050    }
  • trunk/FACT++/src/ftmctrl.cc

    r14956 r15055  
    11651165    }
    11661166
    1167     bool IsLocked() const { return fHeader.fState&FTM::kFtmLocked; }
     1167    // If fState==2, the clock conditioner will always be reported as unlocked
     1168    //bool IsLocked() const { return fHeader.fState&FTM::kFtmLocked; }
    11681169
    11691170    int GetCounter(FTM::Types type) { return fCounter[type]; }
     
    19571958                return FTM::State::kConfigError2;
    19581959            // ======================
     1960            // There is no simple way to check if the clock
     1961            // conditioner is locked. Every message send to request a static
     1962            // data block may end up in the same buffer at the FTM, thus
     1963            // the result will be that it is in state Configuring, which
     1964            // will always return the clock conditioner to be unlocked.
    19591965            /*
    19601966            if (!fFTM.IsLocked())
     
    19691975            fCounterStat = fFTM.GetCounter(FTM::kStaticData);
    19701976
    1971             T::Info(" ==> TODO: Update run in database!");
    19721977            T::Message("Sending new configuration was successfull.");
    19731978
     
    19771982        case FTM::State::kConfigError1:
    19781983        case FTM::State::kConfigError2:
    1979         case FTM::State::kConfigError3:
     1984        //case FTM::State::kConfigError3:
    19801985            break;
    19811986
     
    19911996        }
    19921997
    1993         // FIXME: Do we have to check the state of the clock conditioner here?
    1994 
    1995         if (T::GetCurrentState()==FTM::State::kConfigured &&
     1998        /*
     1999        if (T::GetCurrentState()==FTM::State::kConfigured)
    19962000            fFTM.GetState()==ConnectionFTM::kTriggerOn)
    19972001        {
     
    20042008            return FTM::State::kTriggerOn;
    20052009        }
    2006 
     2010        */
    20072011        return T::GetCurrentState();
    20082012    }
     
    20432047        T::AddStateName(FTM::State::kConfigError1, "ErrorInConfig1", "Unexpected state received from FTM");
    20442048        T::AddStateName(FTM::State::kConfigError2, "ErrorInConfig2", "Unexpected state received from FTM");
    2045         T::AddStateName(FTM::State::kConfigError3, "ClockCondError", "Clock conditioner not locked");
     2049        //T::AddStateName(FTM::State::kConfigError3, "ClockCondError", "Clock conditioner not locked");
    20462050
    20472051        // FTM Commands
Note: See TracChangeset for help on using the changeset viewer.