Changeset 15029

Timestamp:

03/11/13 22:32:33 (12 years ago)

Author:

tbretz

Message:

Some fixes to get the new calibrate_by_currents working.

File:

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

trunk/FACT++/src/ratecontrol.cc

@@ -393 +393 @@
         // Keep all median currents of the past 10 seconds
         fCurrents.push_back(make_pair(time, med));
-        while (fCurrents.size()>0)
-            if (time-fCurrents.front().first>boost::posix_time::seconds(10))
-                fCurrents.pop_front();
+        while (!fCurrents.empty())
+        {
+            if (time-fCurrents.front().first<boost::posix_time::seconds(10))
+                break;
+
+            fCurrents.pop_front();
+        }
 
         // If we are not doing a calibration no further action necessary
@@ -422 +426 @@
 
         fThresholdMin = 36.0833*pow(avg, 0.638393)+184.037;
+        fThresholdReference = fThresholdMin;
         fThresholds.assign(160, fThresholdMin);
 
@@ -471 +476 @@
         }
 
+        cout << "-1-" << endl;
+
         if (fDimDrive.state()<Drive::State::kMoving)
             Warn("Drive not even moving...");
+
+        cout << "-2-" << endl;
 
         fCounter = 0;
@@ -478 +487 @@
         fCalibrationTimeStart = Time();
 
+        cout << "-3-" << endl;
+
         ostringstream out;
         out << "Rate calibration by current " << fThresholdReference << " with a target rate of " << fTargetRate << " Hz";
         Info(out);
 
+        cout << "START" << endl;
+
         return RateControl::State::kSettingGlobalThreshold;
     }
@@ -514 +527 @@
     int Print() const
     {
+        cout << "PRINT" << endl;
         Out() << fDim << endl;
         Out() << fDimFTM << endl;
@@ -566 +580 @@
         fDimRS("RATE_SCAN"),
         fDimDrive("DRIVE_CONTROL"),
-
         fDimThreshold("RATE_CONTROL/THRESHOLD", "S:1;D:1;D:1",
                       "Resulting threshold after calibration"
@@ -583 +596 @@
         fDimFTM.Subscribe(*this);
         fDimRS.Subscribe(*this);
+        fDimDrive.Subscribe(*this);
 
         Subscribe("FTM_CONTROL/TRIGGER_RATES")