Changeset 39 for hvcontrol/src

Timestamp:

05/13/09 10:42:59 (16 years ago)

Author:

lstark

Message:

several bugs fixed, higher precision reached

Location:

hvcontrol/src

Files:

• CCCommand.cc (modified) (1 diff)
• HVStatus.cc (modified) (1 diff)
• HVStatus.h (modified) (1 diff)
• ProcessIO.cc (modified) (8 diffs)

hvcontrol/src/CCCommand.cc

@@ -29 +29 @@
     return;
   }
- 
+
+// Allows immediate reuse of socket after closing (circumvents TIME_WAIT)
+  int Value=1;
+  if (setsockopt(ServerSocket, SOL_SOCKET, SO_REUSEADDR, (char *) &Value, sizeof (Value)) == -1) {
+    sprintf(str,"Warning: Could not set server socket option SO_REUSEADDR (%s).\n",strerror(errno));
+    m->PrintMessage(str);
+  }
+
   SocketAddress.sin_family = PF_INET;
   SocketAddress.sin_port = htons((unsigned short) m->config->fCCPort);

hvcontrol/src/HVStatus.cc

@@ -53 +53 @@
       status->OC[i][j]   = FALSE;
 
-      for (int k=0;k<MAX_NUM_CHANNELS;k++)
+      for (int k=0;k<MAX_NUM_CHANNELS;k++){
         status->HV[i][j][k] = 0;
+        status->HVV[i][j][k] = 0.0;
+      }
     }
   }

hvcontrol/src/HVStatus.h

@@ -50 +50 @@
   
   unsigned int VRef[MAX_NUM_HVBOARDS][MAX_NUM_CHAINS];     
-  unsigned int HV[MAX_NUM_HVBOARDS][MAX_NUM_CHAINS][MAX_NUM_CHANNELS];
+  unsigned int HV[MAX_NUM_HVBOARDS][MAX_NUM_CHAINS][MAX_NUM_CHANNELS];      // HV value in DAC
+  float HVV[MAX_NUM_HVBOARDS][MAX_NUM_CHAINS][MAX_NUM_CHANNELS];            // HV value in volts
 
   float fTimeOut;

hvcontrol/src/ProcessIO.cc

