Changeset 14350 for trunk

Timestamp:

08/13/12 09:45:44 (12 years ago)

Author:

tbretz

Message:

It is not necessary to check the rate control only for the timeout of the FADs. Before starting the trigger we have to wait until the state of the rate control is GlobalThresholdSet

File:

• trunk/FACT++/src/mcp.cc (modified) (3 diffs)

trunk/FACT++/src/mcp.cc

@@ -329 +329 @@
 
             Message("Starting Rate Control");
+            // State of RC is not reported back fast enough!
             Dim::SendCommandNB("RATE_CONTROL/CALIBRATE");
 
@@ -348 +349 @@
             if (fDimFTM.state() == FTM::State::kConfigured &&
                 fDimFAD.state() != FAD::State::kConfigured &&
-                fDimRC.state()  >=  RateControl::State::kSettingGlobalThreshold &&
+                /*fDimRC.state()  >  RateControl::State::kSettingGlobalThreshold &&*/
                 fFadTimeout+boost::posix_time::seconds(15)<Time() &&
                 count(fFadNeedsReset.begin(), fFadNeedsReset.end(), true)>0)
@@ -359 +360 @@
             if (fDimFTM.state() != FTM::State::kConfigured ||
                 fDimFAD.state() != FAD::State::kConfigured ||
-                fDimRC.state()  <  RateControl::State::kSettingGlobalThreshold)
+                fDimRC.state()  <= RateControl::State::kSettingGlobalThreshold)
                 return MCP::State::kConfiguring3;