Changeset 229 for drsdaq/HVFeedback.cc

Timestamp:

06/24/10 07:51:15 (14 years ago)

Author:

ogrimm

Message:

Config requests non-blocking if not made from main thread, adapted all servers to GetConfig() returning std::string, workaround for erroneous SERVICE_LIST

File:

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

drsdaq/HVFeedback.cc

@@ -22 +22 @@
 };
 
+using namespace std;
+
 //
 // Constructor: Initialise feedback 
@@ -45 +47 @@
 
   // 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");
+  fLedTrigBoard = atoi(m->GetConfig("TrigBoard").c_str());
+  fLedTrigChannel = atoi(m->GetConfig("TrigChannel").c_str());
+  fLedTrigChip = atoi(m->GetConfig("TrigChip").c_str());
+  fLedTrigSample = atoi(m->GetConfig("TrigSample").c_str());
+  fLedTrigThreshold = atoi(m->GetConfig("TrigThreshold").c_str());
+  fLedSignalSample = atoi(m->GetConfig("SignalSample").c_str());
+  fLedBaselineSample = atoi(m->GetConfig("BaselineSample").c_str());
+  fIntHalfWidth = atoi(m->GetConfig("IntHalfWidth").c_str());
+  fDefaultNumAverage = atoi(m->GetConfig("DefaultNumAverage").c_str());
+
+  vector<string> Token = m->Tokenize(m->GetConfig("DefaultResponse"), " \t");
+  unsigned int N = 0;
   for (int i=0; i<m->NumBoards; i++) {
         for (int j=0; j<fNumberOfChips; j++) {
           for (int k=0; k<fNumberOfChannels; k++) {
-                if (Token == NULL) break;
-        Response[i][j][k] = (float) atof(Token);
-                Token = strtok(NULL, " \t");
+                if (N < Token.size()) Response[i][j][k] = (float) atof(Token[N++].c_str());
           }
         }
   }
 
-  Token = strtok(m->GetConfig("DefaultTarget"), " \t");
+  Token = m->Tokenize(m->GetConfig("DefaultTarget"), " \t");
+  N = 0;
   for (int i=0; i<m->NumBoards; i++) {
         for (int j=0; j<fNumberOfChips; j++) {
           for (int k=0; k<fNumberOfChannels; k++) {
-                if (Token == NULL) break;
-        Target[i][j][k] = (float) atof(Token);
-                Token = strtok(NULL, " \t");
+                if (N < Token.size()) Target[i][j][k] = (float) atof(Token[N++].c_str());
           }
         }
@@ -87 +87 @@
 
   // Initial state
-  Gain = atof(m->GetConfig("DefaultGain"));
+  Gain = atof(m->GetConfig("DefaultGain").c_str());
   SetFBMode(FB_Off);
   SetNumAverages(fDefaultNumAverage);