Changeset 18798

Timestamp:

04/01/17 22:00:42 (8 years ago)

Author:

tbretz

Message:

Issue the ramping in emergency case only if any channel is not at 0.

File:

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

trunk/FACT++/src/biasctrl.cc

@@ -1494 +1494 @@
     }
 
+    bool HasOvercurrent() const
+    {
+        for (int ch=0; ch<kNumChannels; ch++)
+            if (fPresent[ch/kNumChannelsPerBoard] && fCurrent[ch]<0)
+                return true;
+
+        return false;
+    }
+
+    bool IsVoltageOff() const
+    {
+        for (int ch=0; ch<kNumChannels; ch++)
+            if (fPresent[ch/kNumChannelsPerBoard] && fDacActual[ch]!=0)
+                return false;
+
+        return true;
+    }
+
     State::states_t GetStatus()
     {
@@ -1508 +1526 @@
             return State::kRamping;
 
-        for (int ch=0; ch<kNumChannels; ch++)
-            if (fPresent[ch/kNumChannelsPerBoard] && fCurrent[ch]<0)
-                return State::kOverCurrent;
-
-        bool isoff = true;
-        for (int ch=0; ch<kNumChannels; ch++)
-            if (fPresent[ch/kNumChannelsPerBoard] && fDacActual[ch]!=0)
-                isoff = false;
-        if (isoff)
+        if (HasOvercurrent())
+            return State::kOverCurrent;
+
+        if (IsVoltageOff())
             return State::kVoltageOff;
 
@@ -1943 +1956 @@
         {
             // This needs to be repeated for the case that in between a different command was processed
-            fBias.RampAllDacs(0);
+            if (!fBias.IsVoltageOff())
+                fBias.RampAllDacs(0);
+
             return State::kLocked;
         }