From 18a4b4cce33b34df965beb5742955e34f822cf12 Mon Sep 17 00:00:00 2001
From: "FR@29iduser" <rodolakis@anl.gov>
Date: Fri, 16 Sep 2022 14:09:54 -0500
Subject: [PATCH] Motors scan2D
---
build/lib/iexcode/instruments/Motors.py | 1 +
iexcode/instruments/Motors.py | 10 ++++++++++
iexcode/instruments/Octupole.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/build/lib/iexcode/instruments/Motors.py b/build/lib/iexcode/instruments/Motors.py
index 01bc8f3..6007ef8 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 01bc8f3..b59469b 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 8bae7e6..5f6644a 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
--
GitLab