Changeset 12825

Timestamp:

02/03/12 12:37:44 (13 years ago)

Author:

tbretz

Message:

Fixed a couple of stupid mistakes introduced with the last commit.

File:

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

trunk/FACT++/src/feedback.cc

@@ -249 +249 @@
             {
                 fCalibration[i]     = double(fCurrentsAvg[i])/fCursor;
-                fCalibration[i+416] = sqrt(double(fCurrentsRms[i])/fCursor-val[i]*val[i]);
+                fCalibration[i+416] = sqrt(double(fCurrentsRms[i])/fCursor-fCalibration[i]*fCalibration[i]);
             }
 
@@ -529 +529 @@
         {
             Out() << "No calibration performed so far." << endl;
-            return GetCurrentStatus();
+            return GetCurrentState();
         }
 
@@ -537 +537 @@
                 Out() << setw(2) << k << "|" << setw(2) << j*4 << "|";
                 for (int i=0; i<4; i++)
-                    Out() << Tools::Format(" %6.1f+-4.1f", fCalibration[i], fCalibration[i+416]);
+                    Out() << Tools::Form(" %6.1f+-%4.1f", fCalibration[i], fCalibration[i+416]);
                 Out() << endl;
             }
-        }
 
         return GetCurrentState();