resolution and ARPES_2D

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])
 

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
+

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)