corrected delay stage directions in bernina

This commit is contained in:
2019-07-04 21:51:42 +02:00
parent d7313a0380
commit 2fc0ce1c8d
4 changed files with 10 additions and 4 deletions
+3
View File
@@ -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:
+1 -1
View File
@@ -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",
+1 -1
View File
@@ -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)
+5 -2
View File
@@ -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)