Changeset 13116 for trunk/FACT++

Timestamp:

03/15/12 09:27:28 (13 years ago)

Author:

tbretz

Message:

Do only request the status if the voltage is on; get some dummy reports for the currents before starting to calibrate; do not allow negative feedback corrections

File:

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

trunk/FACT++/src/feedback.cc

@@ -103 +103 @@
     vector<vector<float>> fData;
 
-    uint64_t fCursorCur;
+     int64_t fCursorCur;
     uint64_t fCursorAmpl;
 
@@ -172 +172 @@
             if (fCursorCur==0)
             {
-                DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
+                if (fStatusBias.second==BIAS::kVoltageOn)
+                    DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
                 return;
             }
@@ -181 +182 @@
             {
                 // 3900 Ohm/n  +  1000 Ohm  +  1150 Ohm
-                const double R = fMap.hv(i).group()==0 ? 3125 : 2930;
-                const double I = double(fCurrentsAvg[i])/fCursorCur - fCalibration[i];
+                const double R  = fMap.hv(i).group()==0 ? 3125 : 2930;
+                const double Im = double(fCurrentsAvg[i])/fCursorCur;
+                const double I  = Im>fCalibration[i] ? Im-fCalibration[i] : 0;
                 vec[i+416] += R * I*conv;
                 if (fCalibration[i]>0)
@@ -215 +217 @@
             return -1;
 
-        if (fStatusBias.second==BIAS::kRamping)
+        if (fStatusBias.second!=BIAS::kVoltageOn)
             return false;
+
+        if (fCursorCur++<0)
+            return true;
 
         const int16_t *ptr = static_cast<int16_t*>(fBiasA.getData());
@@ -226 +231 @@
         }
 
-        fCursorCur++;
-
         return true;
     }
@@ -240 +243 @@
         if (fCursorCur<100)
         {
-            if (fStatusBias.second!=BIAS::kRamping)
+            if (fStatusBias.second==BIAS::kVoltageOn)
                 DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
             return;
@@ -260 +263 @@
         fControlType = kIdle;
 
-        DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
+        if (fStatusBias.second==BIAS::kVoltageOn)
+            DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
     }
 
@@ -805 +809 @@
         Message(out);
 
-        DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
+        if (fStatusBias.second==BIAS::kVoltageOn)
+            DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
 
         return GetCurrentState();
@@ -817 +822 @@
         if (fCalibration.size()==0)
         {
-            ostringstream out;
-            out << "Current control needs a bias crate calibration first... command ignored.";
-            Error(out);
+            Warn("Current control needs a bias crate calibration first... command ignored.");
             return GetCurrentState();
         }
@@ -896 +899 @@
 //            return kSM_FatalError;
 
+        if (fStatusBias.second==BIAS::kRamping)
+        {
+            Warn("Calibration cannot be started when biasctrl is in state Ramping.");
+            return GetCurrentState();
+        }
+
         ostringstream out;
-        out << "Starting temperature feedback with an offset of -2V";
+        out << "Starting temperature feedback for calibration with an offset of -2V";
         Message(out);
 
         fBiasOffset = -2;
         fControlType = kTemp;
-        fCursorCur = 0;
+        fCursorCur = -10;
         fCurrentsAvg.assign(416, 0);
         fCurrentsRms.assign(416, 0);