Changeset 13894 for trunk/FACT++

Timestamp:

05/25/12 21:05:23 (13 years ago)

Author:

tbretz

Message:

Adapted ratescan state numbers.

Location:

trunk/FACT++/src

Files:

• ratecontrol.cc (modified) (2 diffs)
• smartfact.cc (modified) (2 diffs)

trunk/FACT++/src/ratecontrol.cc

@@ -343 +343 @@
             return GetCurrentState();
 
-        if (fDimRS.state()==5)
+        if (fDimRS.state()>=5)
             return GetCurrentState();
 
@@ -481 +481 @@
         // At least one subsystem is not connected
         //        if (fDimFTM.state()>=FTM::kConnected)
-        return fTriggerOn && fEnabled && fDimRS.state()!=5 ? kStateInProgress : kStateConnected;
+        return fTriggerOn && fEnabled && fDimRS.state()<5 ? kStateInProgress : kStateConnected;
     }
 

trunk/FACT++/src/smartfact.cc

@@ -1590 +1590 @@
             out << col << '\t';
 
-            if (fDimRateControl.state()!=5 && fDimRateScan.state()!=5)
+            if (fDimRateControl.state()!=5 && fDimRateScan.state()!=6)
             {
                 switch (fMcpConfigurationState)
@@ -1611 +1611 @@
                     out << "Calibrating threshold";
                 else
-
-                    if (fDimRateScan.state()==5/*kStateSettingGlobalThreshold*/)
+                    if (fDimRateScan.state()==6/*kStateSettingGlobalThreshold*/)
                         out << "Rate scan in progress";