Changeset 17214

Timestamp:

10/11/13 15:50:23 (11 years ago)

Author:

tbretz

Message:

This fix should change that sometimes the rate is displayed in red because the biasctrl is in ramping.

File:

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

trunk/FACT++/src/smartfact.cc

@@ -2746 +2746 @@
 
         // --------------- BiasControl -------------
-        if (fDimDNS.online() &&
-            (fDimBiasControl.state()==BIAS::State::kRamping     ||
-             fDimBiasControl.state()==BIAS::State::kOverCurrent ||
-             fDimBiasControl.state()==BIAS::State::kVoltageOn   ||
-             fDimBiasControl.state()==BIAS::State::kVoltageOff))
-        {
-            const bool off = fDimBiasControl.state()==BIAS::State::kVoltageOff;
-            const bool oc  = fDimBiasControl.state()==BIAS::State::kOverCurrent;
+        const bool bias_off  = fDimBiasControl.state()==BIAS::State::kVoltageOff;
+        const bool bias_on   = fDimBiasControl.state()==BIAS::State::kVoltageOn;
+        const bool bias_oc   = fDimBiasControl.state()==BIAS::State::kOverCurrent;
+        const bool bias_ramp = fDimBiasControl.state()==BIAS::State::kOverRamping;
+
+        if (fDimDNS.online() && (bias_ramp || bias_oc || bias_on || bias_off))
+        {
 
             string col = fBiasControlVoltageMed>3?HTML::kGreen:HTML::kWhite;
-            if (fDimBiasControl.state()!=BIAS::State::kVoltageOff)
+            if (!bias_off)
             {
                 if (fBiasControlCurrentMed>60 || fBiasControlCurrentMax>80)
@@ -2765 +2764 @@
 
             // Bias in overcurrent => Red
-            if (fDimBiasControl.state()==BIAS::State::kOverCurrent)
+            if (bias_oc)
                 col = HTML::kRed;
 
@@ -2771 +2770 @@
             // and Bias not in "data-taking state' => Red
             if (fMcpConfigurationState>MCP::State::kIdle &&
-                fDimBiasControl.state()!=BIAS::State::kVoltageOn &&
-                fDimBiasControl.state()!=BIAS::State::kVoltageOff)
+                !bias_on && !bias_off && !bias_ramp)
                 col = HTML::kRed;