Changeset 13071 for trunk

Timestamp:

03/12/12 12:37:32 (13 years ago)

Author:

tbretz

Message:

Set the bias create resistor to 1150 Ohm which (according to the measurements of last night) seem to be a good compromise to include also cables, etc; added some more informative output to the Info

File:

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

trunk/FACT++/src/feedback.cc

@@ -166 +166 @@
             vec[i+416] = diff;
 
+        avg = 0;
+        num = 0;
         if (fControlType==kCurrents)
         {
@@ -178 +180 @@
             for (int i=0; i<BIAS::kNumChannels; i++)
             {
-                // 3900 Ohm/n  +  1000 Ohm  +  1100 Ohm
-                const double R = fMap.hv(i).group()==0 ? 3075 : 2880;
+                // 3900 Ohm/n  +  1000 Ohm  +  1150 Ohm
+                const double R = fMap.hv(i).group()==0 ? 3125 : 2930;
                 const double I = double(fCurrentsAvg[i])/fCursorCur - fCalibration[i];
                 vec[i+416] += R * I*conv;
+                if (fCalibration[i]>0)
+                {
+                    avg += vec[i+416];
+                    num++;
+                }
             }
+            avg /= num;
 
             fCurrentsAvg.assign(416, 0);
@@ -194 +202 @@
             return;
 
-        Info("Sending new absolute offset to biasctrl.");
+        ostringstream msg;
+        msg << setprecision(4) << "Sending new absolute offset (" << diff << "V+" << avg << "V) to biasctrl.";
+        Info(msg);
 
         DimClient::sendCommandNB((char*)"BIAS_CONTROL/SET_GAPD_REFERENCE_OFFSET",