Changeset 211 for drsdaq/HVFeedback.cc

Timestamp:

05/21/10 13:31:27 (14 years ago)

Author:

ogrimm

Message:

Fix for exit signalling from DimCommand thread

File:

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

drsdaq/HVFeedback.cc

@@ -57 +57 @@
 
   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");
-  }
+  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");
+          }
+        }
+  }
+
   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");
-  }
-
+  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");
+          }
+        }
+  }
+  
   PrintConfig(MsgToLog);
 
@@ -79 +88 @@
 
   // Initial state
-  Gain = atof(m->GetConfig("DefaultGain"));printf("Gain %d\n", Gain);
+  Gain = atof(m->GetConfig("DefaultGain"));
   SetFBMode(FB_Off);
   SetNumAverages(fDefaultNumAverage);