diff --git a/eco/acquisition/dia.py b/eco/acquisition/dia.py index c7956a9..2ea1215 100644 --- a/eco/acquisition/dia.py +++ b/eco/acquisition/dia.py @@ -4,6 +4,9 @@ from ..acquisition.utilities import Acquisition from detector_integration_api import DetectorIntegrationClient import os from pathlib import Path +import logging + +logger = logging.getLogger(__name__) class DIAClient: diff --git a/eco/bernina/config.py b/eco/bernina/config.py index 4260cc9..eec799c 100755 --- a/eco/bernina/config.py +++ b/eco/bernina/config.py @@ -183,7 +183,7 @@ components = [ { "name": "att", "args": ["SAROP21-OATT135"], - "kwargs": {}, + "kwargs": {'pulse_picker':Component('xp')}, "z_und": 135, "desc": "Attenuator Bernina", "type": "eco.xoptics.attenuator_aramis:AttenuatorAramis", diff --git a/eco/loptics/bernina_experiment.py b/eco/loptics/bernina_experiment.py index 32c7aee..c2a1498e 100755 --- a/eco/loptics/bernina_experiment.py +++ b/eco/loptics/bernina_experiment.py @@ -124,7 +124,7 @@ class Laser_Exp: # Implementation of delay compensation, this assumes for now that delays_glob and delay_tt actually delay in positive directions. self.delay_lxtt = DelayCompensation( - [self.delay_glob, self.delay_tt], [1, -1], name="delay_lxtt" + [self.delay_glob, self.delay_tt], [-1, 1], name="delay_lxtt" ) self.alias.append(self.delay_lxtt.alias) diff --git a/eco/xoptics/attenuator_aramis.py b/eco/xoptics/attenuator_aramis.py index 85bd624..91a89dd 100755 --- a/eco/xoptics/attenuator_aramis.py +++ b/eco/xoptics/attenuator_aramis.py @@ -7,7 +7,7 @@ from ..devices_general.adjustable import PvEnum class AttenuatorAramis: - def __init__(self, Id, E_min=1500, sleeptime=1, name=None, set_limits=[-52, 2]): + def __init__(self, Id, E_min=1500, sleeptime=1, name=None, set_limits=[-52, 2],pulse_picker=None): self.Id = Id self.E_min = E_min self._pv_status_str = PV(self.Id + ":MOT2TRANS.VALD") @@ -15,6 +15,7 @@ class AttenuatorAramis: self._sleeptime = sleeptime self.name = name self.alias = Alias(name) + self.pulse_picker = pulse_picker self.motors = [ MotorRecord(f"{self.Id}:MOTOR_{n+1}", name=f"motor{n+1}") for n in range(6) @@ -71,7 +72,9 @@ class AttenuatorAramis: def changeTo(self,value,sleeptime=10,hold=False): def changer(value): self.set_transmission(value) - time.sleep(sleeptime) + sleep(sleeptime) + if self.pulse_picker: + self.pulse_picker.open() return Changer(target=value, parent=self, changer=changer, hold=hold)