pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
sfop
2017-05-22 15:15:53 +02:00
parent e034f1ef4e
commit ac580e5d92
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
script/Alignment/Gun_solenoid_alignment.py
View File

@@ -15,14 +15,14 @@ camera_name = "SINEG01-DSCR190"
use_good_region=False
if get_exec_pars().source == CommandSource.ui:
I1 = 95.0
I2 = 100.0
I1 = 100.0
I2 = 105.0
dI = 1.0
settling_time = 0.1
plot_image = False
number_images = 5
use_background = True
multiple_background = False
multiple_background = True
number_backgrounds = 5
do_elog = False
centroid_excursion_plot = True
@@ -102,7 +102,7 @@ else:
if centroid_excursion_plot:
(hx,hy)=add_convex_hull_plot ("Centroid excursion", r.getReadable(0),r.getReadable(1), plot_name)
else:
(hx,hy)= convex_hull(x=r.getReadable(0), y=r.getReadable(1))
(hx,hy)= convex_hull(x=to_array(r.getReadable(0), 'd'), y=to_array(r.getReadable(1),'d'))
hx.append(hx[0]); hy.append(hy[0])
# save the entry in the logbook

10
script/Alignment/Laser_gun_alignment.py
View File

@@ -28,7 +28,8 @@ if get_exec_pars().source == CommandSource.ui:
centroid_excursion_plot = True
else:
centroid_excursion_plot = False
kill_camtool()
check_camtool()
laser_was_on = is_laser_on()
@@ -87,8 +88,7 @@ try:
r = lscan(gun_phase, sensors , phi1, phi2, dphi, settling_time, before_read = before_sample, after_read = after_sample)
finally:
if mode == "camtool": camtool.stop()
gun_phase.write(original_phase)
gun_phase.write(original_phase)
if laser_was_on:
laser_on()
else:
@@ -98,10 +98,10 @@ else:
if centroid_excursion_plot:
(hx,hy)=add_convex_hull_plot ("Centroid excursion", r.getReadable(0),r.getReadable(1), plot_name)
else:
(hx,hy)= convex_hull(x=r.getReadable(0), y=r.getReadable(1))
(hx,hy)= convex_hull(x=to_array(r.getReadable(0), 'd'), y=to_array(r.getReadable(1),'d'))
hx.append(hx[0]); hy.append(hy[0])
print "Done"
# save the entry in the logbook
gsa_log_msg = "Data file: " + get_exec_pars().path
gsa_log_msg = gsa_log_msg + "\nImages: " + str(number_images) + " Background: enabled=" + str(use_background) + " multiple=" + str(multiple_background) + " number=" + str(number_backgrounds)