Changeset 100 for hvcontrol/src/HV.cc

Timestamp:

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

Author:

ogrimm

Message:

Number of HV boards (almost) unlimited.

File:

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

hvcontrol/src/HV.cc

@@ -22 +22 @@
   m = PIO;
 
-  fTestMode = m->config->TestMode;
-  fTestModeWrap = 0;
-  
   SetTimeOut(m->config->fTimeOut);
   BoardNumber = DeviceNumber;
@@ -34 +31 @@
   LastWrapCount = -1;
   
-  if (fTestMode) {
-    fDescriptor = 99;
-    return;
-  }
-
   ClearVoltageArrays();
 
@@ -78 +70 @@
 // Destructor (Resetting board)
 HVBoard::~HVBoard() {
-  if(fDescriptor >= 0 && !fTestMode) {
+  if(fDescriptor >= 0) {
     Reset();
     close(fDescriptor);
@@ -87 +79 @@
 // Communicate: Write and read from HV Board until fTimeOut has been reached 
 //
-// Returns: 0 read error, 1 success, -1 fTimeOut exceeded
+// Returns: 0 error, 1 success, -1 fTimeOut exceeded
 int HVBoard::Communicate(unsigned char* wbuf, int Bytes) {
 
@@ -96 +88 @@
   // === Write data ===
   if (write(fDescriptor, wbuf, Bytes) < Bytes) {
-    m->PrintMessage("Error: could not write (all) data to HV board\n");
+    m->PrintMessage("Error: Could not write (all) data to HV board\n");
     return 0;
   }
@@ -128 +120 @@
   }
   LastWrapCount = rbuf & 0X07;  
-  for (int i=0; i<NUM_CHAINS; i++) Overcurrent[i]=(rbuf & (0X08 << i));
+  for (int i=0; i<NUM_CHAINS; i++) Overcurrent[i] = (rbuf & (0X08 << i));
   ResetButton = (bool) (rbuf & 0X80);
 
@@ -140 +132 @@
 int HVBoard::Reset() {
   
-  if (fTestMode) return 1; 
-
   unsigned char wbuf[] = {REG_RESET,0,0};
   int ret;
@@ -153 +143 @@
 int HVBoard::GetStatus() {
 
-  if (fTestMode) return 1;
-
   unsigned char wbuf[] = {REG_STATUS,0,0};
   
@@ -164 +152 @@
 int HVBoard::SetHV(int chain, unsigned int channel, int hv) {
 
-  if (fTestMode){
-    m->PrintMessage("Test mode: Nothing to be done. \n");
-    return 1;
-  }
+  unsigned char wbuf[] = {0,0,0};
+  int ret;
   
-  unsigned char wbuf[] = {0,0,0};
-
-  if (hv > 0x3FFF) {
-    m->PrintMessage(" Error: HV beyond upper 0x3FFF\n"); 
+  if (hv<0 || hv > 0x3FFF) {
+    m->PrintMessage("Error: Voltage out of range 0-0x3FFF\n"); 
     return 0;
   }
-  if (hv<0) hv = 0;
   
   switch (chain) {
@@ -183 +166 @@
     case 3: wbuf[0] = REG_HV3; break;
 
-    default : m->PrintMessage(" Error: chain %d does not exist\n",chain); return 0;
+    default : m->PrintMessage(" Error: Chain %d does not exist\n",chain); return 0;
   }
  
@@ -192 +175 @@
   wbuf[2] |= (unsigned char)(hv & 0X000000FF);              // Add [D7-D0]
    
-  return Communicate(wbuf, 3);
+  if ((ret = Communicate(wbuf, 3)) == 1) HV[chain][channel] = hv;
+  return ret;
 }