Changeset 10785


Ignore:
Timestamp:
May 23, 2011, 3:15:54 PM (9 years ago)
Author:
tbretz
Message:
Fixed order of arguments in description of SET_TRIGGER_SEQUENCE; removed some obsolete whitespaces from some output; changed SET_TRIGGER_SEQUENCE from C:3 to S:3 to make it work correctly from the prompt.
File:
1 edited

Legend:

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

    r10780 r10785  
    790790    }
    791791
    792     bool SetTriggerSeq(const uint8_t d[3])
     792    bool SetTriggerSeq(const uint16_t d[3])
    793793    {
    794794        const uint16_t oldset = fStaticData.fGeneralSettings;
     
    12401240
    12411241        if (!fFTM.SetTriggerDelay(evt.GetInt()))
    1242             T::Warn("SetTriggerDealy -  Value out of range.");
     1242            T::Warn("SetTriggerDealy - Value out of range.");
    12431243
    12441244        return T::GetCurrentState();
     
    12511251
    12521252        if (!fFTM.SetTimeMarkerDelay(evt.GetInt()))
    1253             T::Warn("SetTimeMarkerDelay -  Value out of range.");
     1253            T::Warn("SetTimeMarkerDelay - Value out of range.");
    12541254
    12551255        return T::GetCurrentState();
     
    12621262
    12631263        if (!fFTM.SetPrescaling(evt.GetInt()-1))
    1264             T::Warn("SetPrescaling -  Value out of range.");
     1264            T::Warn("SetPrescaling - Value out of range.");
    12651265
    12661266        return T::GetCurrentState();
     
    12691269    int SetTriggerSeq(const EventImp &evt)
    12701270    {
    1271         if (!CheckEventSize(evt.GetSize(), "SetTriggerSeq", 3))
    1272             return T::kSM_FatalError;
    1273 
    1274         const uint8_t *data = reinterpret_cast<const uint8_t*>(evt.GetData());
     1271        if (!CheckEventSize(evt.GetSize(), "SetTriggerSeq", 6))
     1272            return T::kSM_FatalError;
     1273
     1274        const uint16_t *data = reinterpret_cast<const uint16_t*>(evt.GetData());
    12751275
    12761276        if (!fFTM.SetTriggerSeq(data))
    1277             T::Warn("SetTriggerSeq -  Value out of range.");
     1277            T::Warn("SetTriggerSeq - Value out of range.");
    12781278
    12791279        return T::GetCurrentState();
     
    12861286
    12871287        if (!fFTM.SetDeadTime(evt.GetInt()))
    1288             T::Warn("SetDeadTime -  Value out of range.");
     1288            T::Warn("SetDeadTime - Value out of range.");
    12891289
    12901290        return T::GetCurrentState();
     
    15731573             "|Enable[bool]:Enable clock conditioner (yes/no)");
    15741574
    1575         AddEvent("SET_TRIGGER_SEQUENCE", "C:3", kStateIdle)
     1575        AddEvent("SET_TRIGGER_SEQUENCE", "S:3", kStateIdle)
    15761576            (boost::bind(&StateMachineFTM::SetTriggerSeq, this, _1))
    15771577            ("Setup the sequence of artificial triggers produced by the FTM"
    1578              "|Ped[int]:number of pedestal triggers in a row"
    1579              "|LPint[int]:number of triggers of the internal light pulser"
    1580              "|LPext[int]:number of triggers of the external light pulser");
     1578             "|Ped[short]:number of pedestal triggers in a row"
     1579             "|LPext[short]:number of triggers of the external light pulser"
     1580             "|LPint[short]:number of triggers of the internal light pulser");
    15811581
    15821582        AddEvent("SET_TRIGGER_MULTIPLICITY", "S:1", kStateIdle)
Note: See TracChangeset for help on using the changeset viewer.