diff --git a/config/variables.properties b/config/variables.properties
index 5519098d..f443f4e5 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Tue Aug 15 10:23:51 CEST 2023
+#Tue Aug 15 10:43:53 CEST 2023
LastRunDate=230815
-FileSequentialNumber=18615
-DaySequentialNumber=5
+FileSequentialNumber=18618
+DaySequentialNumber=8
diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form
index bc64b7bf..a8c31d36 100644
--- a/plugins/ManipulatorScan.form
+++ b/plugins/ManipulatorScan.form
@@ -82,7 +82,7 @@
-
+
@@ -178,7 +178,7 @@
-
+
@@ -358,7 +358,7 @@
-
+
diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java
index d83ea879..52f78a4f 100644
--- a/plugins/ManipulatorScan.java
+++ b/plugins/ManipulatorScan.java
@@ -607,7 +607,7 @@ public class ManipulatorScan extends ScriptProcessor {
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
try {
abort();
- ((Scienta) getDevice("Scienta")).stop();
+ getDevice("Scienta").stop();
} catch (Exception ex) {
showException(ex);
}
diff --git a/script/local.py b/script/local.py
index 1fc85d6c..dd8345c5 100644
--- a/script/local.py
+++ b/script/local.py
@@ -255,13 +255,13 @@ if get_device("ManipulatorCoolFlowSet"):
diag_channels_no_Scienta = list(diag_channels)
# Scienta
-#diag_channels.append(Scienta.channelBegin) #diag_channels.append(ChannelDouble("ChannelBegin", "X03DA-SCIENTA:cam1:CHANNEL_BEGIN_RBV"))
-#diag_channels.append(Scienta.channelEnd) #diag_channels.append(ChannelDouble("ChannelEnd", "X03DA-SCIENTA:cam1:CHANNEL_END_RBV"))
-#diag_channels.append(Scienta.sliceBegin) # diag_channels.append(ChannelDouble("SliceBegin", "X03DA-SCIENTA:cam1:SLICE_BEGIN_RBV"))
-#diag_channels.append(Scienta.sliceEnd) #diag_channels.append(ChannelDouble("StepTime", "X03DA-SCIENTA:cam1:SLICE_END_RBV"))
+diag_channels.append(Scienta.channelBegin) #diag_channels.append(ChannelDouble("ChannelBegin", "X03DA-SCIENTA:cam1:CHANNEL_BEGIN_RBV"))
+diag_channels.append(Scienta.channelEnd) #diag_channels.append(ChannelDouble("ChannelEnd", "X03DA-SCIENTA:cam1:CHANNEL_END_RBV"))
+diag_channels.append(Scienta.sliceBegin) # diag_channels.append(ChannelDouble("SliceBegin", "X03DA-SCIENTA:cam1:SLICE_BEGIN_RBV"))
+diag_channels.append(Scienta.sliceEnd) #diag_channels.append(ChannelDouble("StepTime", "X03DA-SCIENTA:cam1:SLICE_END_RBV"))
diag_channels.append(Scienta.numSlices) # diag_channels.append(ChannelDouble("NumSlices", "X03DA-SCIENTA:cam1:SLICES_RBV"))
#diag_channels.append(Scienta.frames) # diag_channels.append(ChannelDouble("NumFrames", "X03DA-SCIENTA:cam1:FRAMES"))
-#diag_channels.append(Scienta.numChannels) #diag_channels.append(ChannelDouble("NumChannels", "X03DA-SCIENTA:cam1:NUM_CHANNELS_RBV"))
+diag_channels.append(Scienta.numChannels) #diag_channels.append(ChannelDouble("NumChannels", "X03DA-SCIENTA:cam1:NUM_CHANNELS_RBV"))
diag_channels.append(Scienta.lowEnergy) #diag_channels.append(ChannelDouble("LowEnergy", "X03DA-SCIENTA:cam1:LOW_ENERGY_RBV"))
diag_channels.append(Scienta.centerEnergy) #diag_channels.append(ChannelDouble("CenterEnergy", "X03DA-SCIENTA:cam1:CENTRE_ENERGY_RBV"))
diag_channels.append(Scienta.highEnergy) #diag_channels.append(ChannelDouble("HighEnergy", "X03DA-SCIENTA:cam1:HIGH_ENERGY_RBV"))
@@ -391,7 +391,7 @@ def after_scan():
def set_adc_averaging(dwelltime=0.0):
if dwelltime == 0.0:
- if False: #is_scienta_sampling():
+ if is_scienta_sampling():
dwelltime = Scienta.getStepTime().read()
fixed = AcquisitionMode.read() == "Fixed"
else:
@@ -436,11 +436,12 @@ set_device_alias(Scienta.dataMatrix, "ScientaImage")
### NOT AVAILABLE IN NEW DRIVER
#set_device_alias(Scienta.spectrum, "ScientaSpectrum")
-#set_device_alias(Scienta.channelBegin, get_diag_name(Scienta.channelBegin))
-#set_device_alias(Scienta.channelEnd, get_diag_name(Scienta.channelEnd))
-#set_device_alias(Scienta.sliceBegin, get_diag_name(Scienta.sliceBegin))
-#set_device_alias(Scienta.sliceEnd, get_diag_name(Scienta.sliceEnd))
-#set_device_alias(Scienta.numChannels, get_diag_name(Scienta.numChannels))
+
+set_device_alias(Scienta.channelBegin, get_diag_name(Scienta.channelBegin))
+set_device_alias(Scienta.channelEnd, get_diag_name(Scienta.channelEnd))
+set_device_alias(Scienta.sliceBegin, get_diag_name(Scienta.sliceBegin))
+set_device_alias(Scienta.sliceEnd, get_diag_name(Scienta.sliceEnd))
+set_device_alias(Scienta.numChannels, get_diag_name(Scienta.numChannels))
set_device_alias(Scienta.numSlices, get_diag_name(Scienta.numSlices))
set_device_alias(Scienta.lowEnergy, get_diag_name(Scienta.lowEnergy))