Changeset 14452 for trunk/FACT++/src

Timestamp:

10/02/12 21:39:30 (12 years ago)

Author:

tbretz

Message:

Removed the obsolete fEnabled. Now somthing can only be stopped but not restarted; fixed the problem that by default the ratecontrol was not switched on anymore

File:

• trunk/FACT++/src/ratecontrol.cc (modified) (5 diffs)

trunk/FACT++/src/ratecontrol.cc

@@ -52 +52 @@
 
     bool fVerbose;
-    bool fEnabled;
 
     uint64_t fCounter;
@@ -379 +378 @@
     }
 
-    int StartRC()
-    {
-        fEnabled = true;
-        return GetCurrentState();
-    }
-
     int StopRC()
     {
-        fEnabled = false;
-        return GetCurrentState();
+        return RateControl::State::kConnected;
     }
 
@@ -441 +433 @@
             return RateControl::State::kDisconnected;
 
-        const bool inprog = fEnabled && fTriggerOn && fDimRS.state()<RateScan::State::kConfiguring;
+        const bool inprog = fTriggerOn && fDimRS.state()<RateScan::State::kConfiguring;
 
         switch (GetCurrentState())
@@ -465 +457 @@
         fDimFTM("FTM_CONTROL"),
         fDimRS("RATE_SCAN"),
-        fDimThreshold("RATE_CONTROL/THRESHOLD", "S:1", "Resulting threshold after calibration|threshold[dac]:Resulting threshold from calibration"),
-        fEnabled(false)
+        fDimThreshold("RATE_CONTROL/THRESHOLD", "S:1", "Resulting threshold after calibration|threshold[dac]:Resulting threshold from calibration")
     {
         // ba::io_service::work is a kind of keep_alive for the loop.
@@ -507 +498 @@
             ("Start a search for a reasonable minimum global threshold");
 
-        AddEvent("START", "", RateControl::State::kConnected, RateControl::State::kGlobalThresholdSet)
-            (bind(&StateMachineRateControl::StartRC, this))
-            ("Enable rate control (it will start when the trigger is on and a calibration was successfull)");
-
         AddEvent("STOP", "", RateControl::State::kSettingGlobalThreshold, RateControl::State::kInProgress)
             (bind(&StateMachineRateControl::StopRC, this))
-            ("Stop rat control");
+            ("Stop a calibration or ratescan in progress");
 
         AddEvent("SET_MIN_THRESHOLD", "I:1")