Skip to content
Snippets Groups Projects
Commit 57c1ea97 authored by 29iduser's avatar 29iduser
Browse files

fixed scanEAmotor to not double call

parent fabe124e
No related branches found
No related tags found
1 merge request!11Main merge jmcchesn-main-patch branch with main
......@@ -686,15 +686,16 @@ def scanEA_motor(EAlist, motor,start,stop,step,mode='absolute',**kwargs):
EAparms=scanEA(EAlist,**EAkwargs)
#Setting up the ScanRecord for motor scans
execute = kwargs['execute']
kwargs.update({'execute':False})
scan_dim=2 #hard coded
kwargs.update({'scan_dim':scan_dim})
EA.Motors.scan(motor,start,stop,step,**kwargs)
if kwargs['debug']:
print("ScanGo scan_dim = ",scan_dim)
if kwargs["execute"]==True:
if execute == True:
#Scanning
EA.put(EAlist[1],EAparms['PassEnergy'],LensMode="Angular",Frames=EAparms['Frames'],**kwargs)
scan_go(**kwargs)
......@@ -733,6 +734,8 @@ def scanEA_map_sample(EAlist,y_list,z_list,**kwargs):
EAparms=scanEA(EAlist,**EAkwargs)
#Setting up the ScanRecord for motor scans
execute = kwargs['execute']
kwargs.update({'execute':False})
outer_scan_dim=3 #hard coded
inner_loop_list = y_list.insert(0,"y")
outer_loop_list = z_list.insert(0,"z")
......@@ -741,7 +744,7 @@ def scanEA_map_sample(EAlist,y_list,z_list,**kwargs):
if kwargs['debug']:
print("ScanGo scan_dim = ",outer_scan_dim)
if kwargs['execute']:
if execute:
#Scanning
EA.put(EAlist[1],EAparms['PassEnergy'],LensMode="Angular",Frames=EAparms['Frames'],**kwargs)
scan_go(scan_dim=outer_scan_dim)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment