Changeset 15148

Timestamp:

03/25/13 09:35:32 (12 years ago)

Author:

tbretz

Message:

Removed some debug output. Moved to a slightly less conservative threshold formula.

File:

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

trunk/FACT++/src/ratecontrol.cc

@@ -480 +480 @@
 
         //fThresholdMin = max(uint16_t(36.0833*pow(avg, 0.638393)+184.037), fThresholdReference);
-        fThresholdMin = max(uint16_t(36.0833*pow(avg, 0.638393)+210), fThresholdReference);
+        //fThresholdMin = max(uint16_t(42.4*pow(avg, 0.642)+182), fThresholdReference);
+        fThresholdMin = max(uint16_t(41.6*pow(avg, 0.642)+175), fThresholdReference);
         fThresholds.assign(160, fThresholdMin);
 
@@ -494 +495 @@
             if (vec[i]-avg>6*avg_dev)
             {
-                fThresholds[i] = max(uint16_t(36.0833*pow(vec[i], 0.638393)+185), fThresholdReference);
-
-                cout << "i=" << i << " " << avg << " " << avg_dev << " " << vec[i] << " " << fThresholds[i] << endl;
+                fThresholds[i] = max(uint16_t(40.5*pow(vec[i], 0.642)+164), fThresholdReference);
 
                 const int32_t dat[2] = { i, fThresholds[i] };
@@ -506 +505 @@
 
         avg2 /= 160;
-        cout << "AVG2="<<avg2 << endl;
 
         const RateControl::DimThreshold data = { fThresholdMin, fCalibrationTimeStart.Mjd(), Time().Mjd() };