diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 91b9bb5..3ac2520 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Tue Jun 13 10:36:39 CEST 2017 +#Tue Jun 13 14:39:50 CEST 2017 colormap=Flame colormapAutomatic=true colormapMax=0.0 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-569.4274826508778 -spatialCalOffsetY=-1010.5032289276822 -spatialCalScaleX=-7.6174468650216 -spatialCalScaleY=-7.774538383236796 +spatialCalOffsetX=-282.53713765286636 +spatialCalOffsetY=-271.47711191409877 +spatialCalScaleX=-26.857654389880953 +spatialCalScaleY=-27.12477305237676 spatialCalUnits=mm transpose=false diff --git a/script/RFscan/SchottkyScan.py b/script/RFscan/SchottkyScan.py index 402ba21..cffef60 100644 --- a/script/RFscan/SchottkyScan.py +++ b/script/RFscan/SchottkyScan.py @@ -1,4 +1,4 @@ -import ch.psi.pshell.epics.ControlledVariable as ControlledVariable +import ch.psi.pshell.epics.Positioner as Positioner dry_run = True do_elog = False @@ -18,10 +18,10 @@ else: plt = args[5] if dry_run: - bph = ControlledVariable("Beam phase", "SINEG01-RSYS:SET-BEAM-PHASE-SIM", "SINEG01-RSYS:SET-BEAM-PHASE-SIM") + bph = Positioner("Beam phase", "SINEG01-RSYS:SET-BEAM-PHASE-SIM", "SINEG01-RSYS:SET-BEAM-PHASE-SIM") q = Channel("SINEG01-DICT215:B1_CHARGE-SIM", type = 'd', alias = 'ICT-Q') else: - bph = ControlledVariable("Beam phase", "SINEG01-RSYS:SET-VSUM-PHASE", "SINEG01-RSYS:GET-VSUM-PHASE") + bph = Positioner("Beam phase", "SINEG01-RSYS:SET-BEAM-PHASE", "SINEG01-RSYS:SET-BEAM-PHASE") st = Stream("ICTstream", dispatcher) q = st.addScalar("Charge", "SINEG01-DICT215:B1_CHARGE", 1, 0) st.initialize() @@ -31,6 +31,7 @@ else: bph.config.minValue =-180.0 bph.config.maxValue = 360.0 bph.config.precision = 3 +bph.config.rotation = True bph.config.resolution = 1.0 bph.config.save() bph.initialize()