Changeset 85

Timestamp:

Nov 6, 2009 1:15:10 PM (14 years ago)

Author:

jemian

Message:

Fixes #2: initial version ready for testing, probably needs better error handling

Location:

epics2xml

Files:

• epics2xml.py (modified) (5 diffs)
• pvdata.xml (modified) (1 diff)

epics2xml/epics2xml.py

@@ -28 +28 @@
 import datetime
 #import copy
-#import pvConnect
+import pvConnect
 
 
@@ -59 +59 @@
         self.db = {}
         self.pv = {}
+        self.newData = False
 
     def ReadConfigFile(self):
@@ -185 +186 @@
         pv = self.pv[name]
         pv[key] = value
+        self.newData = True
 
     def setPv(self, name, value):
@@ -236 +238 @@
 
     def receiver(self, epics_args, user_args):
-        '''Example response to an EPICS monitor on the channel
+        '''Response to an EPICS monitor on the channel.  Expects to have the PV name as the first user_args.
            @param value: str(epics_args['pv_value'])'''
         value = epics_args['pv_value']
-        print 'receiver', 'updated value:', str(value)
+        pv = user_args[0]
+        self.setPv(pv, str(value))
+        #print 'receiver: ', pv, ' = ', str(value)
 
 
@@ -246 +250 @@
     cf.ReadConfigFile()
     # connect with EPICS here and start waiting for events
-    # How to save periodically?
-    # How to throttle the output file update rate? 
-    
+    if pvConnect.IMPORTED_CACHANNEL:
+        for item in cf.db['pvList']:
+            pv = item['name']
+            if pvConnect.testConnect(pv):
+                #print pv
+                ch = pvConnect.EpicsPv(pv)
+                ch.SetUserArgs(pv)
+                ch.connectw()
+                ch.SetUserCallback(cf.receiver)
+                ch.monitor()
+                ch.chan.pend_event()
+        import time
+        while True:
+            # wait for the minimum refresh period
+            refreshSeconds = int(cf.db['targetFile'] ['refreshMinimum'])
+            for seconds in range(refreshSeconds):
+                time.sleep(1)
+                ch.chan.pend_event()
+            # write only if there is new data
+            if cf.newData:
+                #print cf.__repr__()
+                cf.SaveXmlFile()
+        # not likely to get here
+        pvConnect.on_exit()
+    else:
+        #----------------------------
+        # load some artificial data to test
+        cf.setPv("S:SRcurrent:AI", '99.9853')
+        cf.setPv("APS:BarometricPressure:MBR", '992.083')
+        print cf.__repr__()
     #----------------------------
-    # load some artificial data to test
-    cf.setPv("S:SRcurrent:AI", '99.9853')
-    cf.setPv("APS:BarometricPressure:MBR", '992.083')
-    print cf.__repr__()
-    #----------------------------

epics2xml/pvdata.xml

@@ -1 +1 @@
 <?xml version="1.0" ?>
 <?xml-stylesheet type="text/xsl" href="basic-table.xsl" ?>
-
-<pvdata version="1.0" date="2009-11-06" time="10:32:00">
-    <title>epics2xml: demonstration of function</title>
-    <pv name="S:SRcurrent:AI" rate="monitor" date="2009-11-06" time="09:26:00">
-        <description>APS Storage ring current, mA</description>
-        <value>99.9853</value>
-    </pv>
-    <pv name="APS:BarometricPressure:MBR" rate="monitor" date="2009-11-06" time="10:28:00">
-        <description>ANL barometric pressure, mbar</description>
-        <value>992.083</value>
-    </pv>
+<pvdata date="2009-11-06" time="13:10:20" version="1.0">
+  <title>
+    epics2xml: demonstration of function
+  </title>
+  <pv date="2009-11-06" name="S:SRcurrentAI" rate="monitor" time="13:10:20">
+    <description>
+      APS Storage ring current, mA
+    </description>
+    <value>
+      94.5242330335
+    </value>
+  </pv>
+  <pv date="2009-11-06" name="APS:BarometricPressure:MBR" rate="monitor" time="13:10:20">
+    <description>
+      ANL barometric pressure, mbar
+    </description>
+    <value>
+      987.91800419
+    </value>
+  </pv>
 </pvdata>