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

Browse Source
This commit is contained in:
root
2018-11-26 09:44:17 +01:00
parent 02cb40fb12
commit 35e61c605d
23 changed files with 521 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/Alignment/Gun_solenoid_alignment.py
+8
View File
@@ -119,6 +119,14 @@ if do_elog:
log_msg = log_msg + "\nImages: " + str(number_images)
log_msg = log_msg + "\nBackground: enabled=" + str(use_background) + " multiple=" + str(multiple_background) + " number=" + str(number_backgrounds)
log_msg = log_msg + "\nPlot index: " + str(centroid_plot_index)
try:
log_msg = log_msg + ("Virtual catode (x,y): " + str(caget("SLG-LCAM-C103:FIT-XPOS", 's')) + ", " + str(caget("SLG-LCAM-C103:FIT-YPOS", 's')))
log_msg = log_msg + ("Position (x,y,rx,ry,rz): " + str(caget("SINEG01-MSOL130:X", 's')) + ", " + str(caget("SINEG01-MSOL130:Y", 's')) + ", " + \
str(caget("SINEG01-MSOL130:ROT_X", 's')) + ", " + str(caget("SINEG01-MSOL130:ROT_Y", 's')) + ", " + str(caget("SINEG01-MSOL130:ROT_Z", 's')))
except:
pass
log_msg = log_msg + "\n\n" + r.print()
sleep(0.1) #Give some time to plot to be finished - it is not sync with acquisition
script/Alignment/Laser_gun_alignment.py
+5
View File
@@ -124,6 +124,11 @@ if do_elog:
log_msg = log_msg + "\nImages: " + str(number_images)
log_msg = log_msg + "\nBackground: enabled=" + str(use_background) + " multiple=" + str(multiple_background) + " number=" + str(number_backgrounds)
log_msg = log_msg + "\nPlot index: " + str(centroid_plot_index)
try:
log_msg = log_msg + ("Virtual catode (x,y): " + str(caget("SLG-LCAM-C103:FIT-XPOS", 's')) + ", " + str(caget("SLG-LCAM-C103:FIT-YPOS", 's')))
except:
pass
log_msg = log_msg + "\n\n" + r.print()
sleep(0.1) #Give some time to plot to be finished - it is not sync with acquisition