Changeset 100 for hvcontrol/src/ProcessIO.cc

Timestamp:

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

Author:

ogrimm

Message:

Number of HV boards (almost) unlimited.

File:

• hvcontrol/src/ProcessIO.cc (modified) (11 diffs)

hvcontrol/src/ProcessIO.cc

@@ -36 +36 @@
   LastBoard   = -1;
   FirstChain  = 0;
-  LastChain   = 3;
+  LastChain   = NUM_CHAINS-1;
   
   if (config->fStatusRefreshRate >= MIN_RATE && config->fStatusRefreshRate <= MAX_RATE) 
@@ -43 +43 @@
     
   // Open HV devices
-  if(config->TestMode){
-    fprintf(stdout,"Test mode: One HVBoard initialized as dummy.\n");
-    fHVBoard[NumHVBoards] = new HVBoard(0, 0, this);
-    NumHVBoards++;
-  }
-  else {
-    for (int i=0; i<config->NumHVBoards; i++) {
-      fHVBoard[NumHVBoards] = new HVBoard(config->USBDeviceNumber[i], config->fUSBDevice[i], this);
-      if(fHVBoard[NumHVBoards]->fDescriptor >= 0) {
-         printf("Synchronized and reset HV board %d (%s)\n",i,config->fUSBDevice[i]);
-         NumHVBoards++;
-      }
-      else {
-        printf("Failed to synchronize to HV board %d (%s)\n",i,config->fUSBDevice[i]);
-        delete fHVBoard[NumHVBoards];
-      }
+  fHVBoard = new HVBoard* [config->NumHVBoards]; 
+  for (int i=0; i<config->NumHVBoards; i++) {
+    fHVBoard[NumHVBoards] = new HVBoard(i, config->fUSBDevice[i], this);
+    if(fHVBoard[NumHVBoards]->fDescriptor >= 0) {
+       printf("Synchronized and reset HV board %d (%s)\n",i,config->fUSBDevice[i]);
+       NumHVBoards++;
+    }
+    else {
+      printf("Failed to synchronize to HV board %d (%s)\n",i,config->fUSBDevice[i]);
+      delete fHVBoard[NumHVBoards];
     }
   } 
@@ -79 +73 @@
 ProcessIO::~ProcessIO() {
   
+  delete SlowDataClass;     
+
   for (int i=0; i<NumHVBoards; i++) delete fHVBoard[i];
-
-  delete SlowDataClass;   delete config;    delete pm;
+  delete[] fHVBoard;
+    
+  delete pm;   delete calib;    delete config;    
   
   if(Logfile != NULL) {
-    if(!fclose(Logfile)) printf("Closing logfile\n");
-    else perror("Error closing logfile");
+    if(fclose(Logfile) != 0) perror("Error closing logfile");
   }
 }
@@ -145 +141 @@
       LastChain = 3;
     } 
-    else if (NParam==2 && atoi(Param[1])>=0 && atoi(Param[1])<4) {
+    else if (NParam==2 && atoi(Param[1])>=0 && atoi(Param[1])<NUM_CHAINS) {
       FirstChain = atoi(Param[1]);
       LastChain = FirstChain;
     }
-    else if (NParam==3 && atoi(Param[1])>=0 && atoi(Param[1])<4 && 
-           atoi(Param[2])>0 && atoi(Param[2])<4) {
+    else if (NParam==3 && atoi(Param[1])>=0 && atoi(Param[1])<NUM_CHAINS && 
+           atoi(Param[2])>0 && atoi(Param[2])<NUM_CHAINS) {
       FirstChain = atoi(Param[1]);
       LastChain = atoi(Param[2]);
@@ -164 +160 @@
     PrintMessage( " Log file:          %s\n"
                   " Pixel map table:   %s\n"
-                  " Test mode:         %s\n"
                   " %d USB devices:\n", config->fLogFile, config->fPixMapTable,
-                  config->TestMode ? "yes" : "no", config->NumHVBoards);  
-    for (int i=0;i<NumHVBoards;i++) { 
-      PrintMessage(" Board%d: %s\n ", config->USBDeviceNumber[i], config->fUSBDevice[i]);
-    }
-    PrintMessage( "\n TimeOut:           %.2f s\n"
+                  config->NumHVBoards);  
+    for (int i=0; i<config->NumHVBoards; i++) { 
+      PrintMessage(" Board %d: %s\n ", i, config->fUSBDevice[i]);
+    }
+    PrintMessage( " TimeOut:           %.2f s\n"
                   " StatusRefreshRate: %.2f Hz\n"
                   " CCPort:            %d\n"
@@ -211 +206 @@
 
 
-  // Set new high voltage --------------------------------------------------------------------------------------
+  // Set new high voltage (if no boards available, simply returns OK)
+  // First reponse to socket should be 'OK' if no error occurred.
   if (Match(Param[0], "hv") || Match(Param[0], "hvdiff")) {
 
-    if (!NumHVBoards) return;
-
-    int hvoltage, DACValue, Errors=0, Board, Chain=0, Channel=0;
+    int hvoltage, DACValue, Errors=0, Board=-1, Chain=-1, Channel=-1;
     double hvoltageV;
-    bool allchannels = false, SetDac = false;
-    
-    // Need two parameters or three if last is 'dac'
+    bool SetDac;
+    
+    // Need two or parameters
     if (NParam<3 || NParam>4) {
-      PrintMessage("ERROR - usage: hv <channel>|<all> <voltage> [dac]\n");
-      return;
-    }
-
-    if (NParam==4 && Match(Param[3], "dac")) SetDac = true;
-    
+      PrintMessage("Usage: hv/hvdiff <channel>|<all> <voltage> [dac]\n");
+      return;
+    }
+
+    // Evaluate voltage parameter
+    if (NParam==4 && Match(Param[3], "dac")) {
+      SetDac = true;
+      if (!ConvertToInt(Param[2], &hvoltage)) {
+        PrintMessage("Error: Wrong number format for DAC voltage setting\n");
+        return;
+      } 
+    }
+    else {
+      SetDac = false;
+      if (!ConvertToDouble(Param[2], &hvoltageV)) {
+        PrintMessage("Error: Wrong number format for voltage setting\n");
+        return;
+      }
+    } 
+
     // Evaluate pixel or channel parameter    
-    if((Board = pm->Pixel_to_HVboard(Param[1])) != 999999999) {
+    if(pm->Pixel_to_HVboard(Param[1]) != 999999999) {
+      Board = pm->Pixel_to_HVboard(Param[1]);
       Chain = pm->Pixel_to_HVchain(Param[1]);
       Channel = pm->Pixel_to_HVchannel(Param[1]);
     }
-    else if (Match(Param[1], "all")) allchannels = true;
-    else if (ConvertToInt(Param[1], &Channel)) {
-      Board = -1;
-      Chain = -1;
-    } 
-    else {
-      PrintMessage("ERROR - wrong input format - usage: hv <channel>|<all> <voltage>\n");
-      return;
-    }
-    // Check channel limits (voltage limit is only checked in SetHV())
-    if (Channel<0 || Channel>31) {
-      PrintMessage("ERROR - channel out of range (0...31)!\n");
-      return;
-    }
-
-    if (SetDac && !ConvertToInt(Param[2], &hvoltage)) {
-      PrintMessage("ERROR - wrong number format for DAC voltage setting\n");
-      return;
-    } 
-    if (!SetDac && !ConvertToDouble(Param[2], &hvoltageV)) {
-      PrintMessage("ERROR - wrong number format for voltage setting\n");
-      return;
-    } 
+    else if (!Match(Param[1], "all") && !ConvertToInt(Param[1], &Channel)) {
+      PrintMessage("Error: Wrong channel identification\n");
+      return;
+    }
 
     for (int i=FirstBoard; i<=LastBoard; i++) {
-      if (!allchannels && Board != 999999999 && i != Board && Board!=-1) continue;
+      if (i!=Board && Board!=-1) continue;
 
       for (int j=FirstChain; j<=LastChain; j++) {
-        if (!allchannels && Chain != 999999999 && j != Chain && Chain!=-1) continue;
+        if (j!=Chain && Chain!=-1) continue;
 
         for (int k=0; k<NUM_CHANNELS; k++) {
-          if (!allchannels && k!= Channel) continue;
+          if (k!=Channel && Channel!=-1) continue;
 
           // Convert from HV to DAC values
@@ -277 +267 @@
           }
           
-          // Set new voltage (if DAC value, update calilbrated value)
+          // Set new voltage (if DAC value, update calibrated value)
           if(!RampVoltage(DACValue, i, j, k)) Errors++;
-          else if(SetDac) fHVBoard[i]->HVV[j][k] = calib->DACToHV(fHVBoard[i]->HV[j][k], i, j, k);
+          if(SetDac) fHVBoard[i]->HVV[j][k] = calib->DACToHV(fHVBoard[i]->HV[j][k], i, j, k);
 
         } // Channels   
@@ -285 +275 @@
     } // Boards
 
-    if (Errors > 0) PrintMessage("Warning: Errors on %d channel(s) occurred\n", Errors);
-    else PrintMessage("OK - no error(s)\n");
+    if (Errors > 0) PrintMessage("ERROR - Errors on %d channel(s) occurred\n", Errors);
+    else PrintMessage("OK - no errors\n");
     
     return;
@@ -436 +426 @@
     state = active;
     pthread_kill(HVMonitor, SIGUSR1);
-    PrintMessage("OK - status monitoring activated\n");
+    PrintMessage("Status monitoring activated\n");
     return;  
   }
@@ -617 +607 @@
 
     if (fHVBoard[Board]->SetHV(Chain, Channel, fHVBoard[Board]->HV[Chain][Channel]+Diff) == 1) {
-      fHVBoard[Board]->HV[Chain][Channel] += Diff;
-
       if (Verbose) {
-        PrintMessage("OK - board %d: high voltage of chain %d channel %d set to %d | 0X%.4X | %f V\n",fHVBoard[Board]->GetBoardNumber(),Chain, Channel, Target, Target, calib->DACToHV(Target,fHVBoard[Board]->GetBoardNumber(),Chain,Channel));
+        PrintMessage("Board %d: high voltage of chain %d channel %d set to %d | 0X%.4X | %f V\n",fHVBoard[Board]->GetBoardNumber(),Chain, Channel, Target, Target, calib->DACToHV(Target,fHVBoard[Board]->GetBoardNumber(),Chain,Channel));
         PrintBoardStatus(Board);
       }
     }
     else {
-      PrintMessage("ERROR - Could not set HV of board %d, chain %d, channel %d. Skipping channel\n",fHVBoard[Board]->GetBoardNumber(),Chain,Channel);
-      SlowDataClass->NewEntry("Error");
-      SlowDataClass->AddToEntry("%s %d %d %d %d %.2f ",fHVBoard[Board]->BoardName,Board, Chain, Channel, Target, calib->DACToHV(Target,Board,Chain,Channel));
+      PrintMessage("Error: Could not set HV of board %d, chain %d, channel %d. Skipping channel\n",fHVBoard[Board]->GetBoardNumber(),Chain,Channel);
+      //SlowDataClass->NewEntry("Error");
+      //SlowDataClass->AddToEntry("%s %d %d %d %d %.2f ",fHVBoard[Board]->BoardName,Board, Chain, Channel, Target, calib->DACToHV(Target,Board,Chain,Channel));
       return false;
     }
   }
-  SlowDataClass->NewEntry("Value");
-  SlowDataClass->AddToEntry("%s %d %d %d %d %.2f ",fHVBoard[Board]->BoardName,Board, Chain, Channel, Target, calib->DACToHV(Target,Board,Chain,Channel));
+  //SlowDataClass->NewEntry("Value");
+  //SlowDataClass->AddToEntry("%s %d %d %d %d %.2f ",fHVBoard[Board]->BoardName,Board, Chain, Channel, Target, calib->DACToHV(Target,Board,Chain,Channel));
   return true;
 }
@@ -676 +664 @@
 }
 
-
-// Get index of board with sequential number board
-int ProcessIO::GetBoardIdx(int board) {
-
-  for (int i=0; i<MAX_NUM_HVBOARDS; i++) {
-    if (board == fHVBoard[i]->GetBoardNumber()) return i;
-  }
-  return -1;
-}
 
 // Print current board status