From e5adec30961cd274c2c1658258070fa5feef1b95 Mon Sep 17 00:00:00 2001 From: panepucci Date: Fri, 20 Nov 2015 16:37:05 +0100 Subject: [PATCH] Closedown --- config/devices.properties | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 81dcfe8..a58ec06 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -4,10 +4,17 @@ exp_shutter=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-PH1:SET|Read|| ketek=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-FD:SET-POS X06DA-ES-FD:GET-POS|Read|| beam_stop_pos=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-BS:SET-POS X06DA-ES-BS:GET-POS|Read|| det_cover=ch.psi.pshell.epics.DiscretePositioner|X06DA-ES-PILCOV:SET|Read|| -omega=ch.psi.pshell.epics.Positionable|X06DA-ES-DF1:OMEGA-VAL X06DA-ES-DF1:OMEGA-RBV||| -x=ch.psi.pshell.epics.Positionable|X06DA-ES-DF1:GMX-VAL X06DA-ES-DF1:GMX-RBV||| -cy=ch.psi.pshell.epics.Motor|X06DA-ES-DFS:TRY1||| -cz=ch.psi.pshell.epics.Motor|X06DA-ES-DFS:TRZ1||| +backlight_pos=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-BL:SET-POS|Read|| +#frontlight_enable=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-FL:ENABLE|Read|| +omega=ch.psi.pshell.epics.Positionable|X06DA-ES-DF1:OMEGA-VAL X06DA-ES-DF1:OMEGA-RBV|Read|| +x=ch.psi.pshell.epics.Positionable|X06DA-ES-DF1:GMX-VAL X06DA-ES-DF1:GMX-RBV|Read|| +cy=ch.psi.pshell.epics.Motor|X06DA-ES-DFS:TRY1|Read|| +cz=ch.psi.pshell.epics.Motor|X06DA-ES-DFS:TRZ1|Read|| +prigo_x=ch.psi.pshell.epics.Positionable|X06DA-ES-PRIGO:BLX X06DA-ES-PRIGO:BLX_RBV|Read|| +prigo_y=ch.psi.pshell.epics.Positionable|X06DA-ES-PRIGO:BLY X06DA-ES-PRIGO:BLY_RBV|Read|| +prigo_z=ch.psi.pshell.epics.Positionable|X06DA-ES-PRIGO:BLZ X06DA-ES-PRIGO:BLZ_RBV|Read|| +flexor=ch.psi.pshell.epics.Motor|X06DA-ES-DFS:TRZ1|Read|| +transmission=ch.psi.pshell.epics.ControlledVariable|X06DA-ES-FI:TRANSM-SET X06DA-ES-FI:TRANSM-GET|Read|| #aperture_x=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRX1||| #aperture_y=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRY1||| beamstop_x=ch.psi.pshell.epics.Motor|X06DA-ES-BS:TRX1||| @@ -17,8 +24,8 @@ beamstop_z=ch.psi.pshell.epics.Motor|X06DA-ES-BS:TRZ1||| #collimator_y=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRY2||| #scintillator_y=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRY3||| #scintillator_z=ch.psi.pshell.epics.Positionable|X06DA-ES-SCINTI:SET-FOCUS X06DA-ES-SCINTI:GET-FOCUS||| -#detector_z=ch.psi.pshell.epics.Motor|X06DA-ES-D:TRZ1||| -#detector_y=ch.psi.pshell.epics.Motor|X06DA-ES-D:TRY1||| +detector_z=ch.psi.pshell.epics.Motor|X06DA-ES-DET:TRZ1||| +detector_y=ch.psi.pshell.epics.Motor|X06DA-ES-DET:TRY1||| #aperture=ch.psi.pshell.device.MotorGroupDiscretePositioner|apertureX apertureY||| #beamstop=ch.psi.pshell.device.MotorGroupDiscretePositioner|beamstopX beamstopY beamstopZ||| #collimator=ch.psi.pshell.device.MotorGroupDiscretePositioner|collimatorX collimatorY||| @@ -29,4 +36,4 @@ slit1h=ch.psi.pshell.epics.Slit|X06DA-OP-SH1:TRX2 X06DA-OP-SH1:TRX1||| #slit2V=ch.psi.pshell.epics.Slit|X06DA-OP-SV2:TRY1 X06DA-OP-SV2:TRY2||| #lamp=ch.psi.pshell.epics.DiscretePositioner|||| #backlight=ch.psi.pshell.epics.ProcessVariable|X06DA-ES-KOI:SET-LIGHT||| -#frontlight=ch.psi.pshell.epics.ProcessVariable|X06DA-ES-FL1:SET-LIGHT||| +frontlight=ch.psi.pshell.epics.ProcessVariable|X06DA-ES-FL1:SET-LIGHT|Read||