diff --git a/build/lib/iexcode/instruments/Motors.py b/build/lib/iexcode/instruments/Motors.py index 01bc8f305dc74ed10ae9d4cb6afb39ef3ab4fcdb..6007ef8507f03ab644b1d5338e55da9645ac6e62 100644 --- a/build/lib/iexcode/instruments/Motors.py +++ b/build/lib/iexcode/instruments/Motors.py @@ -246,6 +246,7 @@ class Motors: iex.BL.mda.fillin_2D(inner_loop_list,outer_loop_list,**kwargs) if kwargs['execute']: + kwargs.update({'scan_dim':kwargs['outer_scan_dim']}) iex.BL.mda.go(**kwargs) diff --git a/iexcode/instruments/Motors.py b/iexcode/instruments/Motors.py index 01bc8f305dc74ed10ae9d4cb6afb39ef3ab4fcdb..b59469b4d79386207cf74dbcbcf67222b9c322fe 100644 --- a/iexcode/instruments/Motors.py +++ b/iexcode/instruments/Motors.py @@ -246,6 +246,7 @@ class Motors: iex.BL.mda.fillin_2D(inner_loop_list,outer_loop_list,**kwargs) if kwargs['execute']: + kwargs.update({'scan_dim':kwargs['outer_scan_dim']}) iex.BL.mda.go(**kwargs) @@ -425,6 +426,15 @@ def dscanphi(start,stop,step): iex.BL.motors.scan("phi",start,stop,step,relative=True) +def scan_motors_2D(inner_loop_list,outer_loop_list,**kwargs): + """ + 2D motor scans + + usage: + scan_motors_2D(["x",-5,5,.25],["z",141.5-5,141.5+5,.25]) + """ + iex.BL.motors.scan_2D(inner_loop_list,outer_loop_list,**kwargs) + ######## mprint and mvsample ################### def mprint(name=''): """ diff --git a/iexcode/instruments/Octupole.py b/iexcode/instruments/Octupole.py index 8bae7e610d9ebe0261918a919840bf39becf9288..5f6644a51e8df349c9a1e64f70e0e5d0b40684d4 100644 --- a/iexcode/instruments/Octupole.py +++ b/iexcode/instruments/Octupole.py @@ -90,7 +90,7 @@ def Octupole_init(*userName,**kwargs): #resetting everything if kwargs['reset']: - Octupole_reset(**kwargs) + Octupole_reset() print ('Octupole initalized') #return any detectors or other parameters that you want access to from jupyter