Changeset 13482

Timestamp:

04/30/12 22:53:26 (13 years ago)

Author:

tbretz

Message:

The calibration offset must be subtracted from the voltage to calculate the resistor.

File:

• trunk/FACT++/src/feedback.cc (modified) (1 diff)

trunk/FACT++/src/feedback.cc

@@ -379 +379 @@
             const double I = double(fCurrentsAvg[i])/fCursorCur;
 
-            res[i] = fVoltGapd[i]/I / conv * 1e6;
+            res[i] = (fVoltGapd[i]+fCalibrationOffset)/I / conv * 1e6;
             avg[i] = conv * I;
             rms[i] = conv * sqrt(double(fCurrentsRms[i])/fCursorCur-I*I);