Changeset 12271 for trunk

Timestamp:

10/25/11 19:59:52 (13 years ago)

Author:

tbretz

Message:

Added the possibility to apply a global offset to the temperature controlled feedback values

File:

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

trunk/FACT++/src/feedback.cc

@@ -96 +96 @@
     double fT21;
 
+    double fBiasOffset;
+
     bool fOutputEnabled;
 
@@ -186 +188 @@
 
 
-            const float diff = (avg-25)*0.057;
+            const float diff = (avg-25)*4./70 + fBiasOffset;
 
             vector<float> vec(2*BIAS::kNumChannels);
@@ -534 +536 @@
     }
 
-    int StartTempCtrl()
-    {
+    int StartTempCtrl(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "StartTempCtrl", 4))
+            return kSM_FatalError;
+
+        fBiasOffset = evt.GetFloat();
         fCameraTemp = new DimStampedInfo("FSC_CONTROL/TEMPERATURE", (void*)NULL, 0, this);
+
+        ostringstream out;
+        out << "Starting temperature feedback with an offset of " << fBiasOffset << "V";
+        Message(out);
 
         return GetCurrentState();
@@ -690 +700 @@
             ("Start the feedback control loop");
 
-        AddEvent("START_TEMP_CONTROL", kStateConnected)
-            (bind(&StateMachineFeedback::StartTempCtrl, this))
+        AddEvent("START_TEMP_CONTROL", "F:1", kStateConnected)
+            (bind(&StateMachineFeedback::StartTempCtrl, this, placeholders::_1))
             ("Start the temperature control loop");