@@ -349 +349 @@
           if (!allchannels) {
  // Convert from HV to DAC values
-            if (!(config->IsDAC))
+            if (!(config->IsDAC)){
+              status->HVV[i][j][channel]=hvoltageV;
               hvoltage = calib->HVToDAC(hvoltageV,i,j,channel);
+              printf("HV = %f, dac hv = %d .\n",hvoltageV,hvoltage);
+            }
             if ((hv->GetHVBoard(i))->SetHV(stdout,j,channel,hvoltage,rbuf,status->Verbose)==1){
               status->HV[i][j][channel]=hvoltage;
               UpdateStatus(i,rbuf);
               
-              sprintf(str,"board %d: high voltage of chain %d channel %d set to %d | 0X%.4X\n",hv->GetHVBoard(i)->GetBoardNumber(),j,channel,hvoltage,hvoltage);
+              sprintf(str,"board %d: high voltage of chain %d channel %d set to %d | 0X%.4X | %f V\n",hv->GetHVBoard(i)->GetBoardNumber(),j,channel,hvoltage,hvoltage,calib->DACToHV(hvoltage,hv->GetHVBoard(i)->GetBoardNumber(),j,channel));
               DoPrompt(str);
               if (status->Verbose) {
@@ -376 +379 @@
             for (int k=0;k<MAX_NUM_CHANNELS;k++) {
  // Convert from HV to DAC values
-              if (!(config->IsDAC)) 
+              if (!(config->IsDAC)){
+                status->HVV[i][j][channel]=hvoltageV;
                 hvoltage = calib->HVToDAC(hvoltageV,i,j,k);
+              }
               if ((hv->GetHVBoard(i))->SetHV(stdout,j,k,hvoltage,rbuf,status->Verbose)==1) {
                 status->HV[i][j][k]=hvoltage;
@@ -383 +388 @@
                 
                 if (status->Verbose) {
-                  sprintf(str,"board %d: high voltage of chain %d channel %d set to %d | 0X%.4X\n",hv->GetHVBoard(i)->GetBoardNumber(),j,k,hvoltage,hvoltage);
+                  sprintf(str,"board %d: high voltage of chain %d channel %d set to %d | 0X%.4X | %f V\n",hv->GetHVBoard(i)->GetBoardNumber(),j,channel,hvoltage,hvoltage,calib->DACToHV(hvoltage,hv->GetHVBoard(i)->GetBoardNumber(),j,channel));
+                  //sprintf(str,"board %d: high voltage of chain %d channel %d set to %d | 0X%.4X\n",hv->GetHVBoard(i)->GetBoardNumber(),j,k,hvoltage,hvoltage);
                   DoPrompt(str);
                   sPrintStatus(status,str,i);
@@ -455 +461 @@
       //      std::cout << "Channel: " << channel << std::endl;
 
-      /*      if (IsNoDigit(status->Param[1]))
-              channel = atoi(status->Param[1]);
-              else if(status->Param[1][0] == 'a')
-              allchannels = TRUE;
-              else {
-              DoPrompt("error: wrong input format - usage: hvdiff <channel>|<all> <hv difference>\n");
-              return 0;
-        }*/
-
       // Binary input
       if (tolower(status->Param[2][0])=='x' && strlen(status->Param[2])>2) {
@@ -506 +503 @@
       //Convert from HV to DAC values
       if (!(config->IsDAC)){
-        hvoltage = status->HV[board][chain][channel];
-        hvoltageV = calib->DACToHV(hvoltage,board,chain,channel);
-        hvoltageV = hvoltageV + hvdiffV;
-        hvdiff = calib->HVToDAC(hvoltageV,board,chain,channel) - hvoltage;
+        hvoltageV = status->HVV[board][chain][channel]+hvdiffV;
+        status->HVV[board][chain][channel] = hvoltageV;
+        printf("hv+diff = %f .\n",hvoltageV);
+        hvdiff = calib->HVToDAC(hvoltageV,board,chain,channel) - status->HV[board][chain][channel];
+        printf("dac new = %d, dac old = %d.\n",calib->HVToDAC(hvoltageV,board,chain,channel),status->HV[board][chain][channel]);
+        printf("dac diff = %d .\n",hvdiff);
       }
       StopMonitor();
@@ -516 +515 @@
       
       hvoltage = status->HV[board][chain][channel];
+      //      printf("dac hv = %d .\n",hvoltage);
       for (int k=0;k<=abs((int)(hvdiff/config->fHVMaxDiff));k++){
         if (k<abs((int)(hvdiff/config->fHVMaxDiff))){
@@ -526 +526 @@
         
         status->HV[board][chain][channel]=hvoltage;
+        printf("dac hv rampingup= %d .\n",hvoltage);
         if ((hv->GetHVBoard(board))->SetHV(stdout,chain,channel,hvoltage,rbuf,status->Verbose)==1) {
           UpdateStatus(board,rbuf);
-          if (k==(int)(abs((int)(hvdiff/config->fHVMaxDiff)))){
-            sprintf(str,"board %d: high voltage of chain %d channel %d set to %d | 0X%.4X\n",hv->GetHVBoard(board)->GetBoardNumber(),chain,channel,hvoltage,hvoltage);
+          if (k==(abs((int)(hvdiff/config->fHVMaxDiff)))){
+            sprintf(str,"board %d: high voltage of chain %d channel %d set to %d | 0X%.4X | %f V\n",hv->GetHVBoard(board)->GetBoardNumber(),chain,channel,hvoltage,hvoltage,calib->DACToHV(hvoltage,hv->GetHVBoard(board)->GetBoardNumber(),chain,channel));
+            //sprintf(str,"board %d: high voltage of chain %d channel %d set to %d | 0X%.4X\n",hv->GetHVBoard(board)->GetBoardNumber(),chain,channel,hvoltage,hvoltage);
             DoPrompt(str);
             sPrintStatus(status,str,board); // Print status only to socket 
@@ -540 +542 @@
         }
       }          // for loop over k
-        //          Sleep(1);
       if (status->Verbose) {
         sPrintStatus(status,str,board);