Changeset 13456 for trunk/FACT++/src

Timestamp:

04/26/12 11:03:20 (13 years ago)

Author:

tbretz

Message:

Changed CALIBRATION service to SI units.

File:

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

trunk/FACT++/src/feedback.cc

@@ -237 +237 @@
 
                 // Average measured current
-                const double Im = double(fCurrentsAvg[i])/fCursorCur; // [dac]
+                const double Im = double(fCurrentsAvg[i])/fCursorCur * conv; // [A]
 
                 // Group index (0 or 1) of the of the pixel (4 or 5 pixel patch)
@@ -258 +258 @@
                 // Offset at the calibration point (make sure that the calibration is
                 // valid (Im[i]>Iavg[i]) and we operate above the calibration point)
-                const double I = Im>Iavg[i] ? (Im - Iavg[i])*conv : 0; // [A]
+                const double I = Im>Iavg[i] ? Im - Iavg[i]*1e-6 : 0; // [A]
 
                 // Make sure that the averaged resistor is valid
@@ -373 +373 @@
         float *res = fCalibration.data()+BIAS::kNumChannels*2;
 
+        const double conv = 5000./4096;
+
         for (int i=0; i<BIAS::kNumChannels; i++)
         {
             const double I = double(fCurrentsAvg[i])/fCursorCur;
 
-            res[i] = fVoltGapd[i]/I * 4096/5000e-6;
-            avg[i] = I;
-            rms[i] = sqrt(double(fCurrentsRms[i])/fCursorCur-I*I);
+            res[i] = fVoltGapd[i]/I / conv * 1e6;
+            avg[i] = conv * I;
+            rms[i] = conv * sqrt(double(fCurrentsRms[i])/fCursorCur-I*I);
         }
 
@@ -1218 +1220 @@
         fDimCalibration("FEEDBACK/CALIBRATION", "F:416;F:416;F:416",
                         "Current offsets"
-                        "|Avg[dac]:Average offset (5000uA/4096dac)"
-                        "|Rms[dac]:Rms of offset (5000uA/4096dac)"
+                        "|Avg[uA]:Average offset"
+                        "|Rms[uA]:Rms of offset"
                         "|R[Ohm]:Measured calibration resistor"),
         fSP(BIAS::kNumChannels),