Changeset 12805

Timestamp:

02/01/12 09:09:38 (13 years ago)

Author:

tbretz

Message:

Store calibration; implemented command to print a stored calibration; fixed a bug which caused the feedback to remain in state Calibrating even a STOP command was issued.

File:

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

trunk/FACT++/src/feedback.cc

@@ -93 +93 @@
     vector<int64_t>  fCurrentsRms;
 
+    vector<double>   fCalibration;
+
     vector<vector<float>> fData;
 
@@ -243 +245 @@
             }
 
-            vector<float> val(2*416, 0);
+            fCalibration.resize(416);
             for (int i=0; i<416; i++)
             {
-                val[i]     = double(fCurrentsAvg[i])/fCursor;
-                val[i+416] = sqrt(double(fCurrentsRms[i])/fCursor-val[i]*val[i]);
-            }
-
-            fDimCalibration.Update(val);
+                fCalibration[i]     = double(fCurrentsAvg[i])/fCursor;
+                fCalibration[i+416] = sqrt(double(fCurrentsRms[i])/fCursor-val[i]*val[i]);
+            }
+
+            fDimCalibration.Update(fCalibration);
 
             fOutputEnabled = false;
@@ -522 +524 @@
     }
 
+    int PrintCalibration()
+    {
+        if (fCalibration.size()==0)
+        {
+            Out() << "No calibration performed so far." << endl;
+            return GetCurrentStatus();
+        }
+
+        for (int k=0; k<13; k++)
+            for (int j=0; j<8; j++)
+            {
+                Out() << setw(2) << k << "|" << setw(2) << j*4 << "|";
+                for (int i=0; i<4; i++)
+                    Out() << Tools::Format(" %6.1f+-4.1f", fCalibration[i], fCalibration[i+416]);
+                Out() << endl;
+            }
+        }
+
+        return GetCurrentState();
+    }
+
     int SetConstant(const EventImp &evt, int constant)
     {
@@ -644 +667 @@
         fCurrentsAvg.assign(416, 0);
         fCurrentsRms.assign(416, 0);
+        fCalibration.resize(0);
         fStartTime = Time();
         fOutputEnabled = true;
@@ -673 +697 @@
             fStatusFSC.second<2)
             return kStateConnecting;
-
-        if (GetCurrentState()==kStateCalibrating && fCursor<100)
-            return GetCurrentState();
 
 /*
@@ -720 +741 @@
 
         if (fControlType==kTemp)
+        {
+            if (GetCurrentState()==kStateCalibrating && fCursor<100)
+                return GetCurrentState();
+
             return fOutputEnabled ? kStateTempCtrlRunning : kStateTempCtrlIdle;
+        }
 
         return kStateConnected;
@@ -834 +860 @@
         AddEvent("PRINT")
             (bind(&StateMachineFeedback::Print, this))
+            ("");
+
+        AddEvent("PRINT_CALIBRATION")
+            (bind(&StateMachineFeedback::PrintCalibration, this))
             ("");
     }