pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x03da
2023-08-15 11:19:04 +02:00
parent 4e314b2736
commit 425eb19873
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/variables.properties
View File

@@ -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

6
plugins/ManipulatorScan.form
View File

@@ -82,7 +82,7 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="49" max="32767" attributes="0"/>
<Component id="spinnerLatency" linkSize="4" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
@@ -178,7 +178,7 @@
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="spinnerLatency" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="81" max="32767" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="checkFlyScan" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
</Group>
@@ -358,7 +358,7 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonScientaSetup" pref="212" max="32767" attributes="0"/>
<Component id="buttonScientaSetup" pref="220" max="32767" attributes="0"/>
<Component id="checkImage" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkImageIntegration" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkSpectrum" alignment="0" min="-2" max="-2" attributes="0"/>

2
plugins/ManipulatorScan.java
View File

@@ -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);
}

23
script/local.py
View File

@@ -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))