Changeset 93 for hvcontrol/src/HVConfig.cc

Timestamp:

07/28/09 09:15:18 (15 years ago)

Author:

ogrimm

Message:

Added writing of slow data

File:

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

hvcontrol/src/HVConfig.cc

@@ -14 +14 @@
 
 
-HVConfig::HVConfig(FILE* fptr, char *configfile) {
+HVConfig::HVConfig(const char *configfile) {
 
-  fLogFile   = new char[BUFFER_LENGTH];
   fUSBDevice = new char*[MAX_NUM_HVBOARDS];
 
-  fPixMapTable = new char[BUFFER_LENGTH];
-    
   for (int i=0; i<MAX_NUM_HVBOARDS; i++) {
     fUSBDevice[i]      = new char[BUFFER_LENGTH];
     USBDeviceNumber[i] = 0;
-
-    for (int j=0; j<NUM_CHAINS; j++) {
-      for (int k=0; k<2; k++) Coef[i][j][k] = 0.;
-    }
   }
 
   TestMode           = false;
   NumHVBoards        = 0;
-  FileName           = configfile;
   fStatusRefreshRate = 1.;
   fTimeOut           = 1.;
@@ -39 +31 @@
   fHVCalibOffset      = -.8;
   fHVCalibSlope       = 0.0064;
-  fHVMaxDiff          = 1;  
-
-  if (configfile != NULL) {
-    if (!ReadHVConfig(fptr, configfile)) {
-      fprintf(fptr, "Error (HVConfig): could not configure HV control\n");
-      exit(1);
-    }
-  }
-}
-
-
-HVConfig::~HVConfig() {
-
-  delete [] fLogFile;   delete [] fPixMapTable;
-  for (int i=0; i<MAX_NUM_HVBOARDS; i++) delete [] fUSBDevice[i];
-  delete [] fUSBDevice;
-}
-
-
-int HVConfig::ReadHVConfig(FILE* fptr, char *configfile) {
-
+  fHVMaxDiff          = 1;
+  
+  // Read configuration file
   FILE *f;
   char str[MAX_COM_SIZE], dev[MAX_COM_SIZE];
@@ -65 +39 @@
 
   if ((f = fopen(configfile,"r")) == NULL) {
-    fprintf(fptr,"Could not open configuration file: %s\n", configfile);
-    return 0;
+    printf("Could not open configuration file: %s\n", configfile);
+    throw;
   }
-  else fprintf(fptr,"Opening configuration file: %s\n", configfile);
+  else printf("Opening configuration file: %s\n", configfile);
  
-  ReadCard("LogFile",    fLogFile,    's',f);
-  ReadCard("PixMapTable",fPixMapTable,'s',f);
+  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;
@@ -95 +71 @@
 
   fclose(f);
-  return 1;
 }
 
 
-int HVConfig::PrintHVConfig(FILE *fptr) {
-  
-  fprintf(fptr," \n HV control configuration (%s):\n\n", FileName);
-  fprintf(fptr," Log file:          %s\n", fLogFile);
-  fprintf(fptr," Pixel map table:   %s\n", fPixMapTable);
-  fprintf(fptr," Test mode:         %s\n", TestMode ? "yes" : "no");
-  fprintf(fptr," %d USB devices:\n", NumHVBoards);
-  
-  for (int i=0;i<NumHVBoards;i++) 
-    fprintf(fptr," Board%d: %s\n", USBDeviceNumber[i], fUSBDevice[i]);
-  
-  fprintf(fptr,"\n");
-  fprintf(fptr," TimeOut:           %.2f s\n",   fTimeOut);
-  fprintf(fptr," StatusRefreshRate: %.2f Hz\n",fStatusRefreshRate);
-  fprintf(fptr," CCPort:            %d\n",       fCCPort);
-  fprintf(fptr," DACMin value:      %d\n",     DACMin);
-  fprintf(fptr," DACMax value:      %d\n",     DACMax);
-  fprintf(fptr," HVCalibOffset :    %f\n",     fHVCalibOffset);
-  fprintf(fptr," HVCalibSlope :     %f\n",     fHVCalibSlope);
-  fprintf(fptr," HVMaxDiff :        %u\n",     fHVMaxDiff);
- 
-  return 1;
+HVConfig::~HVConfig() {
+
+  for (int i=0; i<MAX_NUM_HVBOARDS; i++) delete [] fUSBDevice[i];
+  delete [] fUSBDevice;
 }
+
 
 // ReadCard function (original version by F. Goebel)