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:
x03daop
2016-04-05 15:33:23 +02:00
parent b2a71d7ed8
commit b988fe084a
12 changed files with 197 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/HoloScan.form
+24 -18
View File
@@ -358,24 +358,19 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonScientaSetup" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" 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"/>
<Component id="checkCounts1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkTotalCount" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
</Group>
<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"/>
<Component id="checkCounts1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkTotalCount" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -536,6 +531,10 @@
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonStart" max="32767" attributes="0"/>
<Component id="buttonAbort" pref="203" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -549,6 +548,8 @@
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -570,6 +571,11 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkEndScan">
<Properties>
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
plugins/HoloScan.java
+25 -18
View File
@@ -95,6 +95,7 @@ public class HoloScan extends Panel {
args.put("LATENCY", (Double) 0.0);
args.put("RELATIVE", false);
args.put("ZIGZAG", checkZigzag.isSelected());
args.put("ENDSCAN", checkEndScan.isSelected());
runAsync("HoloScan", args);
}
@@ -148,6 +149,7 @@ public class HoloScan extends Panel {
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
checkEndScan = new javax.swing.JCheckBox();
panelPhi.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioners"));
panelPhi.setPreferredSize(new java.awt.Dimension(239, 538));
@@ -391,22 +393,19 @@ public class HoloScan extends Panel {
.addContainerGap()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(panelSensorsLayout.createSequentialGroup()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkImage)
.addComponent(checkImageIntegration)
.addComponent(checkSpectrum)
.addComponent(checkCounts1)
.addComponent(checkTotalCount)
.addComponent(checkCounts2)
.addComponent(checkCounts3)
.addComponent(checkCounts4)
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkAngleDistribution))
.addGap(0, 0, 0)))
.addComponent(checkImage)
.addComponent(checkImageIntegration)
.addComponent(checkSpectrum)
.addComponent(checkCounts1)
.addComponent(checkTotalCount)
.addComponent(checkCounts2)
.addComponent(checkCounts3)
.addComponent(checkCounts4)
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkAngleDistribution))
.addContainerGap())
);
panelSensorsLayout.setVerticalGroup(
@@ -460,6 +459,8 @@ public class HoloScan extends Panel {
}
});
checkEndScan.setText("Turn off beam at end");
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout);
jPanel3Layout.setHorizontalGroup(
@@ -468,7 +469,10 @@ public class HoloScan extends Panel {
.addContainerGap()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 203, Short.MAX_VALUE))
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 203, Short.MAX_VALUE)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(checkEndScan)
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
jPanel3Layout.setVerticalGroup(
@@ -478,7 +482,9 @@ public class HoloScan extends Panel {
.addComponent(buttonStart)
.addGap(18, 18, 18)
.addComponent(buttonAbort)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkEndScan)
.addContainerGap())
);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -553,6 +559,7 @@ public class HoloScan extends Panel {
private javax.swing.JCheckBox checkCur2;
private javax.swing.JCheckBox checkCur3;
private javax.swing.JCheckBox checkCurrent;
private javax.swing.JCheckBox checkEndScan;
private javax.swing.JCheckBox checkImage;
private javax.swing.JCheckBox checkImageIntegration;
private javax.swing.JCheckBox checkSpectrum;
plugins/ManipulatorScan.form
+24 -18
View File
@@ -346,24 +346,19 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonScientaSetup" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" 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"/>
<Component id="checkCounts1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkTotalCount" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
</Group>
<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"/>
<Component id="checkCounts1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkTotalCount" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -520,6 +515,10 @@
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonStart" max="32767" attributes="0"/>
<Component id="buttonAbort" pref="212" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -533,6 +532,8 @@
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -554,6 +555,11 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkEndScan">
<Properties>
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
plugins/ManipulatorScan.java
+25 -18
View File
@@ -84,6 +84,7 @@ public class ManipulatorScan extends Panel {
}
args.put("LATENCY", (Double) spinnerLatency.getValue());
args.put("RELATIVE", radioRelative.isSelected());
args.put("ENDSCAN", checkEndScan.isSelected());
runAsync("ManipulatorScan", args);
@@ -168,6 +169,7 @@ public class ManipulatorScan extends Panel {
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
checkEndScan = new javax.swing.JCheckBox();
panelPositioner.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioner"));
@@ -405,22 +407,19 @@ public class ManipulatorScan extends Panel {
.addContainerGap()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(panelSensorsLayout.createSequentialGroup()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkImage)
.addComponent(checkImageIntegration)
.addComponent(checkSpectrum)
.addComponent(checkCounts1)
.addComponent(checkTotalCount)
.addComponent(checkCounts2)
.addComponent(checkCounts3)
.addComponent(checkCounts4)
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkAngleDistribution))
.addGap(0, 0, 0)))
.addComponent(checkImage)
.addComponent(checkImageIntegration)
.addComponent(checkSpectrum)
.addComponent(checkCounts1)
.addComponent(checkTotalCount)
.addComponent(checkCounts2)
.addComponent(checkCounts3)
.addComponent(checkCounts4)
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkAngleDistribution))
.addContainerGap())
);
panelSensorsLayout.setVerticalGroup(
@@ -473,6 +472,8 @@ public class ManipulatorScan extends Panel {
}
});
checkEndScan.setText("Turn off beam at end");
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout);
jPanel3Layout.setHorizontalGroup(
@@ -481,7 +482,10 @@ public class ManipulatorScan extends Panel {
.addContainerGap()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE))
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(checkEndScan)
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
jPanel3Layout.setVerticalGroup(
@@ -491,7 +495,9 @@ public class ManipulatorScan extends Panel {
.addComponent(buttonStart)
.addGap(18, 18, 18)
.addComponent(buttonAbort)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkEndScan)
.addContainerGap())
);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -584,6 +590,7 @@ public class ManipulatorScan extends Panel {
private javax.swing.JCheckBox checkCur2;
private javax.swing.JCheckBox checkCur3;
private javax.swing.JCheckBox checkCurrent;
private javax.swing.JCheckBox checkEndScan;
private javax.swing.JCheckBox checkImage;
private javax.swing.JCheckBox checkImageIntegration;
private javax.swing.JCheckBox checkSpectrum;
plugins/PhotonEnergy.form
+24 -18
View File
@@ -357,24 +357,19 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonScientaSetup" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" 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"/>
<Component id="checkCounts1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkTotalCount" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
</Group>
<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"/>
<Component id="checkCounts1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkTotalCount" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -532,6 +527,10 @@
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonStart" max="32767" attributes="0"/>
<Component id="buttonAbort" pref="241" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -545,6 +544,8 @@
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -566,6 +567,11 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkEndScan">
<Properties>
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
plugins/PhotonEnergy.java
+27 -19
View File
@@ -164,7 +164,9 @@ public class PhotonEnergy extends Panel {
args.put("MODE", radioSwept.isSelected() ? "swept" :"fixed");
args.put("TYPE", radioCis.isSelected() ? "CIS" :"CFS");
args.put("STEP", (Double) spinnerStep.getValue());
runAsync("PhotonEnergy", args);
args.put("ENDSCAN", checkEndScan.isSelected());
runAsync("PhotonEnergy", args);
running = true;
}
@@ -213,6 +215,7 @@ public class PhotonEnergy extends Panel {
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
checkEndScan = new javax.swing.JCheckBox();
panelPositioner.setBorder(javax.swing.BorderFactory.createTitledBorder("Acquisition"));
@@ -479,22 +482,19 @@ public class PhotonEnergy extends Panel {
.addContainerGap()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(panelSensorsLayout.createSequentialGroup()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkImage)
.addComponent(checkImageIntegration)
.addComponent(checkSpectrum)
.addComponent(checkCounts1)
.addComponent(checkTotalCount)
.addComponent(checkCounts2)
.addComponent(checkCounts3)
.addComponent(checkCounts4)
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkAngleDistribution))
.addGap(0, 0, 0)))
.addComponent(checkImage)
.addComponent(checkImageIntegration)
.addComponent(checkSpectrum)
.addComponent(checkCounts1)
.addComponent(checkTotalCount)
.addComponent(checkCounts2)
.addComponent(checkCounts3)
.addComponent(checkCounts4)
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkAngleDistribution))
.addContainerGap())
);
panelSensorsLayout.setVerticalGroup(
@@ -547,6 +547,8 @@ public class PhotonEnergy extends Panel {
}
});
checkEndScan.setText("Turn off beam at end");
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout);
jPanel3Layout.setHorizontalGroup(
@@ -555,7 +557,10 @@ public class PhotonEnergy extends Panel {
.addContainerGap()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE))
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(checkEndScan)
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
jPanel3Layout.setVerticalGroup(
@@ -565,7 +570,9 @@ public class PhotonEnergy extends Panel {
.addComponent(buttonStart)
.addGap(18, 18, 18)
.addComponent(buttonAbort)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkEndScan)
.addContainerGap())
);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -645,6 +652,7 @@ public class PhotonEnergy extends Panel {
private javax.swing.JCheckBox checkCur2;
private javax.swing.JCheckBox checkCur3;
private javax.swing.JCheckBox checkCurrent;
private javax.swing.JCheckBox checkEndScan;
private javax.swing.JCheckBox checkImage;
private javax.swing.JCheckBox checkImageIntegration;
private javax.swing.JCheckBox checkSpectrum;
plugins/XPSSpectrum.form
+12 -3
View File
@@ -254,7 +254,8 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="342" pref="351" max="32767" attributes="0"/>
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="btLoad" linkSize="1" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="btSave" linkSize="1" min="-2" max="-2" attributes="0"/>
@@ -264,7 +265,7 @@
<Component id="buttonInitialScan" linkSize="1" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonDetailedScan" linkSize="1" max="32767" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="117" max="32767" attributes="0"/>
<Component id="buttonSkip" linkSize="1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="buttonAbort" linkSize="1" min="-2" max="-2" attributes="0"/>
@@ -289,7 +290,10 @@
<Component id="rangeSelectionPanel" pref="168" max="32767" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="btLoad" alignment="1" min="-2" max="-2" attributes="0"/>
<Group type="103" alignment="1" groupAlignment="3" attributes="0">
<Component id="btLoad" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="checkEndScan" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="btSave" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -351,6 +355,11 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonSkipActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkEndScan">
<Properties>
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
plugins/XPSSpectrum.java
+11 -3
View File
@@ -191,6 +191,7 @@ public class XPSSpectrum extends Panel {
HashMap<String, Object> args = new HashMap<>();
args.put("ranges", scanRanges);
args.put("pass_energy", Integer.valueOf(comboPass.getSelectedItem().toString()));
args.put("ENDSCAN", checkEndScan.isSelected());
currentScanIndex = -1;
runAsync("XPSSpectrum", args);
@@ -233,6 +234,7 @@ public class XPSSpectrum extends Panel {
;
buttonAbort = new javax.swing.JButton();
buttonSkip = new javax.swing.JButton();
checkEndScan = new javax.swing.JCheckBox();
jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Arguments"));
@@ -409,6 +411,8 @@ public class XPSSpectrum extends Panel {
}
});
checkEndScan.setText("Turn off beam at end");
javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
@@ -417,7 +421,8 @@ public class XPSSpectrum extends Panel {
.addContainerGap()
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addGap(342, 351, Short.MAX_VALUE)
.addComponent(checkEndScan)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(btLoad)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(btSave))
@@ -426,7 +431,7 @@ public class XPSSpectrum extends Panel {
.addComponent(buttonInitialScan)
.addGap(18, 18, 18)
.addComponent(buttonDetailedScan, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 117, Short.MAX_VALUE)
.addComponent(buttonSkip)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(buttonAbort))
@@ -449,7 +454,9 @@ public class XPSSpectrum extends Panel {
.addComponent(rangeSelectionPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(btLoad, javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(btLoad)
.addComponent(checkEndScan))
.addComponent(btSave, javax.swing.GroupLayout.Alignment.TRAILING))
.addContainerGap())
);
@@ -597,6 +604,7 @@ public class XPSSpectrum extends Panel {
private javax.swing.JButton buttonInitialScan;
private javax.swing.JButton buttonScientaSetup;
private javax.swing.JButton buttonSkip;
private javax.swing.JCheckBox checkEndScan;
private javax.swing.JComboBox comboPass;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel11;
script/HoloScan.py
+6 -1
View File
@@ -16,4 +16,9 @@ ZIGZAG (BOOLEAN)
adjust_sensors()
set_adc_averaging()
set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
ascan((ManipulatorPhi, ManipulatorTheta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, zigzag = ZIGZAG, before_read=trig_scienta, after_read = after_readout)
try:tryy:
ascan((ManipulatorPhi, ManipulatorTheta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, zigzag = ZIGZAG, before_read=trig_scienta, after_read = after_readout)
finally:
if ENDSCAN:
after_scan()
script/ManipulatorScan.py
+7 -1
View File
@@ -13,4 +13,10 @@ RELATIVE (BOOLEAN)
adjust_sensors()
set_adc_averaging()
set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout)
try:
lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout)
finally:
if ENDSCAN:
after_scan()
script/PhotonEnergy.py
+6 -4
View File
@@ -19,12 +19,14 @@ set_adc_averaging()
if len(VECTOR[0]) == 2:
#FIXED
writables = (Eph, Scienta.centerEnergy)
Scienta.centerEnergy.write(VECTOR[0][1]) #in order scaling of image based on first point
else:
#SWEPT
writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy)
Scienta.lowEnergy.write(VECTOR[0][1])
Scienta.highEnergy.write(VECTOR[0][2])
set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta, after_read = after_readout)
try:
vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta, after_read = after_readout)
finally:
if ENDSCAN:
after_scan()
script/XPSSpectrum.py
+6 -3
View File
@@ -75,8 +75,8 @@ try:
data1d = [1,2,3,4,5]
path="scan" + str(cur_range+1) + "/"
save_dataset(path + "ScientaSpectrum", ydata)
save_dataset(path + "channels", xdata)
set_attribute(path + "channels", ATTR_WRITABLE_DIMENSION, 1)
save_dataset(path + "ScientaChannels", xdata)
set_attribute(path + "ScientaChannels", ATTR_WRITABLE_DIMENSION, 1)
set_attribute(path, "Range Low", ranges[cur_range].min)
set_attribute(path, "Range High", ranges[cur_range].max)
set_attribute(path, "Step Time",vars[0])
@@ -84,7 +84,7 @@ try:
set_attribute(path, "Pass Energy",pass_energy)
set_attribute(path, "Iterations",cur_iteration+1)
set_attribute(path, "Readables", ["ScientaSpectrum",])
set_attribute(path, "Writables", ["channels",])
set_attribute(path, "Writables", ["ScientaChannels",])
create_diag_datasets(path)
append_diag_datasets(path)
@@ -96,4 +96,7 @@ finally:
Scienta.stop()
Scienta.update()
task[0].cancel(True)
if ENDSCAN:
after_scan()
set_return(to_array(ret,'o'))