Changeset 14683


Ignore:
Timestamp:
11/22/12 09:23:58 (12 years ago)
Author:
tbretz
Message:
Took out automatic crate reset for the moment. That is something which needs to be done once at the beginning of data-taking.
File:
1 edited

Legend:

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

    r14682 r14683  
    343343        if (GetCurrentState()==MCP::State::kConfiguring3)
    344344        {
     345            /*
    345346            // If everything is configured but the FADs
    346347            // we run into a timeout and some FAD need to be reset
     
    348349            if (fDimFTM.state() == FTM::State::kConfigured &&
    349350                fDimFAD.state() != FAD::State::kConfigured &&
    350                 /*fDimRC.state()  >  RateControl::State::kSettingGlobalThreshold &&*/
     351                //fDimRC.state()  >  RateControl::State::kSettingGlobalThreshold &&
    351352                fFadTimeout+boost::posix_time::seconds(15)<Time() &&
    352353                count(fFadNeedsReset.begin(), fFadNeedsReset.end(), true)>0)
     
    355356                return MCP::State::kCrateReset0;
    356357            }
    357 
     358            */
    358359            // If something is not yet properly configured: keep state
    359360            if (fDimFTM.state() != FTM::State::kConfigured ||
     
    410411
    411412        // ========================================================
    412 
     413        /*
    413414        if (GetCurrentState()==MCP::State::kCrateReset0)
    414415        {
     
    486487            return MCP::State::kConfiguring1;
    487488        }
    488 
     489        */
    489490        // ========================================================
    490491
     
    545546        AddStateName(MCP::State::kConfiguring3, "Configuring3",
    546547                     "Waiting for FADs and rate control to get ready");
    547 
     548        /*
    548549        AddStateName(MCP::State::kCrateReset0, "CrateReset0",
    549550                     "Disabling FTUs, disconnecting FADs");
     
    554555        AddStateName(MCP::State::kCrateReset3, "CrateReset3",
    555556                     "Waiting for FTUs to be enabled and for FADs to be re-connected");
    556 
     557        */
    557558        AddStateName(MCP::State::kConfigured, "Configured",
    558559                     "Everything is configured, trigger will be switched on now");
Note: See TracChangeset for help on using the changeset viewer.