Commit 167bf5ba authored by Sebastien Petitdemange's avatar Sebastien Petitdemange
Browse files

Merge branch 'fixes' into 'master'


See merge request !387
parents 4fb0d070 1033a1f1
......@@ -79,7 +79,7 @@ class Camera(object):
return self._proxy.maxNbImages
def version(self):
Pco plugin version
......@@ -3,6 +3,7 @@ Bliss controller for ethernet NewFocus 87xx series piezo controller.
A. Beteva, M. Guijarro, ESRF BCU
import time
from warnings import warn
from bliss.controllers.motor import Controller; from bliss.common import log
from bliss.common.axis import AxisState
......@@ -100,7 +100,7 @@ class CounterAcqDevice(AcquisitionDevice):
self._nb_acq_points += 1
data = acc_value / nb_read
channel_data = {name:data[index] for index,name in enumerate(counter_name)}
channel_data = dict([(name, data[index]) for index,name in enumerate(counter_name)])
{"channel_data": channel_data})
self._ready_flag = True
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