From f0911d1f6fc3c1c2f9cad62c72e9ac7516c52220 Mon Sep 17 00:00:00 2001 From: Pauluhn Anuschka Date: Tue, 18 Aug 2015 18:08:25 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 90ae4d6..2a24b4d 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -11,13 +11,12 @@ scintillatorY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY3 scintillatorZ=ch.psi.pshell.epics.Positionable X10SA-ES-SCINTI:SET-FOCUS X10SA-ES-SCINTI:GET-FOCUS detectorZ=ch.psi.pshell.epics.Motor X10SA-ES-D:TRZ1 detectorY=ch.psi.pshell.epics.Motor X10SA-ES-D:TRY1 -apertureTable=ch.psi.pshell.device.MotorGroupBase apertureX apertureY +#apertureTable=ch.psi.pshell.device.MotorGroupBase apertureX apertureY beamstopTable=ch.psi.pshell.device.MotorGroupBase beamstopX beamstopY beamstopZ -collimatorTable=ch.psi.pshell.device.MotorGroupBase collimatorX collimatorY -collimator=ch.psi.pshell.device.MotorGroupDiscretePositioner collimatorTable -aperture=ch.psi.pshell.device.MotorGroupDiscretePositioner apertureTable +#collimatorTable=ch.psi.pshell.device.MotorGroupBase collimatorX collimatorY +collimator=ch.psi.pshell.device.MotorGroupDiscretePositioner collimatorX collimatorY +aperture=ch.psi.pshell.device.MotorGroupDiscretePositioner apertureX apertureY scintillator=ch.psi.pshell.device.MotorGroupDiscretePositioner scintillatorY -test=ch.psi.pshell.device.MotorGroupDiscretePositioner apertureX apertureY slit1H=ch.psi.pshell.epics.Slit X10SA-OP-SH1:TRX2 X10SA-OP-SH1:TRX1 slit1V=ch.psi.pshell.epics.Slit X10SA-OP-SV1:TRY1 X10SA-OP-SV1:TRY2 slit2H=ch.psi.pshell.epics.Slit X10SA-OP-SH2:TRX2 X10SA-OP-SH2:TRX1