This commit is contained in:
gobbo_a
2017-07-05 17:39:28 +02:00
parent 59218f3ccf
commit 5e5154476f
3 changed files with 22 additions and 25 deletions

View File

@@ -1,16 +1,16 @@
#Tue Jul 04 10:08:08 CEST 2017
#Wed Jul 05 16:22:09 CEST 2017
colormap=Flame
colormapAutomatic=false
colormapMax=1071.0
colormapMax=3000.0
colormapMin=0.0
flipHorizontally=false
flipVertically=false
grayscale=false
imageHeight=1200
imageWidth=1246
imageHeight=494
imageWidth=659
invert=false
regionStartX=304
regionStartY=8
regionStartX=0
regionStartY=0
rescaleFactor=1.0
rescaleOffset=0.0
roiHeight=-1
@@ -21,9 +21,9 @@ rotation=0.0
rotationCrop=false
scale=1.0
serverURL=localhost\:10000
spatialCalOffsetX=-393.4993589250224
spatialCalOffsetY=-389.50586061323884
spatialCalScaleX=-18.903591441986975
spatialCalScaleY=-19.37984471513329
spatialCalOffsetX=-897.4569277923539
spatialCalOffsetY=-553.5018204823035
spatialCalScaleX=-8.51063846193645
spatialCalScaleY=-8.235816803255444
spatialCalUnits=mm
transpose=false

View File

@@ -1,4 +1,4 @@
#Thu Jun 29 14:59:27 CEST 2017
#Wed Jul 05 17:39:15 CEST 2017
colormap=Flame
colormapAutomatic=true
colormapMax=255.0
@@ -13,10 +13,10 @@ regionStartX=1
regionStartY=1
rescaleFactor=1.0
rescaleOffset=0.0
roiHeight=-1
roiWidth=-1
roiX=0
roiY=0
roiHeight=0
roiWidth=0
roiX=976
roiY=368
rotation=0.0
rotationCrop=false
scale=1.0

View File

@@ -4,21 +4,19 @@ do_elog = True
if get_exec_pars().source == CommandSource.ui:
bph_ref_user = 0.0
plt = None
print "Debug"
else:
bph_ref_user = args[0]
plt = args[1]
print "Args: " , bph_ref_user, plt
phaseOffsetInit = caget('SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE')
phaseOffset = phaseOffsetInit - bph_ref_user
print "Setting phase offset: ", phaseOffset
phaseOffset_old = caget('SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE')
phaseOffset_new = phaseOffset_old - bph_ref_user
if not dry_run:
caput('SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE', phaseOffset)
caput('SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE', phaseOffset_new)
caput('SINEG01-RSYS:CMD-LOAD-CALIB-BEAM', 1)
if do_elog:
log_msg = "Initial phase offset: %0.1f" % phaseOffsetInit + "deg \n"
log_msg = log_msg + "New phase offset: %0.1f" % phaseOffset + "deg \n"
log_msg = "SINEG01-RSYS:SET-VSUM-PHASE-OFFSET-BASE \n"
log_msg = log_msg + "Old: %0.1f" % phaseOffset_old + "deg \n"
log_msg = log_msg + "New: %0.1f" % phaseOffset_new + "deg \n"
log_msg = log_msg + "RF phase at charge on-set %0.1f" % -phaseOffset_new + "deg \n"
attachments = []
if plt is not None:
sleep(0.1) #Give some time to plot to be finished - it is not sync with acquisition
@@ -26,5 +24,4 @@ if do_elog:
plt.saveSnapshot(file_name , "png")
attachments = [file_name]
elog("SchottkyScanSet", log_msg, attachments)
show_message("Success setting phase reference")