Changeset 12347 for trunk

Timestamp:

10/31/11 18:53:01 (13 years ago)

Author:

tbretz

Message:

Make the FEEDBACK receive the data all the time for a combined control of temp and amplitude

File:

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

trunk/FACT++/src/feedback.cc

@@ -58 +58 @@
     };
 
+    enum control_t
+    {
+        kIdle,
+        kTemp,
+        kFeedback
+    };
+
+    control_t fControlType;
+
     PixelMap fMap;
 
@@ -72 +81 @@
     DimStampedInfo fBias;
 
-    DimStampedInfo *fBiasData;
-    DimStampedInfo *fCameraTemp;
+    DimStampedInfo fBiasData;
+    DimStampedInfo fCameraTemp;
 
     DimDescribedService fDimReference;
@@ -164 +173 @@
         }
 
-        if (curr==fCameraTemp)
+        if (curr==&fCameraTemp)
         {
             if (curr->getSize()==0)
@@ -194 +203 @@
                 vec[i+416] = diff;
 
+            if (fControlType!=kTemp)
+                return;
+
             fDimDeviation.Update(vec);
 
@@ -206 +218 @@
         }
 
-        if (curr==fBiasData)
+        if (curr==&fBiasData && fControlType==kFeedback)
         {
             if (curr->getSize()==0)
@@ -400 +412 @@
 
                             for (int i=0; i<BIAS::kNumChannels; i++)
-                                vec[i+416] = correction[i];
+                                vec[i+416] = avg[i]<5*2.5 ? 0 : correction[i];
 
                             fDimDeviation.Update(vec);
@@ -529 +541 @@
     int StartFeedback()
     {
-        fBiasData = new DimStampedInfo("FAD_CONTROL/FEEDBACK_DATA", (void*)NULL, 0, this);
-
         ResetData();
+
+        fControlType = kFeedback;
 
         return GetCurrentState();
@@ -540 +552 @@
         if (!CheckEventSize(evt.GetSize(), "StartTempCtrl", 4))
             return kSM_FatalError;
-
-        fBiasOffset = evt.GetFloat();
-        fCameraTemp = new DimStampedInfo("FSC_CONTROL/TEMPERATURE", (void*)NULL, 0, this);
 
         ostringstream out;
@@ -548 +557 @@
         Message(out);
 
+        fBiasOffset = evt.GetFloat();
+        fControlType = kTemp;
+
         return GetCurrentState();
     }
@@ -553 +565 @@
     int StopFeedback()
     {
-        if (fBiasData)
-        {
-            delete fBiasData;
-            fBiasData = 0;
-        }
-
-        if (fCameraTemp)
-        {
-            delete fCameraTemp;
-            fCameraTemp = 0;
-        }
+        fControlType = kIdle;
 
         return GetCurrentState();
@@ -599 +601 @@
             return kSM_FatalError;
 
+        /*
         const float val = evt.GetFloat();
         if (!fPV[0].size() && !fPV[1].size() && !fPV[2].size())
@@ -604 +607 @@
             Warn("No values in memory. Take enough events first!");
             return GetCurrentState();
-        }
+        }*/
 
         vector<float> vec(BIAS::kNumChannels);
@@ -641 +644 @@
         // All subsystems are connected
 
-        if (fBiasData)
+        if (fControlType==kFeedback)
             return fOutputEnabled ? kStateFeedbackCtrlRunning : kStateFeedbackCtrlIdle;
 
-        if (fCameraTemp)
+        if (fControlType==kTemp)
             return fOutputEnabled ? kStateTempCtrlRunning : kStateTempCtrlIdle;
 
@@ -659 +662 @@
         fFSC("FSC_CONTROL/STATE",       (void*)NULL, 0, this),
         fBias("BIAS_CONTROL/STATE",     (void*)NULL, 0, this),
-        fBiasData(0), fCameraTemp(0),
+        fBiasData("FAD_CONTROL/FEEDBACK_DATA", (void*)NULL, 0, this),
+        fCameraTemp("FSC_CONTROL/TEMPERATURE", (void*)NULL, 0, this),
         fDimReference("FEEDBACK/REFERENCE", "F:416",        ""),
         fDimDeviation("FEEDBACK/DEVIATION", "F:416;F:416",  ""),