From c851949641643bf22b780423fd4e987794bc4157 Mon Sep 17 00:00:00 2001
From: 29iduser <you@example.com>
Date: Tue, 11 Oct 2022 15:41:06 -0500
Subject: [PATCH] debug
---
iexcode/instruments/resolution.py | 7 +++++--
iexcode/instruments/xrays.py | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/iexcode/instruments/resolution.py b/iexcode/instruments/resolution.py
index 81e452d..0df58c2 100644
--- a/iexcode/instruments/resolution.py
+++ b/iexcode/instruments/resolution.py
@@ -1,3 +1,4 @@
+from iexcode.instruments.IEX_BL_config import BLconfig_endstation_name
import numpy as np
from epics import caget
@@ -8,6 +9,7 @@ from iexcode.instruments.xrays import getE, slit_get
from iexcode.instruments.VLS_PGM import mono_grating_get
from iexcode.instruments.electron_analyzer import EA, resolution_EA, SES_slit_get
from iexcode.instruments.ARPES import ARPES_extra_pvs
+from iexcode.instruments.scanRecord import *
#############################################################################################################
############################## Resolution ##############################
#############################################################################################################
@@ -19,9 +21,10 @@ def resolution():
"""
grt = mono_grating_get()
hv_eV = getE()
- slit_size = take_closest_value([10,20,50,100,200],round(slit_get(),0))
+ slit_size = take_closest_value([10,20,50,100,200],round(slit_get()[0][0],0))
- if iex.BL.endstation_name == "ARPES":
+ #if iex.BL.endstation_name == "ARPES":
+ if BLconfig_endstation_name == 'ARPES':
slit_SES = SES_slit_get()
PE = int(EA.PassEnergy)
Tsample = caget(ARPES_extra_pvs['TA'])
diff --git a/iexcode/instruments/xrays.py b/iexcode/instruments/xrays.py
index af9e5ad..d9f2c91 100644
--- a/iexcode/instruments/xrays.py
+++ b/iexcode/instruments/xrays.py
@@ -566,7 +566,8 @@ def slit_get(verbose=True):
ARPES = 0 < x < 300 um
Kappa = 0 < x < 1000 um
"""
- branch = iex.BL.branch
+ #branch = iex.BL.branch
+ branch = BLconfig_branch()
slit_size,slit_center = exit_slit_get(branch,verbose=verbose)
return slit_size,slit_center
--
GitLab