Changeset 12249 for trunk

Timestamp:

10/23/11 17:05:23 (13 years ago)

Author:

tbretz

Message:

Added some Dim descriptions and a new service propagating the nominal voltages.

File:

• trunk/FACT++/src/biasctrl.cc (modified) (8 diffs)

trunk/FACT++/src/biasctrl.cc

@@ -43 +43 @@
 
     vector<uint16_t> fVoltCmd;     // Current command voltage in DAC units (12bit = 90V)
-    vector<uint16_t> fVoltGapd;
 
     vector<bool>     fPresent;
@@ -68 +67 @@
     vector<uint16_t> fVolt;        // Current voltage in DAC units (12bit = 90V)
     vector<uint16_t> fVoltRef;     // Current reference voltage in DAC units (12bit = 90V)
+    vector<uint16_t> fVoltGapd;    // Nominal G-APD voltages at 25deg C
 
     vector<int16_t>  fCurrent;     // Current in ADC units (12bit = 5mA)
@@ -79 +79 @@
 
     virtual void UpdateV()
+    {
+    }
+
+    virtual void UpdateVgapd()
     {
     }
@@ -755 +759 @@
         fIsVerbose(false),
         fVoltCmd(kNumChannels),
-        fVoltGapd(kNumChannels),
         //fRefCurrent(kNumChannels),
         fPresent(kNumBoards),
@@ -767 +770 @@
         fVolt(kNumChannels),
         fVoltRef(kNumChannels),
+        fVoltGapd(kNumChannels),
         fCurrent(kNumChannels)
     {
@@ -1052 +1056 @@
         for (size_t i=0; i<kNumChannels; i++)
             fVoltGapd[i] = volt[i]*4096/90;
+
+        UpdateVgapd();
 
         return true;
@@ -1414 +1420 @@
     DimDescribedService fDimCurrent;
     DimDescribedService fDimVoltage;
+    DimDescribedService fDimGapd;
 
     void UpdateA()
@@ -1428 +1435 @@
     }
 
+    void UpdateVgapd()
+    {
+        fDimGapd.Update(fVoltGapd);
+    }
 
 public:
     ConnectionDimBias(ba::io_service& ioservice, MessageImp &imp) :
         ConnectionBias(ioservice, imp),
-        fDimCurrent("BIAS_CONTROL/CURRENT", "S:416", ""),
-        fDimVoltage("BIAS_CONTROL/VOLTAGE", "S:416;S:416", "")
+        fDimCurrent("BIAS_CONTROL/CURRENT", "S:416",       "|I[uA]:Bias current"),
+        fDimVoltage("BIAS_CONTROL/VOLTAGE", "S:416;S:416", "|U[V]:Applied bias voltage|Uref[V]:Reference bias voltage"),
+        fDimGapd(   "BIAS_CONTROL/NOMINAL", "S:416",       "|U[V]:Nominal G-APD voltage at 25deg C")
     {
     }