Changeset 13138

Timestamp:

03/19/12 08:26:13 (13 years ago)

Author:

tbretz

Message:

Implemented request of current sttaus during current feedback once in a second to ensure a good average.

File:

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

trunk/FACT++/src/feedback.cc

@@ -173 +173 @@
             if (fCursorCur==0)
             {
-                if (fStatusBias.second==BIAS::kVoltageOn)
-                    DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
+                //DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
                 return;
             }
@@ -922 +921 @@
         fBiasOffset = -2;
         fControlType = kTemp;
-        fCursorCur = -10;
+        fCursorCur  = -10;
+        fCursorTemp =  0;
         fCursorTemp = 0;
         fCurrentsAvg.assign(416, 0);
@@ -1028 +1028 @@
             if (fControlType==kCurrents)
             {
-                /*
                 static Time past;
                 if (fCurrentRequestInterval>0 && Time()-past>boost::posix_time::milliseconds(fCurrentRequestInterval))
                 {
-                    DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
+                    if (fStatusBias.second!=BIAS::kRamping)
+                        DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
                     past = Time();
-                }*/
+                }
 
                 return fOutputEnabled ? kStateCurrentCtrlRunning : kStateCurrentCtrlIdle;