Commit a282edf9 authored by Matias Guijarro's avatar Matias Guijarro
Browse files

Merge branch 'valls-patch-7' into 'master'

Set unit to CT2CounterTimer

Closes #1081

See merge request !3672
parents 41afe0fe 3bd16769
Pipeline #46177 failed with stages
in 147 minutes and 33 seconds
...@@ -33,9 +33,9 @@ from bliss.controllers.counter import IntegratingCounterController ...@@ -33,9 +33,9 @@ from bliss.controllers.counter import IntegratingCounterController
class CT2Counter(IntegratingCounter): class CT2Counter(IntegratingCounter):
def __init__(self, name, channel, controller): def __init__(self, name, channel, controller, unit=None):
self.channel = channel self.channel = channel
super().__init__(name, controller) super().__init__(name, controller, unit=unit)
def convert(self, data): def convert(self, data):
return data return data
...@@ -48,7 +48,10 @@ class CT2CounterTimer(CT2Counter): ...@@ -48,7 +48,10 @@ class CT2CounterTimer(CT2Counter):
def __init__(self, name, controller): def __init__(self, name, controller):
self.timer_freq = controller._master_controller.timer_freq self.timer_freq = controller._master_controller.timer_freq
super(CT2CounterTimer, self).__init__( super(CT2CounterTimer, self).__init__(
name, controller._master_controller.internal_timer_counter, controller name,
controller._master_controller.internal_timer_counter,
controller,
unit="s",
) )
def convert(self, ticks): def convert(self, ticks):
......
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