From 3edaf01d8fa2f57d5d03d2509461189ac58a2893 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 5 Jul 2022 10:21:33 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 2 +- script/ManipulatorScan.py | 5 ++++- script/XPSSpectrum.py | 5 ----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 200c627b..3fd2a7d2 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -7,7 +7,7 @@ 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 +$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/script/ManipulatorScan.py b/script/ManipulatorScan.py index f87f8dcd..e96787a0 100644 --- a/script/ManipulatorScan.py +++ b/script/ManipulatorScan.py @@ -10,7 +10,10 @@ RELATIVE (BOOLEAN) FLY_SCAN (BOOLEAN) ENDSCAN (BOOLEAN) """ - +print MOTOR +print RANGE +print STEPS +1/0 #set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1}) adjust_sensors() set_adc_averaging() diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py index db2ef9b0..ca4240e4 100644 --- a/script/XPSSpectrum.py +++ b/script/XPSSpectrum.py @@ -4,11 +4,6 @@ # save_scienta_image # # skip_iteration: if set to 1 then skips after end of current iteration -print ranges -print pass_energy -print save_scienta_image -print ENDSCAN -1/0 from ch.psi.pshell.data.LayoutDefault import ATTR_WRITABLE_DIMENSION as ATTR_WRITABLE_DIMENSION import org.jfree.chart.axis.NumberAxis as NumberAxis