From 78b3f037f56203a0f036003327d2147afbeb0428 Mon Sep 17 00:00:00 2001 From: x03daop Date: Tue, 22 Dec 2015 10:22:37 +0100 Subject: [PATCH] Closedown --- config/devices.properties | 12 ++++++------ plugins/XPSSpectrum.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 3b6adc62..057b36a8 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -2,12 +2,12 @@ Scienta=ch.psi.pshell.epics.Scienta|X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1|||true Manip=ch.psi.pshell.epics.Manipulator||||true Eph=ch.psi.pshell.epics.Positioner|X03DA-PHS-E:GO.A X03DA-PGM:rbkenergy|||true -$ManipulatorX=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRX|||true -$ManipulatorY=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRY|||true -$ManipulatorZ=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRZ|||true -$ManipulatorTheta=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:THT|||true -$ManipulatorTilt=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TLT|||true -$ManipulatorPhi=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:PHI|||true +ManipulatorX=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRX|||true +ManipulatorY=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRY|||true +ManipulatorZ=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TRZ|||true +ManipulatorTheta=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:THT|||true +ManipulatorTilt=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:TLT|||true +ManipulatorPhi=ch.psi.pshell.epics.Motor|X03DA-ES2-MA:PHI|||true #sctrg=ch.psi.pshell.epics.ChannelInteger|X03DA-SCIENTA:cam1:Acquire||| #adctrg=ch.psi.pshell.epics.ChannelInteger|X03DA-OP-10ADC:TRG||| MachineCurrent=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT 3|Read||true diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java index c1899a82..5da0308c 100644 --- a/plugins/XPSSpectrum.java +++ b/plugins/XPSSpectrum.java @@ -14,7 +14,7 @@ import ch.psi.utils.IO; import ch.psi.utils.Serializer; import ch.psi.utils.State; import ch.psi.utils.swing.SwingUtils; -import ch.psi.wsaf.Task; +import ch.psi.psaf.Task; import java.io.File; import java.nio.file.Files; import java.util.HashMap;