Changeset 196 for drsdaq

Timestamp:

04/01/10 16:08:50 (14 years ago)

Author:

ogrimm

Message:

Fixed bug with default feedback gain from config file

File:

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

drsdaq/HVFeedback.cc

@@ -79 +79 @@
 
   // Initial state
-  Gain = atoi(m->GetConfig("DefaultGain"));
+  Gain = atof(m->GetConfig("DefaultGain"));printf("Gain %d\n", Gain);
   SetFBMode(FB_Off);
   SetNumAverages(fDefaultNumAverage);
@@ -112 +112 @@
 
   // Check for LED trigger channel on given channel and if feedback running
-  //if (FBMode==FB_Off || m->WaveForm[fLedTrigBoard][fLedTrigChip][fLedTrigChannel][(fLedTrigSample+m->TriggerCell[fLedTrigBoard][fLedTrigChip])%kNumberOfBins] < fLedTrigThreshold) {
   if (FBMode==FB_Off || m->WaveForm[fLedTrigBoard][fLedTrigChip][fLedTrigChannel][fLedTrigSample] < fLedTrigThreshold) {
     return false;
@@ -153 +152 @@
             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
-        if(Correction==0 || Target[i][j][k] ==0 || PixMap->DRS_to_Pixel(i,j,k).empty()) break;
-
+                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);
 
@@ -354 +352 @@
 
   DimClient::sendCommand("Bias/Command", Textbuffer);
-
   return true;
 }