Commit 0a0c037b authored by Matias Guijarro's avatar Matias Guijarro
Browse files

Merge branch 'pointscan' into 'master'

scanning motor: small fix for VariableStepTriggerMaster

See merge request !576
parents f92dafdb 0bf6bb43
...@@ -321,7 +321,7 @@ class VariableStepTriggerMaster(AcquisitionMaster): ...@@ -321,7 +321,7 @@ class VariableStepTriggerMaster(AcquisitionMaster):
mot_group = Group(*self._axes) mot_group = Group(*self._axes)
group_name = '/'.join(( for x in self._axes)) group_name = '/'.join(( for x in self._axes))
AcquisitionMaster.__init__(self, mot_group, group_name, "zerod", AcquisitionMaster.__init__(self, mot_group, group_name,
trigger_type=trigger_type, **keys) trigger_type=trigger_type, **keys)
self.channels.extend( self.channels.extend(
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