diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 857191a..aea2b5e 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,16 +1,16 @@ -#Fri Jul 14 16:19:11 CEST 2017 +#Sat Jul 15 08:19:18 CEST 2017 colormap=Flame -colormapAutomatic=true -colormapMax=5.0 +colormapAutomatic=false +colormapMax=5000.0 colormapMin=0.0 flipHorizontally=false flipVertically=false grayscale=false -imageHeight=1200 -imageWidth=1246 +imageHeight=2160 +imageWidth=2560 invert=false -regionStartX=304 -regionStartY=8 +regionStartX=1 +regionStartY=1 rescaleFactor=1.0 rescaleOffset=0.0 roiHeight=-1 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-543.4734026062152 -spatialCalOffsetY=-402.4506689243812 -spatialCalScaleX=-7.7264088212456405 -spatialCalScaleY=-7.804878269075813 +spatialCalOffsetX=-1057.4895329398094 +spatialCalOffsetY=-1420.5549062527236 +spatialCalScaleX=-8.510638153514359 +spatialCalScaleY=-8.235817137431614 spatialCalUnits=mm transpose=false diff --git a/script/RFscan/phase_scan_caqtdm.py b/script/RFscan/phase_scan_caqtdm.py index 9cfcb2f..632591b 100644 --- a/script/RFscan/phase_scan_caqtdm.py +++ b/script/RFscan/phase_scan_caqtdm.py @@ -1,7 +1,7 @@ import ch.psi.pshell.epics.Positioner as Positioner import ch.psi.pshell.epics.ChannelDouble as ChannelDouble -dry_run = True +dry_run = False do_elog = True if get_exec_pars().source == CommandSource.ui: