This commit is contained in:
gac-x09la
@@ -2,17 +2,17 @@ scienta=Scienta|X09LA-SCIENTA|||true
|
||||
current=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT 6|Read||true
|
||||
keithley10=ch.psi.pshell.epics.ChannelDouble|X09LA-KEI10:READOUT|Read||true
|
||||
keithley11=ch.psi.pshell.epics.ChannelDouble|X09LA-KEI11:READOUT|Read||true
|
||||
x=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:TRX|||true
|
||||
y=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:TRY|||true
|
||||
z=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:TRZ|||true
|
||||
phi=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:PHI|||true
|
||||
theta=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:THT|||true
|
||||
tilt=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:TLT|||true
|
||||
manip=ch.psi.pshell.device.MotorGroupBase|trx try trz phi tht tlt|||true
|
||||
$x=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:TRX|||true
|
||||
$y=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:TRY|||true
|
||||
$z=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:TRZ|||true
|
||||
$phi=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:PHI|||true
|
||||
$theta=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:THT|||true
|
||||
$tilt=ch.psi.pshell.epics.Motor|X09LA-ES1-MA:TLT|||true
|
||||
manipulator=ch.psi.pshell.device.MotorGroupBase|x y z phi theta tilt|||true
|
||||
id_mode=ch.psi.pshell.epics.DiscretePositioner|X09LA-ID:MODE|||true
|
||||
id_status=ch.psi.pshell.epics.ChannelString|X09LA-ID:OFFS-MNTR|Read||true
|
||||
shutter=ch.psi.pshell.epics.DiscretePositioner|X09LA-SIS:OPEN|||true
|
||||
energy=ch.psi.pshell.epics.Positioner|X09LA-PHS:E_SP X09LA-PGM:rbkenergy|||true
|
||||
$shutter=ch.psi.pshell.epics.DiscretePositioner|X09LA-SIS:OPEN|||true
|
||||
$energy=ch.psi.pshell.epics.Positioner|X09LA-PHS:E_SP X09LA-PGM:rbkenergy|||true
|
||||
temp_cryostat=ch.psi.pshell.epics.ReadonlyProcessVariable|X09LA-PC-LAKESHORE:TEMP_RBV|Read||false
|
||||
temp_sample1=ch.psi.pshell.epics.ReadonlyProcessVariable|X09LA-PC-LAKESHORE:TEMP-B|Read||
|
||||
temp_headmech=ch.psi.pshell.epics.ReadonlyProcessVariable|X09LA-PC-LAKESHORE:TEMP-C|Read||
|
||||
@@ -27,6 +27,7 @@ tcmp=ch.psi.pshell.epics.ReadonlyProcessVariable|X09LA-ES1-TCMP:PRESSURE|Read||f
|
||||
exit_slit=ch.psi.pshell.epics.ReadonlyProcessVariable|X09LA-OP2-SL:TRY.VAL|Read||
|
||||
fe_vert_width=ch.psi.pshell.epics.ReadonlyProcessVariable|X09LA-FE-SVsize|Read||
|
||||
fe_horiz_width=ch.psi.pshell.epics.ReadonlyProcessVariable|X09LA-FE-SHsize|Read||
|
||||
master=ch.psi.pshell.device.MasterPositioner|tilt x y z|||
|
||||
image=ch.psi.pshell.imaging.CameraSource|scienta|||true
|
||||
cam1=ch.psi.pshell.imaging.MjpegSource|http://129.129.117.82/axis-cgi/mjpg/video.cgi?camera=1||-200|
|
||||
cam2=ch.psi.pshell.imaging.MjpegSource|http://129.129.117.82/axis-cgi/mjpg/video.cgi?camera=2||-200|
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#Thu Sep 02 10:51:44 CEST 2021
|
||||
LastRunDate=210902
|
||||
DaySequentialNumber=5
|
||||
FileSequentialNumber=15
|
||||
#Wed Sep 29 10:51:37 CEST 2021
|
||||
LastRunDate=210929
|
||||
DaySequentialNumber=9
|
||||
FileSequentialNumber=24
|
||||
|
||||
18
devices/master.properties
Normal file
18
devices/master.properties
Normal file
@@ -0,0 +1,18 @@
|
||||
#Wed Sep 29 10:50:35 CEST 2021
|
||||
slave2Positions=-0.3|0.1|0.6
|
||||
offset=0.0
|
||||
maxValue=100.0
|
||||
slave5Positions=
|
||||
rotation=false
|
||||
precision=4
|
||||
scale=1.0
|
||||
slave4Positions=
|
||||
resolution=0.1
|
||||
mode=LINEAR
|
||||
minValue=-100.0
|
||||
unit=deg
|
||||
slave1Positions=0.2|1.0|1.3
|
||||
slave3Positions=-0.5|0.0|0.7
|
||||
sign_bit=0
|
||||
masterPositions=-1.0|0.0|1.0
|
||||
slave6Positions=
|
||||
@@ -18,43 +18,30 @@
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="jPanel2" alignment="1" max="32767" attributes="0"/>
|
||||
<Group type="102" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" attributes="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<Component id="buttonScienta" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="textFileId" min="-2" pref="67" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="buttonResetId" linkSize="1" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
|
||||
<Component id="buttonStart" linkSize="1" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Component id="buttonAbort" linkSize="1" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<Component id="buttonScienta" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="buttonStart" linkSize="1" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Component id="buttonAbort" linkSize="1" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" max="-2" attributes="0"/>
|
||||
<Component id="textFile" max="32767" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="buttonOpen" linkSize="2" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" max="-2" attributes="0"/>
|
||||
<Component id="buttonSave" linkSize="2" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" max="-2" attributes="0"/>
|
||||
<Component id="buttonAddToQueue" linkSize="1" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" max="-2" attributes="0"/>
|
||||
<Component id="buttonClear" linkSize="2" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
<EmptySpace min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -75,12 +62,6 @@
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="3" attributes="0">
|
||||
<Component id="buttonScienta" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="buttonResetId" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="textFileId" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="3" attributes="0">
|
||||
<Component id="buttonStart" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="buttonAbort" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
@@ -98,25 +79,6 @@
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaActionPerformed"/>
|
||||
</Events>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="jLabel2">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="File ID:"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JTextField" name="textFileId">
|
||||
<Properties>
|
||||
<Property name="editable" type="boolean" value="false"/>
|
||||
<Property name="horizontalAlignment" type="int" value="0"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JButton" name="buttonResetId">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="Reset"/>
|
||||
</Properties>
|
||||
<Events>
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonResetIdActionPerformed"/>
|
||||
</Events>
|
||||
</Component>
|
||||
<Component class="javax.swing.JButton" name="buttonStart">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="Start"/>
|
||||
@@ -781,22 +743,22 @@
|
||||
<Layout>
|
||||
<DimensionLayout dim="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace pref="242" max="32767" attributes="0"/>
|
||||
<Group type="102" attributes="0">
|
||||
<EmptySpace pref="294" max="32767" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="jLabel22" linkSize="9" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="jLabel8" linkSize="9" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="jLabel4" linkSize="9" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="jLabel1" linkSize="9" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="spinnerPasses" linkSize="3" min="-2" max="-2" attributes="0"/>
|
||||
<Group type="103" alignment="1" groupAlignment="0" attributes="0">
|
||||
<Component id="checkZigzag" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="spinnerLatency" linkSize="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<Component id="checkCompression" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkZigzag" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="spinnerLatency" linkSize="3" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="spinnerPasses" linkSize="3" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace pref="268" max="32767" attributes="0"/>
|
||||
<EmptySpace pref="319" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -804,6 +766,11 @@
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="3" attributes="0">
|
||||
<Component id="checkCompression" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="jLabel22" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="3" attributes="0">
|
||||
<Component id="checkZigzag" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="jLabel8" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
@@ -818,7 +785,7 @@
|
||||
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="spinnerPasses" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace pref="77" max="32767" attributes="0"/>
|
||||
<EmptySpace pref="62" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -828,6 +795,7 @@
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="jLabel4">
|
||||
<Properties>
|
||||
<Property name="horizontalAlignment" type="int" value="11"/>
|
||||
<Property name="text" type="java.lang.String" value="Settling Time:"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
@@ -840,6 +808,7 @@
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="jLabel1">
|
||||
<Properties>
|
||||
<Property name="horizontalAlignment" type="int" value="11"/>
|
||||
<Property name="text" type="java.lang.String" value="Passes:"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
@@ -852,9 +821,18 @@
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="jLabel8">
|
||||
<Properties>
|
||||
<Property name="horizontalAlignment" type="int" value="11"/>
|
||||
<Property name="text" type="java.lang.String" value="Zigzag:"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="jLabel22">
|
||||
<Properties>
|
||||
<Property name="horizontalAlignment" type="int" value="11"/>
|
||||
<Property name="text" type="java.lang.String" value="Compression:"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JCheckBox" name="checkCompression">
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
<Container class="javax.swing.JPanel" name="jPanel1">
|
||||
@@ -1167,4 +1145,3 @@
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Form>
|
||||
|
||||
|
||||
@@ -177,9 +177,8 @@ public class SIStem extends PanelProcessor {
|
||||
//Overridable callbacks
|
||||
@Override
|
||||
public void onInitialize(int runCount) {
|
||||
if ((modelFixed.getRowCount() == 0) && (modelScanned.getRowCount() == 0) && (modelInactive.getRowCount() == 0)) {
|
||||
initInactive();
|
||||
|
||||
if (runCount==0) {
|
||||
clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -294,7 +293,7 @@ public class SIStem extends PanelProcessor {
|
||||
config.put("SETTLING_TIME", spinnerLatency.getValue());
|
||||
config.put("PASSES", spinnerPasses.getValue());
|
||||
config.put("ZIGZAG", checkZigzag.isSelected());
|
||||
config.put("COMPRESSION", true);
|
||||
config.put("COMPRESSION", checkCompression.isSelected());
|
||||
|
||||
String json = JsonSerializer.encode(config, true);
|
||||
Files.write(currentFile.toPath(), json.getBytes());
|
||||
@@ -357,6 +356,7 @@ public class SIStem extends PanelProcessor {
|
||||
spinnerLatency.setValue(config.get("SETTLING_TIME"));
|
||||
spinnerPasses.setValue(config.get("PASSES"));
|
||||
checkZigzag.setSelected((Boolean) config.get("ZIGZAG"));
|
||||
checkCompression.setSelected((Boolean) config.get("COMPRESSION"));
|
||||
}
|
||||
updateControls();
|
||||
}
|
||||
@@ -386,8 +386,13 @@ public class SIStem extends PanelProcessor {
|
||||
setDevices(textSensors, Arr.toList(DEFAULT_SENSORS));
|
||||
setDevices(textSnapshots, Arr.toList(DEFAULT_SNAPS));
|
||||
setDevices(textDiagnostics, Arr.toList(DEFAULT_DIAGS));
|
||||
setDevices(textMonitors, Arr.toList(DEFAULT_MONITORS));
|
||||
setDevices(textMonitors, Arr.toList(DEFAULT_MONITORS));
|
||||
initInactive();
|
||||
|
||||
spinnerLatency.setValue(0.0);
|
||||
spinnerPasses.setValue(1);
|
||||
checkZigzag.setSelected(false);
|
||||
checkCompression.setSelected(true);
|
||||
updateControls();
|
||||
}
|
||||
|
||||
@@ -439,12 +444,6 @@ public class SIStem extends PanelProcessor {
|
||||
|
||||
void updateControls() {
|
||||
State state = getState();
|
||||
try {
|
||||
textFileId.setText(String.valueOf(getContext().getFileSequentialNumber()));
|
||||
} catch (Exception ex) {
|
||||
textFileId.setText("");
|
||||
}
|
||||
|
||||
String fileName = getFileName();
|
||||
if (fileName == null) {
|
||||
textFile.setText("");
|
||||
@@ -529,9 +528,6 @@ public class SIStem extends PanelProcessor {
|
||||
private void initComponents() {
|
||||
|
||||
buttonScienta = new javax.swing.JButton();
|
||||
jLabel2 = new javax.swing.JLabel();
|
||||
textFileId = new javax.swing.JTextField();
|
||||
buttonResetId = new javax.swing.JButton();
|
||||
buttonStart = new javax.swing.JButton();
|
||||
buttonAbort = new javax.swing.JButton();
|
||||
jPanel2 = new javax.swing.JPanel();
|
||||
@@ -587,6 +583,8 @@ public class SIStem extends PanelProcessor {
|
||||
jLabel1 = new javax.swing.JLabel();
|
||||
spinnerPasses = new javax.swing.JSpinner();
|
||||
jLabel8 = new javax.swing.JLabel();
|
||||
jLabel22 = new javax.swing.JLabel();
|
||||
checkCompression = new javax.swing.JCheckBox();
|
||||
jPanel1 = new javax.swing.JPanel();
|
||||
jScrollPane1 = new javax.swing.JScrollPane();
|
||||
tableInactive = new javax.swing.JTable();
|
||||
@@ -617,18 +615,6 @@ public class SIStem extends PanelProcessor {
|
||||
}
|
||||
});
|
||||
|
||||
jLabel2.setText("File ID:");
|
||||
|
||||
textFileId.setEditable(false);
|
||||
textFileId.setHorizontalAlignment(javax.swing.JTextField.CENTER);
|
||||
|
||||
buttonResetId.setText("Reset");
|
||||
buttonResetId.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
buttonResetIdActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
buttonStart.setText("Start");
|
||||
buttonStart.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
@@ -1012,43 +998,54 @@ public class SIStem extends PanelProcessor {
|
||||
|
||||
jTabbedPane1.addTab("Detector", jPanel5);
|
||||
|
||||
jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel4.setText("Settling Time:");
|
||||
|
||||
spinnerLatency.setModel(new javax.swing.SpinnerNumberModel(0.0d, 0.0d, 1000.0d, 1.0d));
|
||||
|
||||
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel1.setText("Passes:");
|
||||
|
||||
spinnerPasses.setModel(new javax.swing.SpinnerNumberModel(1, 1, 1000, 1));
|
||||
|
||||
jLabel8.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel8.setText("Zigzag:");
|
||||
|
||||
jLabel22.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
|
||||
jLabel22.setText("Compression:");
|
||||
|
||||
javax.swing.GroupLayout jPanel11Layout = new javax.swing.GroupLayout(jPanel11);
|
||||
jPanel11.setLayout(jPanel11Layout);
|
||||
jPanel11Layout.setHorizontalGroup(
|
||||
jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel11Layout.createSequentialGroup()
|
||||
.addContainerGap(242, Short.MAX_VALUE)
|
||||
.addContainerGap(294, Short.MAX_VALUE)
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(jLabel22)
|
||||
.addComponent(jLabel8)
|
||||
.addComponent(jLabel4)
|
||||
.addComponent(jLabel1))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(spinnerPasses, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(checkZigzag)
|
||||
.addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||
.addContainerGap(268, Short.MAX_VALUE))
|
||||
.addComponent(checkCompression)
|
||||
.addComponent(checkZigzag)
|
||||
.addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(spinnerPasses, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(319, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jPanel11Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerLatency, spinnerPasses});
|
||||
|
||||
jPanel11Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel1, jLabel4, jLabel8});
|
||||
jPanel11Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel1, jLabel22, jLabel4, jLabel8});
|
||||
|
||||
jPanel11Layout.setVerticalGroup(
|
||||
jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel11Layout.createSequentialGroup()
|
||||
.addGap(20, 20, 20)
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(checkCompression)
|
||||
.addComponent(jLabel22))
|
||||
.addGap(18, 18, 18)
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(checkZigzag)
|
||||
.addComponent(jLabel8))
|
||||
@@ -1060,7 +1057,7 @@ public class SIStem extends PanelProcessor {
|
||||
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel1)
|
||||
.addComponent(spinnerPasses, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(77, Short.MAX_VALUE))
|
||||
.addContainerGap(62, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jTabbedPane1.addTab("Scan", jPanel11);
|
||||
@@ -1290,37 +1287,27 @@ public class SIStem extends PanelProcessor {
|
||||
.addContainerGap()
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(buttonScienta)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jLabel2)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textFileId, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonResetId))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addGap(0, 0, Short.MAX_VALUE)
|
||||
.addComponent(buttonStart)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(buttonAbort)
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
.addComponent(buttonScienta)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonStart)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(buttonAbort))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addComponent(jLabel3)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textFile)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(buttonOpen)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonSave)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonAddToQueue)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonClear))))
|
||||
.addComponent(buttonClear)))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonAbort, buttonAddToQueue, buttonResetId, buttonStart});
|
||||
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonAbort, buttonAddToQueue, buttonStart});
|
||||
|
||||
layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonClear, buttonOpen, buttonSave});
|
||||
|
||||
@@ -1340,11 +1327,6 @@ public class SIStem extends PanelProcessor {
|
||||
.addGap(18, 18, 18)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(buttonScienta)
|
||||
.addComponent(buttonResetId)
|
||||
.addComponent(jLabel2)
|
||||
.addComponent(textFileId, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(18, 18, 18)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(buttonStart)
|
||||
.addComponent(buttonAbort))
|
||||
.addContainerGap())
|
||||
@@ -1359,15 +1341,6 @@ public class SIStem extends PanelProcessor {
|
||||
}
|
||||
}//GEN-LAST:event_buttonScientaActionPerformed
|
||||
|
||||
private void buttonResetIdActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonResetIdActionPerformed
|
||||
try {
|
||||
this.getContext().setFileSequentialNumber(0);
|
||||
updateControls();
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
}//GEN-LAST:event_buttonResetIdActionPerformed
|
||||
|
||||
private void buttonStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStartActionPerformed
|
||||
try {
|
||||
execute();
|
||||
@@ -1449,10 +1422,10 @@ public class SIStem extends PanelProcessor {
|
||||
private javax.swing.JButton buttonAddToQueue;
|
||||
private javax.swing.JButton buttonClear;
|
||||
private javax.swing.JButton buttonOpen;
|
||||
private javax.swing.JButton buttonResetId;
|
||||
private javax.swing.JButton buttonSave;
|
||||
private javax.swing.JButton buttonScienta;
|
||||
private javax.swing.JButton buttonStart;
|
||||
private javax.swing.JCheckBox checkCompression;
|
||||
private javax.swing.JCheckBox checkZigzag;
|
||||
private javax.swing.JComboBox comboAcquisition;
|
||||
private javax.swing.JComboBox comboDetMode;
|
||||
@@ -1470,12 +1443,8 @@ public class SIStem extends PanelProcessor {
|
||||
private javax.swing.JLabel jLabel17;
|
||||
private javax.swing.JLabel jLabel18;
|
||||
private javax.swing.JLabel jLabel19;
|
||||
private javax.swing.JLabel jLabel2;
|
||||
private javax.swing.JLabel jLabel20;
|
||||
private javax.swing.JLabel jLabel21;
|
||||
private javax.swing.JLabel jLabel22;
|
||||
private javax.swing.JLabel jLabel23;
|
||||
private javax.swing.JLabel jLabel24;
|
||||
private javax.swing.JLabel jLabel25;
|
||||
private javax.swing.JLabel jLabel26;
|
||||
private javax.swing.JLabel jLabel27;
|
||||
@@ -1495,7 +1464,6 @@ public class SIStem extends PanelProcessor {
|
||||
private javax.swing.JPanel jPanel5;
|
||||
private javax.swing.JPanel jPanel6;
|
||||
private javax.swing.JPanel jPanel7;
|
||||
private javax.swing.JPanel jPanel8;
|
||||
private javax.swing.JPanel jPanel9;
|
||||
private javax.swing.JScrollPane jScrollPane1;
|
||||
private javax.swing.JScrollPane jScrollPane2;
|
||||
@@ -1513,24 +1481,19 @@ public class SIStem extends PanelProcessor {
|
||||
private javax.swing.JTextField textCenterEnergy;
|
||||
private javax.swing.JTextField textCenterThetaX;
|
||||
private javax.swing.JTextField textCenterThetaY;
|
||||
private javax.swing.JTextField textCenterThetaY1;
|
||||
private javax.swing.JTextField textChannels;
|
||||
private javax.swing.JTextArea textDiagnostics;
|
||||
private javax.swing.JTextField textFile;
|
||||
private javax.swing.JTextField textFileId;
|
||||
private javax.swing.JTextField textHighEnergy;
|
||||
private javax.swing.JTextField textHighThetaY;
|
||||
private javax.swing.JTextField textHighThetaY1;
|
||||
private javax.swing.JTextField textLowEnergy;
|
||||
private javax.swing.JTextField textLowThetaY;
|
||||
private javax.swing.JTextField textLowThetaY1;
|
||||
private javax.swing.JTextArea textMonitors;
|
||||
private javax.swing.JTextArea textSensors;
|
||||
private javax.swing.JTextField textSlices;
|
||||
private javax.swing.JTextArea textSnapshots;
|
||||
private javax.swing.JTextField textStepEnergy;
|
||||
private javax.swing.JTextField textStepThetaY;
|
||||
private javax.swing.JTextField textStepThetaY1;
|
||||
private javax.swing.JTextField textXChannelMax;
|
||||
private javax.swing.JTextField textXChannelMin;
|
||||
private javax.swing.JTextField textYChannelMax;
|
||||
|
||||
25
script/scans/scan1.json
Normal file
25
script/scans/scan1.json
Normal file
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"PASSES" : 1,
|
||||
"STOP" : [ 1.0 ],
|
||||
"DIAGS" : [ "phi", "theta", "tilt", "x", "y", "z" ],
|
||||
"PRE_ACTIONS" : {
|
||||
"scienta.detectorModeDev" : "ADC",
|
||||
"scienta.acquisitionModeDev" : "Fixed",
|
||||
"scienta.slices" : 512,
|
||||
"scienta.lensModeDev" : "Transmission",
|
||||
"y" : 0.1,
|
||||
"scienta.channels" : 512,
|
||||
"scienta.passEnergyDev" : "20",
|
||||
"scienta.energyModeDev" : "Kinetic"
|
||||
},
|
||||
"COMPRESSION" : true,
|
||||
"SENSORS" : [ "scienta.dataMatrix", "keithley11" ],
|
||||
"ZIGZAG" : true,
|
||||
"SETTLING_TIME" : 0.0,
|
||||
"MONITORS" : [ "current" ],
|
||||
"START" : [ 0.0 ],
|
||||
"RANGE" : [ null, null, null, null ],
|
||||
"POSITIONERS" : [ "x" ],
|
||||
"STEPS" : [ 9 ],
|
||||
"SNAPS" : [ "acmi", "energy", "exit_slit", "fe_horiz_width", "fe_vert_width", "helium_valve", "master", "tcmp", "temp_boot1", "temp_boot2", "temp_cryopump", "temp_cryostat", "temp_headmech", "temp_sample1", "temp_sample2", "temp_shield" ]
|
||||
}
|
||||
25
script/scans/scan2.json
Normal file
25
script/scans/scan2.json
Normal file
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"PASSES" : 1,
|
||||
"STOP" : [ 1.0, 1.0 ],
|
||||
"DIAGS" : [ "phi", "theta", "tilt", "x", "y", "z" ],
|
||||
"PRE_ACTIONS" : {
|
||||
"scienta.detectorModeDev" : "ADC",
|
||||
"scienta.acquisitionModeDev" : "Fixed",
|
||||
"scienta.slices" : 512,
|
||||
"scienta.lensModeDev" : "Transmission",
|
||||
"y" : 0.1,
|
||||
"scienta.channels" : 512,
|
||||
"scienta.passEnergyDev" : "20",
|
||||
"scienta.energyModeDev" : "Kinetic"
|
||||
},
|
||||
"COMPRESSION" : true,
|
||||
"SENSORS" : [ "scienta.dataMatrix", "keithley11" ],
|
||||
"ZIGZAG" : true,
|
||||
"SETTLING_TIME" : 0.0,
|
||||
"MONITORS" : [ "current" ],
|
||||
"START" : [ 0.0, 0.0 ],
|
||||
"RANGE" : [ null, null, null, null ],
|
||||
"POSITIONERS" : [ "x", "z" ],
|
||||
"STEPS" : [ 3, 4 ],
|
||||
"SNAPS" : [ "acmi", "energy", "exit_slit", "fe_horiz_width", "fe_vert_width", "helium_valve", "master", "tcmp", "temp_boot1", "temp_boot2", "temp_cryopump", "temp_cryostat", "temp_headmech", "temp_sample1", "temp_sample2", "temp_shield" ]
|
||||
}
|
||||
24
script/scans/scan3.json
Normal file
24
script/scans/scan3.json
Normal file
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"PASSES" : 1,
|
||||
"STOP" : [ 1.0 ],
|
||||
"DIAGS" : [ "phi", "theta", "tilt", "x", "y", "z" ],
|
||||
"PRE_ACTIONS" : {
|
||||
"scienta.detectorModeDev" : "ADC",
|
||||
"scienta.acquisitionModeDev" : "Fixed",
|
||||
"scienta.slices" : 512,
|
||||
"scienta.lensModeDev" : "Transmission",
|
||||
"scienta.channels" : 512,
|
||||
"scienta.passEnergyDev" : "20",
|
||||
"scienta.energyModeDev" : "Kinetic"
|
||||
},
|
||||
"COMPRESSION" : true,
|
||||
"SENSORS" : [ "scienta.dataMatrix", "keithley11" ],
|
||||
"ZIGZAG" : true,
|
||||
"SETTLING_TIME" : 0.0,
|
||||
"MONITORS" : [ "current" ],
|
||||
"START" : [ -1.0 ],
|
||||
"RANGE" : [ null, null, null, null ],
|
||||
"POSITIONERS" : [ "master" ],
|
||||
"STEPS" : [ 11 ],
|
||||
"SNAPS" : [ "acmi", "energy", "exit_slit", "fe_horiz_width", "fe_vert_width", "helium_valve", "master", "tcmp", "temp_boot1", "temp_boot2", "temp_cryopump", "temp_cryostat", "temp_headmech", "temp_sample1", "temp_sample2", "temp_shield" ]
|
||||
}
|
||||
Reference in New Issue
Block a user