Changeset 93 for hvcontrol/src/ProcessIO.cc

Timestamp:

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

Author:

ogrimm

Message:

Added writing of slow data

File:

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

hvcontrol/src/ProcessIO.cc

@@ -14 +14 @@
 static char* state_str[]    = {"active", "stopped", "n.a."};
 
-ProcessIO::ProcessIO(char *ConfigFile) {
+
+ProcessIO::ProcessIO(const char *ConfigFile) {
 
   // Get program start time
@@ -20 +21 @@
 
   // Create instances
-  config = new HVConfig(stdout,ConfigFile);
+  config = new HVConfig(ConfigFile);
   calib  = new HVCalib(config);
   pm     = new PixelMap(config->fPixMapTable);
@@ -44 +45 @@
   if(config->TestMode){
     fprintf(stdout,"Test mode: One HVBoard initialized as dummy.\n");
-    fHVBoard[NumHVBoards] = new HVBoard(0, 0, config->TestMode, config->fTimeOut, Verbose);
+    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], config->TestMode, config->fTimeOut, Verbose);
+      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]);
@@ -66 +67 @@
   PrintMessage(MsgToLog,"********** Logging started **********\n");
 
-  // Print configuration to log file
-  if(Logfile) config->PrintHVConfig(Logfile);
+  // Create instance of slow data class
+  SlowDataClass = new SlowData("HV", config->fSlowDir);
+  if (SlowDataClass->ErrorCode != 0) {
+    PrintMessage("Warning: Could not open slowdata file (%s)\n", strerror(SlowDataClass->ErrorCode));
+  }
+  SlowDataClass->NewEntry("Value-Info", "Issued if new HV value set successfull: Board-Num HV-Board-Name Chain Channel DAC-Target Converted-Value");
+  SlowDataClass->NewEntry("Error-Info", "Issued if error occurs when trying to set new HV value: Board-Num HV-Board-Name Chain Channel Attempted-DAC-Target Converted-Value");
 }
 
@@ -75 +81 @@
   for (int i=0; i<NumHVBoards; i++) delete fHVBoard[i];
 
-  delete config;    delete pm;
+  delete SlowDataClass;   delete config;    delete pm;
   
   if(Logfile != NULL) {
@@ -156 +162 @@
   // Print HV utility configuration
   else if (Match(Param[0], "config")) {
-
-    config->PrintHVConfig(stdout);
-    
+    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"
+                  " StatusRefreshRate: %.2f Hz\n"
+                  " CCPort:            %d\n"
+                  " DACMin value:      %d\n"
+                  " DACMax value:      %d\n"
+                  " HVCalibOffset :    %f\n"
+                  " HVCalibSlope :     %f\n"
+                  " HVMaxDiff :        %u\n", config->fTimeOut,
+                  config->fStatusRefreshRate, config->fCCPort, config->DACMin,
+                  config->DACMax, config->fHVCalibOffset, config->fHVCalibSlope,
+                  config->fHVMaxDiff);
+
     return;
   }
@@ -287 +310 @@
     }
         
-    StopMonitor();
-
     while (fgets(Buffer, sizeof(Buffer), File) != NULL) {
       for (int Board=0; Board<NumHVBoards; Board++) {
@@ -314 +335 @@
     } // while()
             
-    StartMonitor();
-        
     if (NBoards != NumHVBoards) {
       PrintMessage("Warning: Could not load HV settings for all connected HV boards\n");
@@ -333 +352 @@
     double Rate;
     
-    if (!NumHVBoards) return;
-
     if (NParam != 2) {
       PrintMessage("Usage: rate <Hz>\n");
@@ -351 +368 @@
     }
 
-    StopMonitor();
     fStatusRefreshRate = Rate;
     PrintMessage("Refresh rate set to %.2f Hz\n", fStatusRefreshRate);
-    StartMonitor();
 
     return;
@@ -363 +378 @@
 
     if (!NumHVBoards) return;
-
-    StopMonitor();
-    ResetActiveBoards();
-    StartMonitor();
+    for (int i=FirstBoard; i<=LastBoard; i++) ResetBoard(i);
     return;
   }
@@ -416 +428 @@
   else if (Match(Param[0], "start")) {
 
-    if (!NumHVBoards) return;
-    
-    StartMonitor();
+    state = active;
+    pthread_kill(HVMonitor, SIGUSR1);
     PrintMessage("OK - status monitoring activated\n");
-
     return;  
   }
@@ -463 +473 @@
   else if (Match(Param[0], "stop")) {
 
-    if (!NumHVBoards) return;
-    
-    StopMonitor();    
+    state = stopped;
+    pthread_kill(HVMonitor, SIGUSR1);
     PrintMessage("Status monitor stopped\n");
 
@@ -594 +603 @@
 bool ProcessIO::RampVoltage(unsigned int Target, int Board, int Chain, int Channel) {
 
-  int Diff;
-  
   while (fHVBoard[Board]->HV[Chain][Channel] != (int) Target) {   
-    Diff = Target - fHVBoard[Board]->HV[Chain][Channel];
+    int Diff = Target - fHVBoard[Board]->HV[Chain][Channel];
     if (Diff > (int) config->fHVMaxDiff) Diff = config->fHVMaxDiff;
 
-    if (fHVBoard[Board]->SetHV(stdout, Chain, Channel, fHVBoard[Board]->HV[Chain][Channel]+Diff, Verbose)==1) {
+    if (fHVBoard[Board]->SetHV(Chain, Channel, fHVBoard[Board]->HV[Chain][Channel]+Diff) == 1) {
       fHVBoard[Board]->HV[Chain][Channel] += Diff;
 
@@ -610 +617 @@
     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));
       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));
   return true;
 }
 
-void ProcessIO::StartMonitor() {
-
-  state = active;
-  pthread_kill(HVMonitor, SIGUSR1);
-}
-
-
-void ProcessIO::StopMonitor() {
-
-  state = stopped;
-  pthread_kill(HVMonitor, SIGUSR1);
-}
-
-
+
+// Check board status
 void ProcessIO::Monitor() {
 
   for (int i=0; i<NumHVBoards; i++) {
 
-    if (fHVBoard[i]->GetStatus(stdout,false)!=1) {
+    if (fHVBoard[i]->GetStatus() != 1) {
       PrintMessage("Error: Monitor, could not read status of board %d\n", fHVBoard[i]->GetBoardNumber());
     }
@@ -653 +652 @@
       }
     }
-  }
-}
-
-
-void ProcessIO::ResetActiveBoards() {
-  
-  for (int i=FirstBoard; i<=LastBoard; i++) ResetBoard(i);
-}
-
-
+    
+  }
+}
+
+
+// Send reset to board and clear voltage arrays
 void ProcessIO::ResetBoard(int i) {
     
-  if (fHVBoard[i]->Reset(stdout,Verbose) == 1) {
+  if (fHVBoard[i]->Reset() == 1) {
     PrintMessage("Reset of board %d\n", fHVBoard[i]->GetBoardNumber());
     PrintBoardStatus(i);
@@ -673 +668 @@
 
 
+// Get index of board with sequential number board
 int ProcessIO::GetBoardIdx(int board) {
 
@@ -681 +677 @@
 }
 
-
+// Print current board status
 void ProcessIO::PrintBoardStatus(int i) {
 
@@ -716 +712 @@
 }
 
+
 // Check if two strings match (min 1 character must match)
 bool Match(const char *str, const char *cmd) {
@@ -721 +718 @@
 }
 
+
 // Convert string to double
 // Returns false if conversion did not stop on whitespace or EOL character