Changeset 182 for drsdaq/HVFeedback.cc

Timestamp:

03/12/10 15:53:20 (15 years ago)

Author:

ogrimm

Message:

Updates to DIM integration

File:

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

drsdaq/HVFeedback.cc

@@ -25 +25 @@
 // Constructor: Initialise feedback 
 //
-HVFeedback::HVFeedback(DAQReadout* DAQClass, char* Configfile):
-                        EvidenceServer(SERVER_NAME){
+HVFeedback::HVFeedback(DAQReadout* DAQClass){//:
+                        //EvidenceServer(SERVER_NAME){
 
   m = DAQClass;
 
-  fNumberOfChannels = m->fNumberOfChannels;
-  fNumberOfChips = m->fNumberOfChips;  
+  fNumberOfChannels = m->GetBoard(0)->GetNumberOfChannels();
+  fNumberOfChips = m->GetBoard(0)->GetNumberOfChips();  
 
   PixMap = new PixelMap(PIXMAP_LOCATION, false);
@@ -45 +45 @@
   DIMSigma   = new float [m->NumBoards][kNumberOfChipsMax][kNumberOfChannelsMax]();
 
-  // Read configuration file
-  FILE *File;
-  if ((File = fopen(Configfile,"r")) == NULL) {
-    printf("Error: Could not open feedback configuration file '%s'\n", Configfile);
-  }
-  else {
-    printf("Reading feedback configuration file %s\n", Configfile);
-    ReadCard("TrigBoard",           &fLedTrigBoard,      'I', File);
-    ReadCard("TrigChannel",         &fLedTrigChannel,    'I', File);
-    ReadCard("TrigChip",            &fLedTrigChip,       'I', File);
-    ReadCard("TrigSample",          &fLedTrigSample,     'I', File);
-    ReadCard("TrigThreshold",       &fLedTrigThreshold,  'f', File);
-    ReadCard("SignalSample",        &fLedSignalSample,   'I', File);
-    ReadCard("BaselineSample",      &fLedBaselineSample, 'I', File);
-    ReadCard("IntHalfWidth",        &fIntHalfWidth,      'U', File);
-    ReadCard("DefaultNumAverage",   &fDefaultNumAverage, 'I', File);
-    ReadCard("DefaultResponse",      Response,           'f', File, m->NumBoards*fNumberOfChips*fNumberOfChannels);
-    ReadCard("DefaultTarget",        Target,             'f', File, m->NumBoards*fNumberOfChips*fNumberOfChannels);
-    // Add also initial gain to configuration parameters
-    fclose(File);
-  }
+  // Get configuration data
+  fLedTrigBoard = atoi(m->GetConfig("TrigBoard"));
+  fLedTrigChannel = atoi(m->GetConfig("TrigChannel"));
+  fLedTrigChip = atoi(m->GetConfig("TrigChip"));
+  fLedTrigSample = atoi(m->GetConfig("TrigSample"));
+  fLedTrigThreshold = atoi(m->GetConfig("TrigThreshold"));
+  fLedSignalSample = atoi(m->GetConfig("SignalSample"));
+  fLedBaselineSample = atoi(m->GetConfig("BaselineSample"));
+  fIntHalfWidth = atoi(m->GetConfig("IntHalfWidth"));
+  fDefaultNumAverage = atoi(m->GetConfig("DefaultNumAverage"));
+
+  char *Token = strtok(m->GetConfig("DefaultResponse"), " \t");
+  for (int i=0; i<m->NumBoards*fNumberOfChips*fNumberOfChannels; i++) {
+        if (Token == NULL) break;
+    *(&Response[0][0][0]+i) = (float) atof(Token);
+        Token = strtok(NULL, " \t");
+  }
+  Token = strtok(m->GetConfig("DefaultTarget"), " \t");
+  for (int i=0; i<m->NumBoards*fNumberOfChips*fNumberOfChannels; i++) {
+        if (Token == NULL) break;
+    *(&Target[0][0][0]+i) = (float) atof(Token);
+        Token = strtok(NULL, " \t");
+  }
+
   PrintConfig(MsgToLog);
 
@@ -76 +79 @@
 
   // Initial state
-  Gain = 0.2;
+  Gain = atoi(m->GetConfig("DefaultGain"));
   SetFBMode(FB_Off);
   SetNumAverages(fDefaultNumAverage);
@@ -94 +97 @@
 
   delete[] Average;     delete[] Response;
+  delete[] DIMAverage;          delete[] DIMSigma;
+  delete[] Sigma;
   delete[] Target;      delete[] Buffer;
   delete PixMap;
@@ -256 +261 @@
   else {
     FBMode = Mode;
-        if (Mode != FB_ResponseFirst) State(INFO, "%s", FBState_Description[FBMode]);
-        else State(INFO, "%s (voltage difference %.3f)", FBState_Description[FBMode], DiffVoltage);
+        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);
     ClearAverages();
   }