Changeset 14186

Timestamp:

06/18/12 22:23:16 (12 years ago)

Author:

tbretz

Message:

Fixed a compilation issue.

File:

• trunk/FACT++/src/feedback.cc (modified) (2 diffs)

trunk/FACT++/src/feedback.cc

@@ -266 +266 @@
         fDimDeviation.Update(vec);
 
-        if (!fOutputEnabled) || fDimBias.state()!=BIAS::State::kVoltageOn)
+        if (!fOutputEnabled || fDimBias.state()!=BIAS::State::kVoltageOn)
             return GetCurrentState();
 
@@ -721 +721 @@
             AverageCurrents(evt);
 
-        if (curr==&fBiasA && fControlType==kCurrents &&
-            fCursorTemp>0 && fCursorCur>0)
+        /*
+        if (fControlType==kCurrents && fCursorTemp>0 && fCursorCur>0)
         {
             // fCursorTemp: 1 2 3 4 5 6 7 8
             // fCursor%x:   1 1 1 2 2 2 3 3    // 9 steps in ~15s
-            if (fCursorTemp<3 && fCursorCur%(fCursorTemp/3+1)==0)
+            //if (fCursorTemp<3 && fCursorCur%(fCursorTemp/3+1)==0)
                 HandleCurrentControl();
-        }
+        }*/
 
         return GetCurrentState();