Changeset 12351 for trunk

Timestamp:

10/31/11 19:02:47 (13 years ago)

Author:

tbretz

Message:

Set some fixed control loop parameters as determined in Zurich; output also the state of the FSC

File:

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

trunk/FACT++/src/feedback.cc

@@ -324 +324 @@
                 const Time tm0 = Time();
 
-                const double T21 = fT>0 ? fT : (tm0-fStartTime).total_microseconds()/1000000.;
+                /*const*/ double T21 = fT>0 ? fT : (tm0-fStartTime).total_microseconds()/1000000.;
                 const double T10 = fT21;
                 fT21 = T21;
@@ -372 +372 @@
                             // => Kd = 0.1  * gain/20s = 0.00003
 
+                            fKp = 0;
+                            fKd = 0;
+                            fKi = 0.00003*20;
+                            T21 = 1;
+
+                            //valarray<double> correction = - Kp*(PV[2] - PV[1]) + Ki * dT * (SP-PV[2]) - Kd/dT * (PV[2] - 2*PV[1] + PV[0]);
                             //valarray<double> correction =
                             // -      Kp * (PV[2] - PV[1])
@@ -504 +510 @@
 
         PrintState(fStatusFAD,  "FAD_CONTROL");
+        PrintState(fStatusFSC,  "FSC_CONTROL");
         PrintState(fStatusBias, "BIAS_CONTROL");