Changeset 226 for drsdaq/HVFeedback.cc

Timestamp:

06/18/10 12:25:29 (14 years ago)

Author:

ogrimm

Message:

Small changes to mutex handling in hvcontrol and drsdaq

File:

• drsdaq/HVFeedback.cc (modified) (11 diffs)

drsdaq/HVFeedback.cc

@@ -25 +25 @@
 // Constructor: Initialise feedback 
 //
-HVFeedback::HVFeedback(DAQReadout* DAQClass){//:
-                        //EvidenceServer(SERVER_NAME){
+HVFeedback::HVFeedback(DAQReadout* DAQClass){
 
   m = DAQClass;
@@ -139 +138 @@
   }
   
-  // Update DIM service regularly
+  // Update DIM count service regularly
   if (time(NULL)-LastServiceUpdate > 2) {
     LastServiceUpdate = time(NULL);
@@ -148 +147 @@
 
   // Feedback action
+  std::stringstream Cmd;
+  
   for (i=m->FirstBoard; i<=m->LastBoard; i++) {
   for (j=0; j<fNumberOfChips; j++) {
@@ -165 +166 @@
 
                 if(fabs(Average[i][j][k]) < 2*Sigma[i][j][k]) printf("Too noisy!\n");
-                else WriteHVCommand("hv %s %+f\n",PixMap->DRS_to_Pixel(i,j,k).c_str(), Correction);
-
+                else {
+                  Cmd << PixMap->DRS_to_Pixel(i,j,k)+" " << std::showpos << Correction << " ";
+                }
             break;
 
@@ -175 +177 @@
           case FB_ResponseFirst:  // First point of response measurement done  
             Buffer[i][j][k] = Average[i][j][k];
-            if(!PixMap->DRS_to_Pixel(i,j,k).empty()) WriteHVCommand("hv %s %+f",PixMap->DRS_to_Pixel(i,j,k).c_str(), DiffVoltage);
+            if(!PixMap->DRS_to_Pixel(i,j,k).empty()) {
+                  Cmd << PixMap->DRS_to_Pixel(i,j,k) << " " << std::showpos << DiffVoltage << " ";                
+                }
             break;
 
@@ -184 +188 @@
             }
             else Response[i][j][k] = DiffVoltage/(Buffer[i][j][k]-Average[i][j][k]);
-            if(!PixMap->DRS_to_Pixel(i,j,k).empty()) WriteHVCommand("hv %s %+f",PixMap->DRS_to_Pixel(i,j,k).c_str(), -DiffVoltage/2);
+            if(!PixMap->DRS_to_Pixel(i,j,k).empty()) {
+                  Cmd << PixMap->DRS_to_Pixel(i,j,k) << " " << std::showpos << -DiffVoltage/2 << " ";                             
+                }
             break;
 
@@ -196 +202 @@
   FeedbackAverage->updateService();
   FeedbackSigma->updateService();
+
+  // Send command
+  if (!Cmd.str().empty()) {
+        DimClient::sendCommand("Bias/Command", ("hv "+Cmd.str()).c_str());
+  }
 
   switch (FBMode) {
@@ -269 +280 @@
   else {
     FBMode = Mode;
-        if (Mode != FB_ResponseFirst) m->State(m->INFO, "%s", FBState_Description[FBMode]);
-        else m->State(m->INFO, "%s (voltage difference %.3f)", FBState_Description[FBMode], DiffVoltage);
+        if (Mode != FB_ResponseFirst) m->Message(m->INFO, "%s", FBState_Description[FBMode]);
+        else m->Message(m->INFO, "%s (voltage difference %.3f)", FBState_Description[FBMode], DiffVoltage);
     ClearAverages();
   }
@@ -320 +331 @@
 void HVFeedback::MeasureResponse(float U) {
 
+  std::stringstream Cmd;
+
   if (U==0) {
     m->PrintMessage("HV Feedback: Error, voltage difference must not non-zero.\n");
@@ -325 +338 @@
   }
 
-  for (int i=m->FirstBoard; i<=m->LastBoard; i++) 
-    for (int j=0; j<fNumberOfChips; j++) 
-      for (int k=0; k<fNumberOfChannels; k++) {
-                if(!PixMap->DRS_to_Pixel(i,j,k).empty()) {
-          WriteHVCommand("hv %s %+f\n",PixMap->DRS_to_Pixel(i,j,k).c_str(), -U/2);
-        }
-      }
+  for (int i=m->FirstBoard; i<=m->LastBoard; i++) { 
+  for (int j=0; j<fNumberOfChips; j++) { 
+  for (int k=0; k<fNumberOfChannels; k++) {
+        if(!PixMap->DRS_to_Pixel(i,j,k).empty()) {
+          Cmd << PixMap->DRS_to_Pixel(i,j,k) << " " << std::showpos << -U/2 << " ";                               
+    }
+  }
+  }
+  }
+  
+  // Send command
+  if (!Cmd.str().empty()) {
+        DimClient::sendCommand("Bias/Command", ("hv "+Cmd.str()).c_str());
+  }
+
   DiffVoltage = U;
   SetFBMode(FB_ResponseFirst, true);
@@ -351 +372 @@
 
 //
-// Write bias voltage commmand
-//
-bool HVFeedback::WriteHVCommand(const char *Format, ...) {
-
-  char Textbuffer[MAX_COM_SIZE];
-  
-  va_list ArgumentPointer;  va_start(ArgumentPointer, Format); 
-  vsnprintf(Textbuffer, sizeof(Textbuffer), Format, ArgumentPointer);
-
-  DimClient::sendCommand("Bias/Command", Textbuffer);
-  return true;
-}
-
-//
 // Print feedback configuration
 //