Commit a2664288 authored by Jan Kotanski's avatar Jan Kotanski
Browse files

New upstream version 1.3.1

parent 2be9a764
Metadata-Version: 1.0
Name: nexdatas.extrasp02
Version: 1.3.0
Version: 1.3.1
Summary: nexus template components for P02
Home-page: http://github.com/nexdatas/
Author: Jan Kotanski
......
......@@ -19,7 +19,7 @@
""" nexus xml templates for P02"""
__version__ = "1.3.0"
__version__ = "1.3.1"
#: (:obj:`dict` <:obj:`str` , :obj:`dict` <:obj:`str` , :obj:`str` > >)
#: standard component template variables
......
......@@ -355,13 +355,15 @@ def _getProxies(componentName):
#
timerSardanaName = _getDataSource(timerName)
if ":" in timerSardanaName:
timerSardanaName = "/".join(timerSardanaName.split("/")[1:])
b = db.get_device_property(timerSardanaName, ['__SubDevices'])
timerSardanaNameWOH = "/".join(timerSardanaName.split("/")[1:])
b = db.get_device_property(timerSardanaNameWOH, ['__SubDevices'])
try:
if ":" in b['__SubDevices'][0]:
mdname = b['__SubDevices'][0]
else:
elif b['__SubDevices']:
mdname = "%s/%s" % (tangohost, b['__SubDevices'][0])
else:
mdname = timerSardanaName
timerProxy = PyTango.DeviceProxy(mdname)
except:
print >> sys.stderr, \
......@@ -375,8 +377,8 @@ def _getProxies(componentName):
#
motorSardanaName = _getDataSource(sweepMotor)
if ":" in motorSardanaName:
motorSardanaName = "/".join(motorSardanaName.split("/")[1:])
b = db.get_device_property(motorSardanaName, ['__SubDevices'])
motorSardanaNameWOH = "/".join(motorSardanaName.split("/")[1:])
b = db.get_device_property(motorSardanaNameWOH, ['__SubDevices'])
try:
if not b['__SubDevices']:
motorProxy = PyTango.DeviceProxy(motorSardanaName)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment