diff --git a/iexcode/instruments/ARPES.py b/iexcode/instruments/ARPES.py index cd06154eeb475ab96f64c77a8d9384c1115d1f28..0d586f0a002ca313800c8b5290367447e32e1e0d 100644 --- a/iexcode/instruments/ARPES.py +++ b/iexcode/instruments/ARPES.py @@ -725,5 +725,5 @@ def ARPES_sample_map2D(step_y=0.5,step_z=0.5): Previously: Map_ARPES_Sample """ print("Scan_ARPES_2Dmotor(\"y\",0,4,"+str(step_y)+",\"z\",12,16,"+str(step_z)+")") - ARPES_Motors.scan2D(["y",0,4,step_y],["z",12,16,step_z]) + ARPES_Motors.scan_2D(["y",0,4,step_y],["z",12,16,step_z]) diff --git a/iexcode/instruments/electron_analyzer.py b/iexcode/instruments/electron_analyzer.py index 782174e9f8f828c01db66e3f359db87a47e3b5bb..d7c92a143556e4c24c99ee9eeb70bc25c03f71be 100644 --- a/iexcode/instruments/electron_analyzer.py +++ b/iexcode/instruments/electron_analyzer.py @@ -801,3 +801,4 @@ def SES_slit_set(val): def SES_slit_get(): SES=caget("29idc:m8.RBV") return SES + diff --git a/iexcode/instruments/resolution.py b/iexcode/instruments/resolution.py index 7cdbf8fee6456c02f55f31c95e1fab5400d932ac..c6f5a73169e11f831e562c9b6ec8555b3ed52f7e 100644 --- a/iexcode/instruments/resolution.py +++ b/iexcode/instruments/resolution.py @@ -6,7 +6,7 @@ import iexcode.instruments.cfg as iex from iexcode.instruments.utilities import take_closest_value 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, getSESslit +from iexcode.instruments.electron_analyzer import EA, resolution_EA, SES_slit_get from iexcode.instruments.ARPES import ARPES_extra_pvs ############################################################################################################# ############################## Resolution ############################## @@ -23,7 +23,7 @@ def resolution(): slit_size = take_closest_value([10,20,50,100,200],round(slit_get(),0)) if branch == "c": - slit_SES = getSESslit() + slit_SES = SES_slit_get() PE = int(EA.PassEnergy) Tsample = caget(ARPES_extra_pvs['TA']) resolution_ARPES(grt,hv_eV,slit_size,PE,slit_SES,Tsample,verbose=True)