diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 7f46b5a..d08bd43 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Sat Apr 01 09:07:50 CEST 2017 +#Mon Apr 03 08:45:53 CEST 2017 colormap=Flame colormapAutomatic=false colormapMax=1000.0 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-1057.4895329398094 -spatialCalOffsetY=-1420.5549062527236 -spatialCalScaleX=-8.510638153514359 -spatialCalScaleY=-8.235817137431614 +spatialCalOffsetX=-630.5060320164276 +spatialCalOffsetY=-612.5104241897614 +spatialCalScaleX=-26.761820720381525 +spatialCalScaleY=-26.595744663521685 spatialCalUnits=mm transpose=false diff --git a/script/RFscan/GunScan.py b/script/RFscan/GunScan.py index a30e341..02d7c70 100644 --- a/script/RFscan/GunScan.py +++ b/script/RFscan/GunScan.py @@ -18,8 +18,8 @@ disp = caget("SINBD01-DSCR010:DISPERSION-SIM") energy0 = caget("SINBD01-DSCR010:ENERGY-SIM") phase = ControlledVariable("Phase", "SINEG01-RSYS:SET-VSUM-PHASE", "SINEG01-RSYS:GET-VSUM-PHASE") -phase.config.minValue =-45.0 -phase.config.maxValue = 360.0 +phase.config.minValue =-180.0 +phase.config.maxValue = 180.0 phase.config.resolution = 0.25 phase.initialize() diff --git a/script/RFscan/SchottkyScan.py b/script/RFscan/SchottkyScan.py index 2037df7..bfeb655 100644 --- a/script/RFscan/SchottkyScan.py +++ b/script/RFscan/SchottkyScan.py @@ -15,8 +15,8 @@ else: phase = ControlledVariable("Phase", "SINEG01-RSYS:SET-VSUM-PHASE", "SINEG01-RSYS:GET-VSUM-PHASE") -phase.config.minValue =-45.0 -phase.config.maxValue = 360.0 +phase.config.minValue =-180.0 +phase.config.maxValue = 180.0 phase.config.resolution = 0.5 phase.initialize() diff --git a/script/RFscan/SchottkyScan_sim.py b/script/RFscan/SchottkyScan_sim.py index b58acc4..3609ee9 100644 --- a/script/RFscan/SchottkyScan_sim.py +++ b/script/RFscan/SchottkyScan_sim.py @@ -15,8 +15,8 @@ else: phase = ControlledVariable("Phase", "SINEG01-RSYS:SET-VSUM-PHASE-SIM", "SINEG01-RSYS:GET-VSUM-PHASE-SIM") -phase.config.minValue =-45.0 -phase.config.maxValue = 360.0 +phase.config.minValue =-180.0 +phase.config.maxValue = 180.0 phase.config.resolution = 0.5 phase.initialize()