Motors scan2D

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)
 
 

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=''):
     """

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