From d22cdeded739035441fe7e3680eb4409fdb4719e Mon Sep 17 00:00:00 2001 From: Roman Mankowsky Date: Fri, 3 Jul 2020 18:53:47 +0200 Subject: [PATCH] xlt --- eco/bernina/config.py | 17 ++++++++++++----- eco/timing/lasertiming_edwin.py | 4 +++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/eco/bernina/config.py b/eco/bernina/config.py index f518dcb..32737b0 100755 --- a/eco/bernina/config.py +++ b/eco/bernina/config.py @@ -490,11 +490,18 @@ components = [ "run_table": Component("run_table"), }, }, + # { + # "args": [], + # "name": "lxt", + # "desc": "laser timing with pockels cells and phase shifter", + # "type": "eco.timing.lasertiming:Lxt", + # "kwargs": {}, + # }, { "args": [], - "name": "lxt", - "desc": "laser timing with pockels cells and phase shifter", - "type": "eco.timing.lasertiming:Lxt", + "name": "xlt_epics", + "desc": "laser timing with pockels cells and phase shifter, epics implementation by edwin", + "type": "eco.timing.lasertiming_edwin:XltEpics", "kwargs": {}, }, { @@ -706,7 +713,7 @@ components = [ "z_und": 142, "desc": "USD attenuator", "type": "eco.xdiagnostics.att_usd:att_usd_targets", - "kwargs": {"Id": "SARES23", "xp":Component("xp")}, + "kwargs": {"Id": "SARES23", "xp": Component("xp")}, }, { "args": [], @@ -737,7 +744,7 @@ components = [ "checker": Component("checker"), "scan_directories": True, "run_table": Component("run_table"), - "elog":Component("elog"), + "elog": Component("elog"), }, "lazy": False, }, diff --git a/eco/timing/lasertiming_edwin.py b/eco/timing/lasertiming_edwin.py index 69a60ed..890ddad 100644 --- a/eco/timing/lasertiming_edwin.py +++ b/eco/timing/lasertiming_edwin.py @@ -14,7 +14,7 @@ from ..aliases import append_object_to_object, Alias @spec_convenience -class LxtEpics: +class XltEpics: def __init__(self, pvname="SLAAR02-LTIM-PDLY", name="lxt_epics"): self.pvname = pvname self.alias = Alias(name) @@ -79,3 +79,5 @@ class LxtEpics: stopper=None, ) + def reset_current_value_to(self, value): + self.offset.set_target_value((self.get_current_dial_value() - value)).wait()