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:01:32 +02:00
parent a8fb26763d
commit e034f1ef4e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
script/Alignment/Gun_solenoid_alignment.py
View File

@@ -29,6 +29,7 @@ if get_exec_pars().source == CommandSource.ui:
else:
centroid_excursion_plot = False
kill_camtool()
check_camtool()
laser_was_on = is_laser_on()
@@ -90,8 +91,7 @@ try:
r = lscan(gun_solenoid, sensors , I1, I2, dI, settling_time, before_read = before_sample, after_read = after_sample)
finally:
if mode == "camtool": camtool.stop()
gun_solenoid.write(original_gun_solenoid)
gun_solenoid.write(original_gun_solenoid)
if laser_was_on:
laser_on()
else:

4
script/local.py
View File

@@ -343,8 +343,8 @@ def kill_camtool():
def _run_camtool():
try:
cmd = "source /opt/gfa/python ;"
cmd += CAMTOOL_SERVER_SCRIPT + " -p " + _get_camtool_port() + " -b /afs/psi.ch/intranet/SF/Applications/config/camtool_n"
#cmd = "source /opt/gfa/python\n"
cmd = CAMTOOL_SERVER_SCRIPT + " -p " + _get_camtool_port() + " -b /afs/psi.ch/intranet/SF/Applications/config/camtool_n"
if not PRINT_CAMTOOL_OUTPUT:
cmd = cmd + " > /dev/null 2>&1"
print "Executing: ", cmd