Changeset 254 for drsdaq/HVFeedback.cc

Timestamp:

07/20/10 13:20:47 (14 years ago)

Author:

ogrimm

Message:

Replaced mutex by Lock()/Unlock() from Evidence class, added feedback state service

File:

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

drsdaq/HVFeedback.cc

@@ -30 +30 @@
 
   m = DAQClass;
-
   fNumberOfChannels = m->GetBoard(0)->GetNumberOfChannels();
   fNumberOfChips = m->GetBoard(0)->GetNumberOfChips();  
@@ -77 +76 @@
   }
   
-  PrintConfig(MsgToLog);
-
   // Provide DIM services
-  FeedbackAverage = new DimService (SERVER_NAME"/Average", "F", DIMAverage, m->NumBoards*kNumberOfChipsMax*kNumberOfChannelsMax*sizeof(float));
-  FeedbackSigma = new DimService (SERVER_NAME"/Sigma", "F", DIMSigma, m->NumBoards*kNumberOfChipsMax*kNumberOfChannelsMax*sizeof(float));
-  FeedbackResponse = new DimService (SERVER_NAME"/Response", "F", Response, m->NumBoards*kNumberOfChipsMax*kNumberOfChannelsMax*sizeof(float));
-  FeedbackTarget = new DimService (SERVER_NAME"/Target", "F", Target, m->NumBoards*kNumberOfChipsMax*kNumberOfChannelsMax*sizeof(float));
-  CountService = new DimService (SERVER_NAME"/Count", Count);
+  FeedbackAverage = new DimService ("Feedback/Average", "F", DIMAverage, m->NumBoards*kNumberOfChipsMax*kNumberOfChannelsMax*sizeof(float));
+  FeedbackSigma = new DimService ("Feedback/Sigma", "F", DIMSigma, m->NumBoards*kNumberOfChipsMax*kNumberOfChannelsMax*sizeof(float));
+  FeedbackResponse = new DimService ("Feedback/Response", "F", Response, m->NumBoards*kNumberOfChipsMax*kNumberOfChannelsMax*sizeof(float));
+  FeedbackTarget = new DimService ("Feedback/Target", "F", Target, m->NumBoards*kNumberOfChipsMax*kNumberOfChannelsMax*sizeof(float));
+  CountService = new DimService ("Feedback/Count", Count);
+  FeedbackState = new DimService ("Feedback/State", "I:1;C", NULL, 0);
 
   // Initial state
@@ -98 +96 @@
 HVFeedback::~HVFeedback() {
 
+  delete FeedbackState;
   delete CountService;
   delete FeedbackAverage;
@@ -105 +104 @@
 
   delete[] Average;     delete[] Response;
-  delete[] DIMAverage;          delete[] DIMSigma;
+  delete[] DIMAverage;  delete[] DIMSigma;
   delete[] Sigma;
   delete[] Target;      delete[] Buffer;
@@ -159 +158 @@
         
         switch (FBMode) {
-          case FB_Active:   // Determine correction from response maxtrix and change voltages
+          case FB_Active:
+                // Determine correction from response maxtrix and change voltages
             Correction = -(Target[i][j][k] - Average[i][j][k])*Response[i][j][k]*Gain;
-        if (fabs(Correction) > 0.1) Correction = fabs(Correction)/Correction*0.1;   // Limit changes to 100 mV
+        // Limit voltage steps
+                if (fabs(Correction) > 0.1) Correction = fabs(Correction)/Correction*0.1;   // Limit changes to 100 mV
+                // Check if voltage change command possible
                 if(Correction==0 || Target[i][j][k]==0 || PixMap->DRS_to_Pixel(i,j,k).empty()) break;
-        printf("Average of board %d, chip %d, channel %d is %.2f +/- %.2f    Correction %.3f\n",i,j,k,Average[i][j][k],Sigma[i][j][k],Correction);
-
-                if(fabs(Average[i][j][k]) < 2*Sigma[i][j][k]) printf("Too noisy!\n");
-                else {
+                // Add voltage change command if not too noisy
+                if(fabs(Average[i][j][k]) > 2*Sigma[i][j][k]) {
                   Cmd << PixMap->DRS_to_Pixel(i,j,k)+" " << std::showpos << Correction << " ";
                 }
@@ -184 +184 @@
           case FB_ResponseSecond: // Determine response from signal variation
             if(Buffer[i][j][k] == Average[i][j][k]) {
-              m->PrintMessage("HV Feedback: Warning, response singular for board %d, chip %d, channel %d.\n",i,j,k);
+              m->PrintMessage("HV Feedback: Warning, response singular for board %d, chip %d, channel %d\n",i,j,k);
               Response[i][j][k] = 0;
             }
@@ -211 +211 @@
     case FB_Targets:
           FeedbackTarget->updateService();
-      m->PrintMessage("HV Feedback: New targets set, switching off.\n");
+      m->PrintMessage("HV Feedback: New targets set, switching off\n");
       SetFBMode(FB_Off, true);
       break;
     case FB_ResponseFirst:
       SetFBMode(FB_ResponseSecond, true);
-      m->PrintMessage("HV Feedback: Increasing voltages by %f for response measurement, acquiring data.\n", DiffVoltage);
+      m->PrintMessage("HV Feedback: Increasing voltages by %f for response measurement, acquiring data\n", DiffVoltage);
       break;
     case FB_ResponseSecond:
           FeedbackResponse->updateService();
-      m->PrintMessage("HV Feedback: Response measurements finished, original voltages set, switching off.\n");
+      m->PrintMessage("HV Feedback: Response measurements finished, original voltages set, switching off\n");
       SetFBMode(FB_Off, true);
       break;
@@ -277 +277 @@
 void HVFeedback::SetFBMode(FBState Mode, bool Internal) {
   if((Mode==FB_ResponseFirst || Mode==FB_ResponseFirst) && !Internal)
-      m->PrintMessage("Start reponse measurement by calling MeasureResponse().\n");
+      m->PrintMessage("Start reponse measurement by calling MeasureResponse()\n");
   else {
     FBMode = Mode;
-        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);
+        if (Mode != FB_ResponseFirst) m->PrintMessage("%s\n", FBState_Description[FBMode]);
+        else m->PrintMessage("%s (voltage difference %.3f)\n", FBState_Description[FBMode], DiffVoltage);
     ClearAverages();
+        
+        // Update state service
+        State.State = FBMode;
+        strncpy(State.Text, FBState_Description[FBMode], sizeof(State.Text));
+        FeedbackState->updateService(&State, sizeof(State));
   }
 }
@@ -374 +379 @@
 // Print feedback configuration
 //
-void HVFeedback::PrintConfig(int Target) {
-
-  m->PrintMessage(Target, "LedTrigBoard: %d\t\tLedTrigChip: %d\t\tLedTrigChannel: %d\n"
+void HVFeedback::PrintConfig() {
+
+  m->PrintMessage("LedTrigBoard: %d\t\tLedTrigChip: %d\t\tLedTrigChannel: %d\n"
         "LedTrigSample: %d\tLedTrigThreshold: %.2f\n"
         "LedSignalSample: %d\tLedBaselineSample: %d\tDefaultNumAverage: %d\n"