Changeset 14683
- Timestamp:
- 11/22/12 09:23:58 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/mcp.cc
r14682 r14683 343 343 if (GetCurrentState()==MCP::State::kConfiguring3) 344 344 { 345 /* 345 346 // If everything is configured but the FADs 346 347 // we run into a timeout and some FAD need to be reset … … 348 349 if (fDimFTM.state() == FTM::State::kConfigured && 349 350 fDimFAD.state() != FAD::State::kConfigured && 350 / *fDimRC.state() > RateControl::State::kSettingGlobalThreshold &&*/351 //fDimRC.state() > RateControl::State::kSettingGlobalThreshold && 351 352 fFadTimeout+boost::posix_time::seconds(15)<Time() && 352 353 count(fFadNeedsReset.begin(), fFadNeedsReset.end(), true)>0) … … 355 356 return MCP::State::kCrateReset0; 356 357 } 357 358 */ 358 359 // If something is not yet properly configured: keep state 359 360 if (fDimFTM.state() != FTM::State::kConfigured || … … 410 411 411 412 // ======================================================== 412 413 /* 413 414 if (GetCurrentState()==MCP::State::kCrateReset0) 414 415 { … … 486 487 return MCP::State::kConfiguring1; 487 488 } 488 489 */ 489 490 // ======================================================== 490 491 … … 545 546 AddStateName(MCP::State::kConfiguring3, "Configuring3", 546 547 "Waiting for FADs and rate control to get ready"); 547 548 /* 548 549 AddStateName(MCP::State::kCrateReset0, "CrateReset0", 549 550 "Disabling FTUs, disconnecting FADs"); … … 554 555 AddStateName(MCP::State::kCrateReset3, "CrateReset3", 555 556 "Waiting for FTUs to be enabled and for FADs to be re-connected"); 556 557 */ 557 558 AddStateName(MCP::State::kConfigured, "Configured", 558 559 "Everything is configured, trigger will be switched on now");
Note:
See TracChangeset
for help on using the changeset viewer.