Closedown

This commit is contained in:
x03daop
2015-12-22 10:22:37 +01:00
parent e412adbc50
commit 78b3f037f5
2 changed files with 7 additions and 7 deletions
+6 -6
View File
@@ -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
+1 -1
View File
@@ -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;