Changeset 12825


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/feedback.cc

    r12805 r12825  
    249249            {
    250250                fCalibration[i]     = double(fCurrentsAvg[i])/fCursor;
    251                 fCalibration[i+416] = sqrt(double(fCurrentsRms[i])/fCursor-val[i]*val[i]);
     251                fCalibration[i+416] = sqrt(double(fCurrentsRms[i])/fCursor-fCalibration[i]*fCalibration[i]);
    252252            }
    253253
     
    529529        {
    530530            Out() << "No calibration performed so far." << endl;
    531             return GetCurrentStatus();
     531            return GetCurrentState();
    532532        }
    533533
     
    537537                Out() << setw(2) << k << "|" << setw(2) << j*4 << "|";
    538538                for (int i=0; i<4; i++)
    539                     Out() << Tools::Format(" %6.1f+-4.1f", fCalibration[i], fCalibration[i+416]);
     539                    Out() << Tools::Form(" %6.1f+-%4.1f", fCalibration[i], fCalibration[i+416]);
    540540                Out() << endl;
    541541            }
    542         }
    543542
    544543        return GetCurrentState();
Note: See TracChangeset for help on using the changeset viewer.