Changeset 100 for hvcontrol/src/HVConfig.cc

Timestamp:

08/12/09 12:15:02 (15 years ago)

Author:

ogrimm

Message:

Number of HV boards (almost) unlimited.

File:

• hvcontrol/src/HVConfig.cc (modified) (6 diffs)

hvcontrol/src/HVConfig.cc

@@ -16 +16 @@
 HVConfig::HVConfig(const char *configfile) {
 
-  fUSBDevice = new char*[MAX_NUM_HVBOARDS];
-
-  for (int i=0; i<MAX_NUM_HVBOARDS; i++) {
-    fUSBDevice[i]      = new char[BUFFER_LENGTH];
-    USBDeviceNumber[i] = 0;
-  }
-
-  TestMode           = false;
-  NumHVBoards        = 0;
-  fStatusRefreshRate = 1.;
-  fTimeOut           = 1.;
-  DACMin             = 11008;
-  DACMax             = 12496;
-  fHVCalibOffset      = -.8;
-  fHVCalibSlope       = 0.0064;
-  fHVMaxDiff          = 1;
-  
   // Read configuration file
   FILE *f;
-  char str[MAX_COM_SIZE], dev[MAX_COM_SIZE];
-  int j = 0;
 
   if ((f = fopen(configfile,"r")) == NULL) {
@@ -42 +23 @@
     throw;
   }
-  else printf("Opening configuration file: %s\n", configfile);
+  printf("Opening configuration file: %s\n", configfile);
  
+  // Determine number of entries in 'Boards' card and allocate memeory
+  NumHVBoards = (int) ReadCard("Boards", NULL, 'n', f);
+  fUSBDevice = new char* [NumHVBoards];
+  for (int i=0; i<NumHVBoards; i++) fUSBDevice[i] = new char [BUFFER_LENGTH];
+  ReadCard("Boards", fUSBDevice, 'S', f, NumHVBoards);
+
   ReadCard("LogFile",       fLogFile,    's',f);
   ReadCard("PixMapTable",   fPixMapTable,'s',f);
   ReadCard("SlowDirectory", fSlowDir,    's',f);
-  
-  ReadCard("TestMode",   &str,        's',f);
-  if (!strcmp(str,"TRUE")) TestMode = true;
-
-  for (int i=0; i<MAX_NUM_HVBOARDS; i++) {
-    sprintf(str,"Board%d",i);
-
-    if (ReadCard(str, dev, 's', f)) {
-      USBDeviceNumber[j] = i;
-      sprintf(fUSBDevice[j++],"%s",dev);
-      NumHVBoards++;     
-    }
-  }
-  
   ReadCard("TimeOut",           &fTimeOut,           'f', f);
   ReadCard("StatusRefreshRate", &fStatusRefreshRate, 'f', f);
@@ -76 +49 @@
 HVConfig::~HVConfig() {
 
-  for (int i=0; i<MAX_NUM_HVBOARDS; i++) delete [] fUSBDevice[i];
-  delete [] fUSBDevice;
+  for (int i=0; i<NumHVBoards; i++) delete[] fUSBDevice[i];
+  delete[] fUSBDevice;
 }
 
@@ -83 +56 @@
 // ReadCard function (original version by F. Goebel)
 // Data is read into an array if MaxNum is larger than 1
-bool ReadCard(const char *card_flag, void *store, char Type, FILE *File, unsigned int MaxNum) {
+// If Type is 'n', the number of elements for the card is counted.
+// Type 'S' is for reading an array of strings
+unsigned int ReadCard(const char *card_flag, void *store, char Type, FILE *File, unsigned int MaxNum) {
   
   char *card_name, *card_val, Buffer[MAX_COM_SIZE];
@@ -97 +72 @@
 
     // Read numbers of given type (if MaxNum>1 read array)
-    while ((card_val=strtok(NULL," \t\n")) != NULL && Count++<MaxNum) {
+    while ((card_val=strtok(NULL," \t\n"))!=NULL && card_val[0]!='#' && Count++<MaxNum) {
       switch (Type) {
         case 'I': *(((int *&) store)++) = (int) strtol(card_val, NULL, 10);
@@ -113 +88 @@
         case 's': sprintf((char *) store, "%s", card_val);
                   break;
-        case 'c': *((char *) store) = card_val[0];
+        case 'S': sprintf(*(((char **&) store)++), "%s", card_val);
+                  break;
+        case 'c': *(((char *&) store)++) = card_val[0];
+                  break;
+        case 'n': MaxNum = UINT_MAX;
                   break;
         default:  fprintf(stderr,"Warning: Unknown type '%c' for reading of configuration file\n", Type);
-                  return false;
+                  return 0;
       }
     }
-    return true;  // Finished reading data for card name  
+    return Count;  // Finished reading data for card name  
   }
-  return false;
+  return 0;
 }