Changeset 72

Timestamp:

06/19/09 17:00:53 (15 years ago)

Author:

lstark

Message:

relative path

Location:

hvcontrol

Files:

• HV.conf (modified) (1 diff)
• Makefile (modified) (1 diff)
• hvcontrol.cpp (modified) (2 diffs)
• src/ConsoleCommand.cc (modified) (1 diff)
• src/ProcessIO.cc (modified) (4 diffs)

hvcontrol/HV.conf

@@ -1 @@
-# Main configuration file for the HV control program V1.0, 2009 05 22, 15:16:02
+# Main configuration file for the HV control program V1.0, 2009 06 17, 15:50:39
 # Note: this file will be updated at program exit
 
-LogPath            /home/lstark/hvcontrol/log/
+LogPath            ../hvcontrol/log/
 
 PixMapTable        ../config/PixelMap.txt

hvcontrol/Makefile

@@ -1 +1 @@
 #
-#  Makefile example
+#  Makefile hvcontrol
 #
 

hvcontrol/hvcontrol.cpp

@@ -11 +11 @@
   Created by:   Sebastian Commichau, November 2008
                 commichau@phys.ethz.ch
+  Updated by:   Sabrina Stark, June 2008
+                sabrina.stark@phys.ethz.ch
 
 \**************************************************************/
@@ -90 +92 @@
   
   system("clear");                   
-  printf("\n****************** HV Control %s built %s, %s by S. Commichau ******************\n\n",HV_CONTROL_VERSION,__DATE__,__TIME__);
+  printf("\n****************** HV Control %s built %s, %s by S. Commichau, updated by S. Stark ******************\n\n",HV_CONTROL_VERSION,__DATE__,__TIME__);
 
 
   // Construct main instance
   ProcessIO pio(config_file);
-  
-  // Install signal handler and set signal SIGUSR1 to interrupt blocking system calls
+ 
+ // Install signal handler and set signal SIGUSR1 to interrupt blocking system calls
   signal(SIGUSR1, &SignalHandler);
   siginterrupt (SIGUSR1, true);

hvcontrol/src/ConsoleCommand.cc

@@ -30 +30 @@
 
     m->status->Pc = comline;
-      sprintf(str,"Test in ConsoleCommand: %s",m->status->Pc);
-      printf(str);
+    //      sprintf(str,"Test in ConsoleCommand: %s",m->status->Pc);
+    //  printf(str);
     /*
     if (strlen(m->status->Pc) < 2 )  // Ignore commands with only '\n'

hvcontrol/src/ProcessIO.cc

@@ -27 +27 @@
  
   pm = new PixelMap(config->fPixMapTable);
-  printf("PixMapTable = %s. \n",config->fPixMapTable);
 
   // Initialize status structure (HVStatus.cc/h)
@@ -341 +340 @@
       }
 
-
       StopMonitor();
-      
+
       
       for (int i=status->FirstBoard;i<=status->LastBoard;i++) {
@@ -520 +518 @@
       }
 
+      sprintf(str,"Error - Test \n");
+      DoPrompt(str);
+      if (status->Socket != -1) // Print status string to socket if open
+        write(status->Socket,str,strlen(str)+1);
+      sPrintStatus(status,str,0); // Print status only to socket 
+      
+
+
+
       //Convert from HV to DAC values
       if (!(config->IsDAC)){
         hvoltageV = status->HVV[board][chain][channel]+hvdiffV;
         status->HVV[board][chain][channel] = hvoltageV;
-        printf("hv+diff = %f .\n",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);
+        //      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();
@@ -545 +552 @@
         
         status->HV[board][chain][channel]=hvoltage;
-        printf("dac hv rampingup= %d .\n",hvoltage);
+        //      printf("dac hv rampingup= %d .\n",hvoltage);
         if ((hv->GetHVBoard(board))->SetHV(stdout,chain,channel,hvoltage,rbuf,status->Verbose)==1) {
           UpdateStatus(board,rbuf);