Changeset 14299 for trunk/FACT++

Timestamp:

08/01/12 17:40:00 (12 years ago)

Author:

neise

Message:

just need to check in quickly

File:

• trunk/FACT++/src/agilentctrl.cc (modified) (4 diffs)

trunk/FACT++/src/agilentctrl.cc

@@ -34 +34 @@
 
 protected:
-
-
-    virtual void UpdateVolt(float, const vector<float>&)
-    {
-    }
-
-    virtual void UpdateCur(float, const vector<float>&)
-    {
-    }
-
 
 
@@ -104 +94 @@
 
 //        int status=-1;
-        float time=0;
 
         string buffer;
@@ -191 +180 @@
         if (b)
         {
-            PostMessage("outp on\n",8);
+            PostMessage("outp on\n");
         }
         else
         {
-            PostMessage("outp off\n",9);
+            PostMessage("outp off\n");
         }
     }
@@ -215 +204 @@
 private:
 
-    DimDescribedService fDimVolt;
-    DimDescribedService fDimCurr;
-
-
-    void Update(DimDescribedService &svc, vector<float> data, float time) const
-    {
-        data.insert(data.begin(), time);
+    DimDescribedService fDim;
+
+    void Update(DimDescribedService &svc, vector<float> data) const
+    {
         svc.Update(data);
     }
 
-    void UpdateVolt(float time, const vector<float> &volt)
-    {
-        Update(fDimVolt, volt, time);
-    }
-
-    void UpdateCur(float time, const vector<float> &curr)
-    {
-        Update(fDimCurr, curr, time);
-    }
-
-    
+    void UpdateDim(const vector<float> &data)
+    {
+        Update(fDim, data);
+    }
+
 
 public:
     ConnectionDimAgilent(ba::io_service& ioservice, MessageImp &imp) :
         ConnectionAgilent(ioservice, imp),
-        fDimVolt   ("AGILENT_CONTROL/VOLTAGE",
-                    "F:1;F:1",
-                    "|t[s]:Agilent uptime"
-                    "|fact_supply[V]: FACT supply voltage"),
-        fDimCurr("AGILENT_CONTROL/CURRENT", "F:1;F:1",
-                    "|t[s]:FSC uptime"
-                    "|fact_current_consumption[A]: current consumed by the FACT camera")
+        fDim("AGILENT_CONTROL/DATA", "F:1;F:1",
+                    "|U[V]: FACT supply voltage"
+                    "|I[A]: current consumed by the FACT camera")
     {
         // nothing happens here.