From 8489b556b6fc02c13f0409badf79e0eb5ef8817c Mon Sep 17 00:00:00 2001 From: x03daop Date: Tue, 8 Mar 2016 15:40:57 +0100 Subject: [PATCH] Closedown --- config/devices.properties | 8 ++++---- plugins/HoloScan.form | 2 +- plugins/HoloScan.java | 2 +- plugins/ManipulatorScan.form | 2 +- plugins/ManipulatorScan.java | 2 +- plugins/PhotonEnergy.form | 2 +- plugins/PhotonEnergy.java | 2 +- script/HoloScan.py | 1 + script/ManipulatorScan.py | 1 + script/PhotonEnergy.py | 1 + script/XPSSpectrum.py | 2 ++ 11 files changed, 15 insertions(+), 10 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index a8bb121b..507b1aee 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -87,10 +87,10 @@ AuxVoltage=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4|Read||true SampleCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP1:GainSel|Read||true RefCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP2:GainSel|Read||true AuxCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP3:GainSel|Read||true -SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC1.N|Read||true -RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC2.N|Read||true -AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|Read||true -AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|Read||true +SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC1.N|||true +RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC2.N|||true +AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|||true +AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|||true SampleCurrentSampling=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-ADC1:Vraw.SCAN|Read||true RefCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC2:Vraw.SCAN|Read||true AuxCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC3:Vraw.SCAN|Read||true diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form index cd0936b6..1bf55f67 100644 --- a/plugins/HoloScan.form +++ b/plugins/HoloScan.form @@ -425,7 +425,7 @@ - + diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java index 1a1909d6..5676dfe1 100644 --- a/plugins/HoloScan.java +++ b/plugins/HoloScan.java @@ -330,7 +330,7 @@ public class HoloScan extends Panel { checkImageIntegration.setText("Scienta Energy Distribution"); checkImageIntegration.setToolTipText(""); checkImageIntegration.setContentAreaFilled(false); - checkImageIntegration.setName("ImageEnergyDistribution"); // NOI18N + checkImageIntegration.setName("EnergyDistribution"); // NOI18N checkSpectrum.setSelected(true); checkSpectrum.setText("Scienta Spectrum"); diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form index 64df2130..335f96e1 100644 --- a/plugins/ManipulatorScan.form +++ b/plugins/ManipulatorScan.form @@ -491,7 +491,7 @@ - + diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java index cf794fc7..c2ae3f81 100644 --- a/plugins/ManipulatorScan.java +++ b/plugins/ManipulatorScan.java @@ -391,7 +391,7 @@ public class ManipulatorScan extends Panel { checkImageIntegration.setText("Scienta Energy Distribution"); checkImageIntegration.setToolTipText(""); checkImageIntegration.setContentAreaFilled(false); - checkImageIntegration.setName("ImageEnergyDistribution"); // NOI18N + checkImageIntegration.setName("EnergyDistribution"); // NOI18N checkAngleDistribution.setSelected(true); checkAngleDistribution.setText("Scienta Angle Distribution"); diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form index 85f9ab6f..8bf05a1c 100644 --- a/plugins/PhotonEnergy.form +++ b/plugins/PhotonEnergy.form @@ -458,7 +458,7 @@ - + diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java index 5a80c47c..1e10a232 100644 --- a/plugins/PhotonEnergy.java +++ b/plugins/PhotonEnergy.java @@ -438,7 +438,7 @@ public class PhotonEnergy extends Panel { checkImageIntegration.setText("Scienta Energy Distribution"); checkImageIntegration.setToolTipText(""); checkImageIntegration.setContentAreaFilled(false); - checkImageIntegration.setName("ImageEnergyDistribution"); // NOI18N + checkImageIntegration.setName("EnergyDistribution"); // NOI18N checkSpectrum.setSelected(true); checkSpectrum.setText("Scienta Spectrum"); diff --git a/script/HoloScan.py b/script/HoloScan.py index 4991158c..c2dcc66c 100644 --- a/script/HoloScan.py +++ b/script/HoloScan.py @@ -13,4 +13,5 @@ RELATIVE (BOOLEAN) #set_preference(Preference.ENABLED_PLOTS, [ManipulatorPhi, ManipulatorTheta, Scienta.dataMatrix, ImageIntegrator]) #set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1}) adjust_sensors() +set_adc_averaging() ascan((ManipulatorPhi, ManipulatorTheta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout) \ No newline at end of file diff --git a/script/ManipulatorScan.py b/script/ManipulatorScan.py index 13dfff6a..dfcfee66 100644 --- a/script/ManipulatorScan.py +++ b/script/ManipulatorScan.py @@ -11,4 +11,5 @@ RELATIVE (BOOLEAN) #set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1}) adjust_sensors() +set_adc_averaging() lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout) \ No newline at end of file diff --git a/script/PhotonEnergy.py b/script/PhotonEnergy.py index f7c33a65..5e817a0c 100644 --- a/script/PhotonEnergy.py +++ b/script/PhotonEnergy.py @@ -7,6 +7,7 @@ LATENCY (double) """ adjust_sensors() +set_averaging() #set_preference(Preference.PLOT_TYPES,{'ImageEnergyDistribution':1}) if len(VECTOR[0]) == 2: diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py index 0e64f920..a6f39ffd 100644 --- a/script/XPSSpectrum.py +++ b/script/XPSSpectrum.py @@ -34,6 +34,8 @@ try: Scienta.stepSize.write(vars[1]) Scienta.setIterations(1) + set_averaging() + #iterations done in script xdata = None ydata = None