Changeset 126 for hvcontrol/src

Timestamp:

12/08/09 13:29:04 (15 years ago)

Author:

ogrimm

Message:

Implemented DIM servers

Location:

hvcontrol/src

Files:

• HV.cc (modified) (3 diffs)
• HV.h (modified) (2 diffs)
• ProcessIO.cc (modified) (4 diffs)
• ProcessIO.h (modified) (2 diffs)

hvcontrol/src/HV.cc

@@ -26 +26 @@
   BoardName = DeviceName;
   
-  for (int i=0; i<NUM_CHAINS; i++) Overcurrent[i] = false;
+  // Create DIM services
+  snprintf(Buffer, sizeof(Buffer), SERVER_NAME"/NAME/ID%.2d", BoardNumber);
+  Name = new DimService (Buffer, BoardName);
+
+  for (int i=0; i<NUM_CHAINS; i++) {
+    for (int j=0; j<NUM_CHANNELS; j++) {
+      snprintf(Buffer, sizeof(Buffer), SERVER_NAME"/VOLT/ID%.2d/%.2d-%.3d", BoardNumber, i, j);
+      BiasVolt[i][j] = new DimService (Buffer, HVV[i][j]);
+      snprintf(Buffer, sizeof(Buffer), SERVER_NAME"/DAC/ID%.2d/%.2d-%.3d", BoardNumber, i, j);
+      BiasDAC[i][j] = new DimService (Buffer, HV[i][j]);
+    }
+    Overcurrent[i] = false;
+  }
   ResetButton = false;
   WrapOK = true;
@@ -74 +86 @@
     Reset();
     close(fDescriptor);
+  }
+
+  delete Name;
+  for (int i=0; i<NUM_CHAINS; i++) {
+    for (int j=0; j<NUM_CHANNELS; j++) {
+      delete BiasVolt[i][j];
+      delete BiasDAC[i][j];
+    }
   }
 }
@@ -194 +214 @@
       HV[j][k] = 0;
       HVV[j][k] = 0.0;
+      
+      // Update DIM services
+      BiasVolt[j][k]->updateService();
+      BiasDAC[j][k]->updateService();
     }
   }

hvcontrol/src/HV.h

@@ -10 +10 @@
 
 #include "HVConfig.h"
+#include "dis.hxx"
 
 #define BAUDRATE B115200
@@ -52 +53 @@
    double HVV[NUM_CHAINS][NUM_CHANNELS];  // HV value in volts
 
+   DimService *Name;
+   DimService *BiasVolt[NUM_CHAINS][NUM_CHANNELS];
+   DimService *BiasDAC[NUM_CHAINS][NUM_CHANNELS];
+
    void ClearVoltageArrays();
    int Reset();

hvcontrol/src/ProcessIO.cc

@@ -15 +15 @@
 
 
-ProcessIO::ProcessIO(const char *ConfigFile) {
+ProcessIO::ProcessIO(const char *ConfigFile): EvidenceServer(SERVER_NAME) {
 
   // Get program start time
@@ -268 +268 @@
           
           // Set new voltage (if DAC value, update calibrated value)
-          if(!RampVoltage(DACValue, i, j, k)) Errors++;
-          if(SetDac) fHVBoard[i]->HVV[j][k] = calib->DACToHV(fHVBoard[i]->HV[j][k], i, j, k);
+          if (!RampVoltage(DACValue, i, j, k)) Errors++;
+          if (SetDac) fHVBoard[i]->HVV[j][k] = calib->DACToHV(fHVBoard[i]->HV[j][k], i, j, k);
+
+          // Update DIM services
+          fHVBoard[i]->BiasVolt[j][k]->updateService();
 
         } // Channels   
@@ -316 +319 @@
             }
             fHVBoard[Board]->HVV[Chain][Channel] = calib->DACToHV(fHVBoard[Board]->HV[Chain][Channel], Board, Chain, Channel);
+
+            // Update DIM services
+            fHVBoard[Board]->BiasVolt[Chain][Channel]->updateService();
+
             if(++Channel == NUM_CHANNELS) {
               Chain++;
@@ -625 +632 @@
   SlowDataClass->NewEntry("Value");
   SlowDataClass->AddToEntry("%s %d %d %d %d %.2f ",fHVBoard[Board]->BoardName,Board, Chain, Channel, Target, calib->DACToHV(Target,Board,Chain,Channel));
+
+  // Update DIM service
+  fHVBoard[Board]->BiasDAC[Chain][Channel]->updateService();
+  
   return true;
 }

hvcontrol/src/ProcessIO.h

@@ -7 +7 @@
 #include <math.h>
 #include <signal.h>
+
+#define SERVER_NAME "BIAS"       // Name to use in DIM
+#include "../../Evidence/Evidence.h"
 
 #include "HVConfig.h"
@@ -22 +25 @@
 typedef enum stateenum { active, stopped, na } state_enum;
 
-class ProcessIO {
+class ProcessIO: public EvidenceServer {
 
   time_t StartTime;