Changeset 13238 for trunk

Timestamp:

03/26/12 22:02:52 (13 years ago)

Author:

tbretz

Message:

Updated to new biasctrl commands; removed some obsolete endl; reduced the resistance for the broken pixels' patches

File:

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

trunk/FACT++/src/feedback.cc

@@ -216 +216 @@
                 // have a 1kOhm instead of 390 Ohm serial resistor
                 if (i==66 || i==193)
-                    U /= 2665./R[0];    // (1k)2665 / (390)2400 / (~0)2110
+                    U /= 2110./R[0];    // (1k)2665 / (390)2400 / (~0)2110
                 if (i==191)
-                    U /= 2594./R[1];    // (1k)2794 / (390)2320 / (~0)2110
+                    U /= 2110./R[1];    // (1k)2794 / (390)2320 / (~0)2110
 
                 vec[i+BIAS::kNumChannels] += U;
@@ -262 +262 @@
         {
             msg.str("");
-            msg << "   Avg0=" << setw(5) << avg[0]/num[0]    << "  |  Avg1=" << setw(5) << avg[1]/num[1]    << endl;
+            msg << "   Avg0=" << setw(7) << avg[0]/num[0]    << "  |  Avg1=" << setw(7) << avg[1]/num[1];
             Debug(msg);
 
             msg.str("");
-            msg << "   Med0=" << setw(5) << med[0][num[0]/2] << "  |  Med1=" << setw(5) << med[1][num[1]/2] << endl;
+            msg << "   Med0=" << setw(7) << med[0][num[0]/2] << "  |  Med1=" << setw(7) << med[1][num[1]/2];
             Debug(msg);
 
             msg.str("");
-            msg << "   Min0=" << setw(5) << min[0]           << "  |  Min1=" << setw(5) << min[1]           << endl;
+            msg << "   Min0=" << setw(7) << min[0]           << "  |  Min1=" << setw(7) << min[1];
             Debug(msg);
 
             msg.str("");
-            msg << "   Max0=" << setw(5) << max[0]           << "  |  Max1=" << setw(5) << max[1]          << endl;
+            msg << "   Max0=" << setw(7) << max[0]           << "  |  Max1=" << setw(7) << max[1];
             Debug(msg);
         }
@@ -551 +551 @@
         Info("Sending new relative offset to biasctrl.");
 
-        DimClient::sendCommandNB("BIAS_CONTROL/ADD_REFERENCE_VOLTAGES",
+        DimClient::sendCommandNB("BIAS_CONTROL/INCREASE_ALL_CHANNELS_VOLTAGE",
                                  vec.data()+BIAS::kNumChannels, BIAS::kNumChannels*sizeof(float));
     }
@@ -683 +683 @@
         Info("Sending new global relative offset to biasctrl.");
 
-        DimClient::sendCommandNB("BIAS_CONTROL/ADD_REFERENCE_VOLTAGES",
+        DimClient::sendCommandNB("BIAS_CONTROL/INCREASE_ALL_CHANNELS_VOLTAGE",
                                  vec.data()+BIAS::kNumChannels, BIAS::kNumChannels*sizeof(float));
     }