From e7682b4c6bec5bc717f2e3bdcbd2d6f69c74d395 Mon Sep 17 00:00:00 2001 From: Mathias Sander Date: Wed, 7 Sep 2022 10:22:07 +0200 Subject: [PATCH] fixes --- eco/xoptics/att_usd.py | 2 ++ eco/xoptics/reflaser.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eco/xoptics/att_usd.py b/eco/xoptics/att_usd.py index a7189e9..5cd8940 100644 --- a/eco/xoptics/att_usd.py +++ b/eco/xoptics/att_usd.py @@ -290,6 +290,8 @@ class Att_usd(Assembly): def _updateE(self, energy=None, check_once=False): while not energy: energy = PV("SAROP21-ARAMIS:ENERGY").value + if np.isnan(energy): + energy = PV("SARUN:FELPHOTENE").value*1000 if energy < self.E_min: energy = None print( diff --git a/eco/xoptics/reflaser.py b/eco/xoptics/reflaser.py index 72f3555..c92e48f 100644 --- a/eco/xoptics/reflaser.py +++ b/eco/xoptics/reflaser.py @@ -7,7 +7,7 @@ from ..elements.assembly import Assembly class RefLaser_Aramis(Assembly): - def __init__(self, Id, elog=None, name=None, inpos=-13.7, outpos=-5): + def __init__(self, Id, elog=None, name=None, inpos=-19, outpos=-5): super().__init__(name=name) self.Id = Id self.elog = elog