Changeset 12068 for trunk

Timestamp:

09/11/11 21:35:52 (13 years ago)

Author:

tbretz

Message:

Multiply the ETH voltages not the FTM voltages; added some reference voltages to the comments.

File:

• trunk/FACT++/src/fscctrl.cc (modified) (2 diffs)

trunk/FACT++/src/fscctrl.cc

@@ -333 +333 @@
             currents[idx+20] *= -1;
         }
-        voltages[26] *=  2;
-        voltages[27] *= -2;
+        voltages[24] *=  2;
+        voltages[25] *=  2;
+        voltages[27] *= -1;
         voltages[29] *= -1;
         currents[27] *= -1;
@@ -353 +354 @@
         /*
          index  unit    offset  scale   crate   for board:
-         0      mV      0       1       0       FAD
-         24     mV      0       1       1       FAD
-         16     mV      0       1       2       FAD
-         8      mV      0       1       3       FAD
-
-         1      mV      0       1       0       FAD
-         25     mV      0       1       1       FAD
-         17     mV      0       1       2       FAD
-         9      mV      0       1       3       FAD
-
-         2      mV      0       -1      0       FAD
-         26     mV      0       -1      1       FAD
-         18     mV      0       -1      2       FAD
-         10     mV      0       -1      3       FAD
+         0      mV      0       1       0       FAD  3.3V
+         24     mV      0       1       1       FAD  3.3V
+         16     mV      0       1       2       FAD  3.3V
+         8      mV      0       1       3       FAD  3.3V
+
+         1      mV      0       1       0       FAD  3.3V
+         25     mV      0       1       1       FAD  3.3V
+         17     mV      0       1       2       FAD  3.3V
+         9      mV      0       1       3       FAD  3.3V
+
+         2      mV      0       -1      0       FAD  -2.0V
+         26     mV      0       -1      1       FAD  -2.0V
+         18     mV      0       -1      2       FAD  -2.0V
+         10     mV      0       -1      3       FAD  -2.0V
 
          --
 
-         3      mV      0       1       0       FPA
-         27     mV      0       1       1       FPA
-         19     mV      0       1       2       FPA
-         11     mV      0       1       3       FPA
-
-         4      mV      0       1       0       FPA
-         28     mV      0       1       1       FPA
-         20     mV      0       1       2       FPA
-         12     mV      0       1       3       FPA
-
-         5      mV      0       -1      0       FPA
-         29     mV      0       -1      1       FPA
-         21     mV      0       -1      2       FPA
-         13     mV      0       -1      3       FPA
+         3      mV      0       1       0       FPA  5.0V
+         27     mV      0       1       1       FPA  5.0V
+         19     mV      0       1       2       FPA  5.0V
+         11     mV      0       1       3       FPA  5.0V
+
+         4      mV      0       1       0       FPA  3.3V
+         28     mV      0       1       1       FPA  3.3V
+         20     mV      0       1       2       FPA  3.3V
+         12     mV      0       1       3       FPA  3.3V
+
+         5      mV      0       -1      0       FPA  -3.3V
+         29     mV      0       -1      1       FPA  -3.3V
+         21     mV      0       -1      2       FPA  -3.3V
+         13     mV      0       -1      3       FPA  -3.3V
 
          --
 
-         32     mV      0       1       bottom  ETH
-         36     mV      0       1       top     ETH
-
-         33     mV      0       1       bottom  FTM
-         34     mV      0       -1      bottom  FTM
-
-         37     mV      0       1       top     FFC
-         38     mV      0       -1      top     FLP
+         32     mV      0       1       bottom  ETH   5V
+         36     mV      0       1       top     ETH   5V
+
+         33     mV      0       1       bottom  FTM   3.3V
+         34     mV      0       -1      bottom  FTM  -3.3V
+
+         37     mV      0       1       top     FFC   3.3V
+         38     mV      0       -1      top     FLP  -3.3V
 
          -----