Skip to content
Snippets Groups Projects
Commit dfd2b20e authored by Your Name's avatar Your Name
Browse files

cams, AD_utilits and kappa_optimize

parent 5967b920
No related branches found
No related tags found
1 merge request!11Main merge jmcchesn-main-patch branch with main
......@@ -299,6 +299,7 @@ def ADplugin_ScanSetup(ADplugin, **kwargs):
#from AD_ScanTrigger
kwargs.setdefault("P",ADplugin.split(":")[0]+":")
kwargs.setdefault("R","cam1:")
kwargs.setdefault('detTrig',2)
AD_DoneSingleSave(ADplugin,**kwargs)
......@@ -306,11 +307,9 @@ def ADplugin_ScanSetup(ADplugin, **kwargs):
AD_exposure_time(ADplugin,kwargs["ExposureTime"])
AD_SaveFileSetup(ADplugin,**kwargs)
AD_ScanTrigger(ADplugin, **kwargs)
trigger = ".T"+str(kwargs["detTrig"])+"PV"
scanPV = mda_ioc()+"scan"+str(kwargs["scanDIM"])
AD_ScanTrigger(ADplugin, **kwargs)
print("WARNING: you need to need to disable saving and clear the trigger by hand after the scan")
print("\tAD_FreeRun("+ADplugin+"); caput("+scanPV+trigger+",'')")
print("\tAD_FreeRun("+ADplugin+"); scan_triggers_clear()")
def AD_ROI_setup(AD,ROInum,xcenter=500,ycenter=500,xsize=50,ysize=50,binX=1,binY=1):
"""
......
......@@ -580,7 +580,7 @@ def _ARPES_DefaultPosition(destination):
DefaultPosition={
'measure':(0.0,0.0,-13.5,0.0,0.0,0.0),
'LEED':(-0.0, 0.0, -141.5, 89.5, 0.0, 0.0),
'transfer':(-0,0.0,-141.5,180.0,0.0,0.0),
'transfer':(-2.0,0.0,-141.5,180.0,0.0,0.0),
}
if destination in DefaultPosition:
pos=DefaultPosition[destination]
......
......@@ -264,6 +264,12 @@ class Motors:
kwargs.setdefault('cts',0.1)
kwargs.setdefault('mpa',False)
if kwargs['debug']:
print('kwargs:', kwargs)
print('inner_loop_list = ',inner_loop_list)
print('outer_loop_list = ',outer_loop_list)
rbv_pv,val_pv,sgm_pv,pv = self._motor_dictionary[inner_loop_list[0]]
inner_loop_list.pop(0)
inner_loop_list.insert(0,rbv_pv)
......
......@@ -725,6 +725,7 @@ def scanEA_map_sample(EAlist,y_list,z_list,**kwargs):
"""
kwargs.setdefault("execute",True)
kwargs.setdefault("debug",False)
kwargs.setdefault('outer_scan_dim',3)
#setting up EA
EAkwargs={
......@@ -736,18 +737,16 @@ def scanEA_map_sample(EAlist,y_list,z_list,**kwargs):
#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")
EA.Motors.scan_2D(inner_loop_list,outer_loop_list,outer_scan_dim,**kwargs)
EA.Motors.scan_2D(['y',y_list[0],y_list[1],y_list[2]],['z',z_list[0],z_list[1],z_list[2]],**kwargs)
if kwargs['debug']:
print("ScanGo scan_dim = ",outer_scan_dim)
print("ScanGo scan_dim = ",kwargs['outer_scan_dim'])
if execute:
#Scanning
EA.put(EAlist[1],EAparms['PassEnergy'],LensMode="Angular",Frames=EAparms['Frames'],**kwargs)
scan_go(scan_dim=outer_scan_dim)
scan_go(scan_dim=kwargs['outer_scan_dim'])
EAlog_update()
#After scan
......
......@@ -146,24 +146,25 @@ def m3r_align(target_pixel=None, precision=0.5, num_tries=10, verbose=True,debug
if target_pixel == None:
target_pixel = caget( m3r_align_pv_dictionary()['desired_pixel'])
if iex.BL.branch =='d':
# coarse aligment
pixel_delta = m3r_align_stats_centroid_posx()-target_pixel
m3r_align_move_pitch_piezo(pixel_delta)
try_num = 1
while True:
if hasattr(iex.BL, 'branch'):
if iex.BL.branch =='d':
# coarse aligment
pixel_delta = m3r_align_stats_centroid_posx()-target_pixel
if debug:
print(try_num,pixel_delta)
if abs(pixel_delta) <= precision:
break
elif try_num > num_tries:
break
else:
#fine alignment
m3r_align_move_pitch_piezo(pixel_delta)
try_num = 1
while True:
pixel_delta = m3r_align_stats_centroid_posx()-target_pixel
if debug:
print('Fine align')
m3r_align_move_pitch_piezo(pixel_delta)
print(try_num,pixel_delta)
if abs(pixel_delta) <= precision:
break
elif try_num > num_tries:
break
else:
#fine alignment
if debug:
print('Fine align')
m3r_align_move_pitch_piezo(pixel_delta)
if verbose:
......
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