diff --git a/config/devices.properties b/config/devices.properties
index e2f2bcec..7a6ee4aa 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -25,13 +25,19 @@ CountsR4=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats4:Total_RBV Read 3
ExcitationEnergy=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:EXCITATION_ENERGY_RBV Read
StepSize=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:STEP_SIZE_RBV Read
NumIterations=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:NumExposures_RBV Read
-PassEnergy=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:PASS_ENERGY_RBV Read
-LensMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:LENS_MODE_RBV Read
AcquisitionMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:ACQ_MODE_RBV Read
EnergyMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:ENERGY_MODE_RBV Read
+LensMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:LENS_MODE_RBV Read
DetectorMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV Read
+PassEnergy=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:PASS_ENERGY_RBV Read
ElementSet=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:ELEMENT_SET_RBV Read
-ElemeAnalyserSlitntSet=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:ANALYSER_SLIT_RBV Read
+#AnalyserSlit=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:ANALYSER_SLIT_RBV Read
+#AcquisitionModeNum=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:ACQ_MODE_RBV Read
+#EnergyModeNum=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:ENERGY_MODE_RBV Read
+#LensModeNum=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:LENS_MODE_RBV Read
+#DetectorModeNum=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV Read
+#PassEnergyNum=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:PASS_ENERGY_RBV Read
+#ElementSetNum=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:ELEMENT_SET_RBV Read
MachineBumpXOffset=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:X-SYM Read
MachineBumpXAngle=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:X-ASYM Read
MachineBumpYOffset=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:Y-SYM Read
diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form
index 6e83724f..9f5a28bb 100644
--- a/plugins/HoloScan.form
+++ b/plugins/HoloScan.form
@@ -534,19 +534,19 @@
-
+
-
+
-
+
diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java
index 33ec7d48..0d9243f0 100644
--- a/plugins/HoloScan.java
+++ b/plugins/HoloScan.java
@@ -407,13 +407,13 @@ public class HoloScan extends Panel {
checkCounts4.setText("Counts Region 4");
checkCounts4.setName("CountsR4"); // NOI18N
- checkCurrent.setText("MachineCurrent");
+ checkCurrent.setText("Machine Current");
checkCurrent.setName("MachineCurrent"); // NOI18N
- checkCur1.setText("SampleCurrent");
+ checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
- checkCur2.setText("RefCurrent");
+ checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkCur3.setText("AuxCurrent");
diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form
index 3c1a9f99..8b23e808 100644
--- a/plugins/ManipulatorScan.form
+++ b/plugins/ManipulatorScan.form
@@ -413,13 +413,13 @@
-
+
-
+
@@ -434,7 +434,7 @@
-
+
@@ -487,7 +487,7 @@
-
+
diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java
index cb0d54a7..cb3c9107 100644
--- a/plugins/ManipulatorScan.java
+++ b/plugins/ManipulatorScan.java
@@ -347,10 +347,10 @@ public class ManipulatorScan extends Panel {
}
});
- checkCur1.setText("SampleCurrent");
+ checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
- checkCur2.setText("RefCurrent");
+ checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkImage.setSelected(true);
@@ -359,7 +359,7 @@ public class ManipulatorScan extends Panel {
checkImage.setContentAreaFilled(false);
checkImage.setName("Scienta.dataMatrix"); // NOI18N
- checkCur3.setText("AuxCurrent");
+ checkCur3.setText("Aux Current");
checkCur3.setName("AuxCurrent"); // NOI18N
checkImageIntegration.setSelected(true);
@@ -388,7 +388,7 @@ public class ManipulatorScan extends Panel {
checkCounts4.setText("Counts Region 4");
checkCounts4.setName("CountsR4"); // NOI18N
- checkCurrent.setText("MachineCurrent");
+ checkCurrent.setText("Machine Current");
checkCurrent.setName("MachineCurrent"); // NOI18N
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form
index c4c850c0..878b90ce 100644
--- a/plugins/PhotonEnergy.form
+++ b/plugins/PhotonEnergy.form
@@ -424,13 +424,13 @@
-
+
-
+
@@ -445,7 +445,7 @@
-
+
@@ -498,7 +498,7 @@
-
+
diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java
index 955e61bb..3f917f48 100644
--- a/plugins/PhotonEnergy.java
+++ b/plugins/PhotonEnergy.java
@@ -416,10 +416,10 @@ public class PhotonEnergy extends Panel {
}
});
- checkCur1.setText("SampleCurrent");
+ checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
- checkCur2.setText("RefCurrent");
+ checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkImage.setSelected(true);
@@ -428,7 +428,7 @@ public class PhotonEnergy extends Panel {
checkImage.setContentAreaFilled(false);
checkImage.setName("Scienta.dataMatrix"); // NOI18N
- checkCur3.setText("AuxCurrent");
+ checkCur3.setText("Aux Current");
checkCur3.setName("AuxCurrent"); // NOI18N
checkImageIntegration.setSelected(true);
@@ -457,7 +457,7 @@ public class PhotonEnergy extends Panel {
checkCounts4.setText("Counts Region 4");
checkCounts4.setName("CountsR4"); // NOI18N
- checkCurrent.setText("MachineCurrent");
+ checkCurrent.setText("Machine Current");
checkCurrent.setName("MachineCurrent"); // NOI18N
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
diff --git a/script/HoloScan.py b/script/HoloScan.py
index 424abeab..8165c6dd 100644
--- a/script/HoloScan.py
+++ b/script/HoloScan.py
@@ -12,4 +12,4 @@ RELATIVE (BOOLEAN)
#set_preference(Preference.ENABLED_PLOTS, [ManipulatorPhi, ManipulatorTheta, Scienta.dataMatrix, ImageIntegrator])
set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
-ascan((phi, theta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, before_read=trig_scienta)
\ No newline at end of file
+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 = AfterReadout)
\ No newline at end of file
diff --git a/script/ManipulatorScan.py b/script/ManipulatorScan.py
index 0329caba..fb5666a8 100644
--- a/script/ManipulatorScan.py
+++ b/script/ManipulatorScan.py
@@ -8,11 +8,6 @@ STEPS (int or tuple)
LATENCY (double)
RELATIVE (BOOLEAN)
"""
-
-def AfterReadout(rec):
- if rec.index == 0:
- create_diag_datasets()
- append_diag_datasets()
set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = AfterReadout)
\ No newline at end of file
diff --git a/script/PhotonEnergy.py b/script/PhotonEnergy.py
index ff82a4ba..1887bb91 100644
--- a/script/PhotonEnergy.py
+++ b/script/PhotonEnergy.py
@@ -15,4 +15,4 @@ else:
#SWEPT
writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy)
-vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta)
+vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta, after_read = AfterReadout)
diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py
index 87699c2c..0e54ff4a 100644
--- a/script/XPSSpectrum.py
+++ b/script/XPSSpectrum.py
@@ -67,6 +67,8 @@ try:
set_attribute(path, "Pass Energy",pass_energy)
set_attribute(path, "Iterations",cur_iteration+1)
+ AfterReadout()
+
finally:
cur_range = 0
diff --git a/script/local.py b/script/local.py
index c3fc26ef..bb5c94d0 100644
--- a/script/local.py
+++ b/script/local.py
@@ -67,15 +67,15 @@ diag_channels.append(Scienta.highEnergy) #diag_channels.append(ChannelDo
#diag_channels.append(ChannelDouble("DetectorModeNum", "X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV"))
#diag_channels.append(ChannelDouble("PassEnergyNum", "X03DA-SCIENTA:cam1:PASS_ENERGY_RBV"))
#diag_channels.append(ChannelDouble("ElementSetNum", "X03DA-SCIENTA:cam1:ELEMENT_SET_RBV"))
+diag_channels.append(AcquisitionMode) #diag_attrs.append(ChannelString("AcquisitionMode", "X03DA-SCIENTA:cam1:ACQ_MODE_RBV"))
+diag_channels.append(EnergyMode) #diag_attrs.append(ChannelString("EnergyMode", "X03DA-SCIENTA:cam1:ENERGY_MODE_RBV"))
+diag_channels.append(LensMode) #diag_attrs.append(ChannelString("LensMode", "X03DA-SCIENTA:cam1:LENS_MODE_RBV"))
+diag_channels.append(DetectorMode) #diag_attrs.append(ChannelString("DetectorMode", "X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV"))
+diag_channels.append(PassEnergy) #diag_attrs.append(ChannelString("PassEnergy", "X03DA-SCIENTA:cam1:PASS_ENERGY_RBV"))
+diag_channels.append(ElementSet) #diag_attrs.append(ChannelString("ElementSet", "X03DA-SCIENTA:cam1:ELEMENT_SET_RBV"))
diag_channels.append(ExcitationEnergy) #diag_channels.append(ChannelDouble("ExcitationEnergy", "X03DA-SCIENTA:cam1:EXCITATION_ENERGY_RBV"))
diag_channels.append(StepSize) #diag_channels.append(ChannelDouble("StepSize", "X03DA-SCIENTA:cam1:STEP_SIZE_RBV"))
diag_channels.append(NumIterations) #diag_channels.append(ChannelDouble("NumIterations", "X03DA-SCIENTA:cam1:NumExposures_RBV"))
-diag_channels.append(PassEnergy) #diag_attrs.append(ChannelString("PassEnergy", "X03DA-SCIENTA:cam1:PASS_ENERGY_RBV"))
-diag_channels.append(LensMode) #diag_attrs.append(ChannelString("LensMode", "X03DA-SCIENTA:cam1:LENS_MODE_RBV"))
-diag_channels.append(AcquisitionMode) #diag_attrs.append(ChannelString("AcquisitionMode", "X03DA-SCIENTA:cam1:ACQ_MODE_RBV"))
-diag_channels.append(EnergyMode) #diag_attrs.append(ChannelString("EnergyMode", "X03DA-SCIENTA:cam1:ENERGY_MODE_RBV"))
-diag_channels.append(DetectorMode) #diag_attrs.append(ChannelString("DetectorMode", "X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV"))
-diag_channels.append(ElementSet) #diag_attrs.append(ChannelString("ElementSet", "X03DA-SCIENTA:cam1:ELEMENT_SET_RBV"))
diag_channels.append(ElemeAnalyserSlitntSet) #diag_attrs.append(ChannelString("ElemeAnalyserSlitntSet", "X03DA-SCIENTA:cam1:ANALYSER_SLIT_RBV"))
#Manipulator Settings
@@ -168,4 +168,12 @@ def append_diag_datasets():
x = '' if (type(f) is ch.psi.pshell.epics.ChannelString) else float('nan')
append_dataset(group+f.getName(), x)
+
+SAVE_DIAGS = True
+def AfterReadout(rec):
+ if SAVE_DIAGS:
+ if rec.index == 0:
+ create_diag_datasets()
+ append_diag_datasets()
+
\ No newline at end of file