Changeset 17256 for trunk/FACT++/src

Timestamp:

10/18/13 14:56:37 (11 years ago)

Author:

tbretz

Message:

Fixed some compiling issues.

File:

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

trunk/FACT++/src/smartfact.cc

@@ -2746 +2746 @@
 
         // --------------- BiasControl -------------
-        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))
+        const bool bias_off = fDimBiasControl.state()==BIAS::State::kVoltageOff;
+        const bool bias_oc  = fDimBiasControl.state()==BIAS::State::kOverCurrent;
+
+        if (fDimDNS.online() && (bias_on || bias_off))
         {
 
             string col = fBiasControlVoltageMed>3?HTML::kGreen:HTML::kWhite;
-            if (!bias_off)
+            if (!fDimBiasControl.state()==BIAS::State::kVoltageOn)
             {
                 if (fBiasControlCurrentMed>70 || fBiasControlCurrentMax>90)
@@ -2769 +2767 @@
             // MCP in ReadyForDatataking/Configuring/Configured/TriggerOn/TakingData
             // and Bias not in "data-taking state' => Red
-            if (fMcpConfigurationState>MCP::State::kIdle &&
-                !bias_on && !bias_off && !bias_ramp)
+            if (fMcpConfigurationState>MCP::State::kIdle && !bias_on)
                 col = HTML::kRed;
 
@@ -2786 +2783 @@
                 out << setprecision(2);
                 out << col << '\t';
-                out << (off ? 0 : fBiasControlCurrentMed) << '\t';
-                if (oc)
+                out << (bias_off ? 0 : fBiasControlCurrentMed) << '\t';
+                if (bias_oc)
                     out << "(OC) ";
                 else
                 {
                     if (cal)
-                        out << (off ? 0 : fBiasControlCurrentMax);
+                        out << (bias_off ? 0 : fBiasControlCurrentMax);
                     else
                         out << "&mdash; ";
@@ -2802 +2799 @@
                 out << setprecision(2) << fBiasControlPowerTot << " W" << setprecision(3);
             else
-                out << (off ? 0 : fBiasControlVoltageMed) << " V";
+                out << (bias_off ? 0 : fBiasControlVoltageMed) << " V";
             out << '\n';
         }