Scienta test mode

This commit is contained in:
gac-x09la
2022-03-11 14:58:04 +01:00
parent a9b0bd10cf
commit 3ed066e4cb
3 changed files with 483 additions and 1224 deletions

View File

@@ -1,25 +1,14 @@
import ch.psi.jcae.ChannelException;
import ch.psi.pshell.device.AccessType;
import ch.psi.pshell.device.ArrayCalibration;
import ch.psi.pshell.device.CameraImageDescriptor;
import ch.psi.pshell.device.MatrixCalibration;
import ch.psi.pshell.device.Device;
import ch.psi.pshell.device.DeviceAdapter;
import ch.psi.pshell.device.DeviceListener;
import ch.psi.pshell.device.Readable.ReadableCalibratedArray;
import ch.psi.pshell.device.Writable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import ch.psi.pshell.epics.*;
import static ch.psi.pshell.epics.Scienta.PASS_ENERGY_VALUES;
import ch.psi.utils.Arr;
import ch.psi.utils.Convert;
import ch.psi.utils.State;
import java.util.concurrent.ExecutionException;
import java.util.logging.Logger;
/**
* Implementation of Scienta spectrometer analyser.
@@ -31,8 +20,9 @@ public class Scienta extends AreaDetector {
final ControlledVariable lowEnergy, centerEnergy, highEnergy, stepSize, lowThetaY, centerThetaY, highThetaY, stepSizeThetaY, centerThetaX;
final ControlledVariable excitationEnergy;
final GenericArray data;
final ChannelInteger totalSteps, currentStep, exposuresComplete, acquisitionMode;
final ChannelString lensMode, passEnergy, estTime, detectorState;
final ChannelInteger totalSteps, currentStep, exposuresComplete;
final DiscretePositioner lensMode, acquisitionMode, energyMode, detectorMode, elementSet, passEnergy;
final ChannelString estTime, detectorState;
final ChannelByteArray status;
final ChannelInteger slices, slicesReadback, channels, channelsReadback;
final Stats[] stats;
@@ -81,9 +71,13 @@ public class Scienta extends AreaDetector {
ThetaXCount = new ChannelInteger(name + " Theta count", channelCtrl + ":SLICE_COUNT_RBV", false);
ThetaXCount.setAccessType(AccessType.Read);
passEnergy = new ChannelString(name + " pass energy", channelCtrl + ":PASS_ENERGY", false);
lensMode = new ChannelString(name + " lens mode", channelCtrl + ":LENS_MODE", false);
acquisitionMode = new ChannelInteger(name + " acquisition mode", channelCtrl + ":ACQ_MODE", false);
passEnergy = new DiscretePositioner(name + " pass energy", channelCtrl + ":PASS_ENERGY", channelCtrl + ":PASS_ENERGY_RBV");
lensMode = new DiscretePositioner(name + " lens mode", channelCtrl + ":LENS_MODE", channelCtrl + ":LENS_MODE_RBV");
acquisitionMode = new DiscretePositioner(name + " acquisition mode", channelCtrl + ":ACQ_MODE", channelCtrl + ":ACQ_MODE_RBV");
energyMode = new DiscretePositioner(name + " energy mode", channelCtrl + ":ENERGY_MODE", channelCtrl + ":ENERGY_MODE_RBV");
detectorMode = new DiscretePositioner(name + " detector mode", channelCtrl + ":DETECTOR_MODE", channelCtrl + ":DETECTOR_MODE_RBV");
elementSet = new DiscretePositioner(name + " element set", channelCtrl + ":ELEMENT_SET_RBV", channelCtrl + ":ELEMENT_SET_RBV");
elementSet.setAccessType(AccessType.Read);
slices = new ChannelInteger(name + " slices", channelCtrl + ":SLICES", false);
slicesReadback = new ChannelInteger(name + " slices rbv", channelCtrl + ":SLICES_RBV", false);
@@ -106,14 +100,23 @@ public class Scienta extends AreaDetector {
estTime.setAccessType(AccessType.Read);
detectorState= new ChannelString(name + " detector state", channelCtrl + ":DetectorState_RBV", false);
detectorState.setAccessType(AccessType.Read);
status= new ChannelByteArray(name + " status", channelCtrl + ":StatusMessage_RBV");
status= new ChannelByteArray(name + " status", channelCtrl + ":StatusMessage_RBV", -1, false){
protected void onReadout(Object value){
this.setCache((value==null)?"":new String((byte[])value));
}
//protected Object convertFromRead(byte[] value){
// return (value==null) ? "" : new String((byte[])value);
//}
};
status.setAccessType(AccessType.Read);
monitoredChildren = new Device[]{acquire,
lowEnergy,centerEnergy,highEnergy,energyWidth,energyCount,
lowThetaY, centerThetaY, highThetaY, stepSizeThetaY, ThetaYWidth,ThetaYCount,
lowThetaX, centerThetaX, highThetaX, stepSizeThetaX, ThetaXWidth,ThetaXCount,
stepSize,totalSteps,currentStep, exposuresComplete, passEnergy, lensMode,acquisitionMode,
stepSize,totalSteps,currentStep, exposuresComplete, passEnergy,
lensMode, acquisitionMode, energyMode, detectorMode, elementSet,
slices, slicesReadback, channels, channelsReadback, excitationEnergy,
estTime, detectorState, status
};
@@ -141,17 +144,12 @@ public class Scienta extends AreaDetector {
@Override
protected void doSetSimulated() {
super.doSetSimulated();
setCache(passEnergy, String.valueOf(PASS_ENERGY_VALUES[0]));
setCache(lensMode, LensMode.Transmission.toString());
setCache(acquisitionMode, 0);
setSimulatedValue("ENERGY_MODE", EnergyMode.Binding.toString());
setSimulatedValue("DETECTOR_MODE", DetectorMode.ADC.toString());
setSimulatedValue("ELEMENT_SET", ElementSet.High_Pass_XPS.toString());
setSimulatedValue("ACQ_MODE", AcquisitionMode.Fixed.toString());
setSimulatedValue("LENS_MODE", LensMode.Transmission.toString());
setSimulatedValue("PASS_ENERGY", String.valueOf(PASS_ENERGY_VALUES[0]));
setSimulatedValue("ELEMENT_SET_RBV", ElementSet.High_Pass_XPS);
setCache(passEnergy, "2");
setCache(lensMode, "Transmission");
setCache(acquisitionMode, "Fixed");
setCache(energyMode, "Binding");
setCache(detectorMode, "ADC");
setCache(elementSet, "High_Pass_XPS");
}
@Override
@@ -200,169 +198,86 @@ public class Scienta extends AreaDetector {
}
//Modes
public enum AcquisitionMode {
Fixed,
Swept_Energy,
Swept_ThetaY,
Swept_Energy_ThetaY
public void setAcquisitionMode(String mode) throws IOException, InterruptedException { //acquisitionMode.write(String.valueOf(mode).replaceAll("_", " "));
acquisitionMode.write(mode);
}
public void setAcquisitionMode(AcquisitionMode mode) throws IOException, InterruptedException {
//acquisitionMode.write(String.valueOf(mode).replaceAll("_", " "));
acquisitionMode.write(Arr.getIndex(AcquisitionMode.values(), (mode==null) ? 0 : mode));
public String getAcquisitionMode() throws IOException, InterruptedException {
return acquisitionMode.getValue();
}
public AcquisitionMode getAcquisitionMode() throws IOException, InterruptedException {
//String val = acquisitionMode.getValue();
//return (AcquisitionMode) convertCtrlEnum(val, AcquisitionMode.class);
try{
int val = acquisitionMode.getValue();
return AcquisitionMode.values()[val];
} catch (Exception ex){
return null;
}
public void setEnergyMode(String mode) throws IOException, InterruptedException {
energyMode.write(mode);
}
public enum EnergyMode {
Binding,
Kinetic
public String getEnergyMode() throws IOException, InterruptedException {
return energyMode.getValue();
}
public void setEnergyMode(EnergyMode mode) throws IOException, InterruptedException {
writeCtrlEnum("ENERGY_MODE", String.valueOf(mode));
public void setLensMode(String mode) throws IOException, InterruptedException {
lensMode.write(mode);
}
public EnergyMode getEnergyMode() throws IOException, InterruptedException {
return (EnergyMode) readCtrlEnum("ENERGY_MODE", EnergyMode.class);
}
public enum LensMode {
A14L_01,
A14L_08,
A30L_01,
A30L_08,
DA14L_01,
DA14L_08,
DA30L_01,
DA30L_08,
Transmission,
Transmission_XPS
public String getLensMode() throws IOException, InterruptedException {
return lensMode.getValue();
}
public enum LensModeTest {
A14_01,
A14_08,
A30_01,
A30_08,
A7_08,
DA14_01,
DA14_08,
DA30_01,
DA30_08,
DA7_08,
Transmission,
Transmission_XPS
public String[] getLensModes() throws IOException, InterruptedException {
return lensMode.getPositions();
}
public Class getLensModeClass(){
return test ? LensModeTest.class : LensMode.class;
public void setDetectorMode(String mode) throws IOException, InterruptedException {
detectorMode.write(mode);
}
public void setLensMode(Object mode) throws IOException, InterruptedException {
//writeCtrlEnum("LENS_MODE", String.valueOf(mode));
String m = mode.toString();
lensMode.write(m.equals("Transmission_XPS") ? "Transmission XPS" : m);
public String getDetectorMode() throws IOException, InterruptedException {
return detectorMode.getValue();
}
public Object getLensMode() throws IOException, InterruptedException {
//return (LensMode) readCtrlEnum("LENS_MODE", LensMode.class);
String val = lensMode.getValue();
return convertCtrlEnum(val, LensMode.class);
}
public enum DetectorMode {
Pulse,
ADC
}
public void setDetectorMode(DetectorMode mode) throws IOException, InterruptedException {
writeCtrlEnum("DETECTOR_MODE", String.valueOf(mode));
}
public DetectorMode getDetectorMode() throws IOException, InterruptedException {
return (DetectorMode) readCtrlEnum("DETECTOR_MODE", DetectorMode.class);
}
public enum ElementSet {
High_Pass_XPS,
Low_Pass_UPS
}
public void setElementSet(ElementSet mode) throws IOException, InterruptedException {
public void setElementSet(String mode) throws IOException, InterruptedException {
throw new IOException("Read-only value");
//writeCtrlEnum("ELEMENT_SET", String.valueOf(mode));
}
public ElementSet getElementSet() throws IOException, InterruptedException {
return readCtrl("ELEMENT_SET_RBV", String.class).equals("High Pass (XPS)") ? ElementSet.High_Pass_XPS : ElementSet.Low_Pass_UPS;
public String getElementSet() throws IOException, InterruptedException {
return elementSet.getValue();
}
public static final int[] PASS_ENERGY_VALUES = new int[]{1, 2, 5, 10, 20};
public void setPassEnergy(int energy) throws IOException, InterruptedException {
//writeCtrl("PASS_ENERGY", String.valueOf(energy));
passEnergy.write(String.valueOf(energy));
setPassEnergy(String.valueOf(energy));
}
public int getPassEnergy() throws IOException, InterruptedException {
//String ret = (String) readCtrl("PASS_ENERGY", String.class);
String ret = passEnergy.getValue();
try {
return Integer.valueOf(ret);
} catch (Exception ex) {
throw new DeviceInvalidParameterException("Pass Energy", ret);
}
public void setPassEnergy(String energy) throws IOException, InterruptedException {
passEnergy.write(energy);
}
public void zeroSupplies() throws IOException, InterruptedException {
writeCtrl("ZERO_SUPPLIES", 1);
public String getPassEnergy() throws IOException, InterruptedException {
return passEnergy.getValue();
}
public Writable getPassEnergyDev(){
return (Writable) (Object value) -> {
setPassEnergy(Integer.valueOf(String.valueOf(value)));
};
public DiscretePositioner getPassEnergyDev(){
return passEnergy;
}
public Writable getElementSetDev(){
return (Writable) (Object value) -> {
setElementSet(ElementSet.valueOf(String.valueOf(value)));
};
public DiscretePositioner getElementSetDev(){
return elementSet;
}
public Writable getDetectorModeDev(){
return (Writable) (Object value) -> {
setDetectorMode(DetectorMode.valueOf(String.valueOf(value)));
};
public DiscretePositioner getDetectorModeDev(){
return detectorMode;
}
public Writable getLensModeDev(){
return (Writable) (Object value) -> {
setLensMode(String.valueOf(value));
};
public DiscretePositioner getLensModeDev(){
return lensMode;
}
public Writable getAcquisitionModeDev(){
return (Writable) (Object value) -> {
setAcquisitionMode(AcquisitionMode.valueOf(String.valueOf(value)));
};
public DiscretePositioner getAcquisitionModeDev(){
return acquisitionMode;
}
public Writable getEnergyModeDev(){
return (Writable) (Object value) -> {
setEnergyMode(EnergyMode.valueOf(String.valueOf(value)));
};
public DiscretePositioner getEnergyModeDev(){
return energyMode;
}
public Writable getRangeDev(){
@@ -385,6 +300,9 @@ public class Scienta extends AreaDetector {
};
}
public void zeroSupplies() throws IOException, InterruptedException {
writeCtrl("ZERO_SUPPLIES", 1);
}
//Progress
@@ -518,7 +436,8 @@ public class Scienta extends AreaDetector {
public ControlledVariable getExcitationEnergy() {
return excitationEnergy;
}
}
public List<Double> getChannelRange() throws IOException, InterruptedException {
ArrayList<Double> ret = new ArrayList<>();
@@ -544,7 +463,7 @@ public class Scienta extends AreaDetector {
ret.add(200.0);
ret.add(400.0);
} else {
String lens=getLensMode().toString();
String lens=getLensMode();
if (lens.startsWith("D")){
ret.add(lowThetaY.getReadback().getValue());
ret.add(highThetaY.getReadback().getValue());

View File

@@ -70,8 +70,8 @@
<Component id="jPanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="jPanel7" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="jPanel5" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jPanel5" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -110,9 +110,8 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="comboLens" linkSize="10" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="comboAcquisition" linkSize="10" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="comboEnergy" linkSize="10" min="-2" max="-2" attributes="0"/>
<Component id="comboLens" linkSize="10" alignment="0" min="-2" pref="150" max="-2" attributes="0"/>
<Component id="comboAcquisition" linkSize="10" min="-2" pref="150" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
@@ -120,22 +119,24 @@
<Component id="jLabel4" linkSize="1" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Component id="jLabel11" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="valuExcit" linkSize="10" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="jLabel46" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="1" max="-2" attributes="0">
<Component id="valueExcit" pref="0" max="32767" attributes="0"/>
<Component id="comboEnergy" linkSize="10" pref="150" max="32767" attributes="0"/>
</Group>
<EmptySpace min="50" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel11" linkSize="1" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel46" linkSize="1" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="comboPass" linkSize="10" max="32767" attributes="0"/>
<Component id="comboElement" linkSize="10" max="32767" attributes="0"/>
<Component id="comboDetector" linkSize="10" max="32767" attributes="0"/>
<Component id="textEst" linkSize="10" min="-2" pref="68" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="comboDetector" linkSize="10" pref="150" max="32767" attributes="0"/>
<Component id="comboElement" linkSize="10" alignment="0" pref="150" max="32767" attributes="0"/>
<Component id="comboPass" linkSize="10" alignment="0" pref="150" max="32767" attributes="0"/>
<Component id="valueEst" alignment="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
</Group>
@@ -146,53 +147,33 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboLens" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboAcquisition" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboDetector" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel5" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboElement" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel1" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboLens" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel4" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboDetector" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboEnergy" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<Component id="valuExcit" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="comboPass" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel11" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel46" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="textEst" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel9" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel2" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboAcquisition" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel5" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboElement" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel3" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboEnergy" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel11" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboPass" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel9" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel46" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueExcit" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueEst" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
@@ -212,105 +193,30 @@
<Property name="text" type="java.lang.String" value="Lens:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboLens">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="4">
<StringItem index="0" value="Item 1"/>
<StringItem index="1" value="Item 2"/>
<StringItem index="2" value="Item 3"/>
<StringItem index="3" value="Item 4"/>
</StringArray>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="comboLensActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Acquisition:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboAcquisition">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="4">
<StringItem index="0" value="Item 1"/>
<StringItem index="1" value="Item 2"/>
<StringItem index="2" value="Item 3"/>
<StringItem index="3" value="Item 4"/>
</StringArray>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="comboAcquisitionActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel3">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Energy Mode:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboEnergy">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="4">
<StringItem index="0" value="Item 1"/>
<StringItem index="1" value="Item 2"/>
<StringItem index="2" value="Item 3"/>
<StringItem index="3" value="Item 4"/>
</StringArray>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="comboEnergyActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel4">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Detector:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboDetector">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="4">
<StringItem index="0" value="Item 1"/>
<StringItem index="1" value="Item 2"/>
<StringItem index="2" value="Item 3"/>
<StringItem index="3" value="Item 4"/>
</StringArray>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="comboDetectorActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel5">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Element:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboElement">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="4">
<StringItem index="0" value="Item 1"/>
<StringItem index="1" value="Item 2"/>
<StringItem index="2" value="Item 3"/>
<StringItem index="3" value="Item 4"/>
</StringArray>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="comboElementActionPerformed"/>
</Events>
</Component>
<Container class="javax.swing.JPanel" name="jPanel4">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
@@ -335,14 +241,14 @@
</Group>
<Component id="jLabel33" linkSize="8" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="valueWidth" alignment="0" max="32767" attributes="0"/>
<Component id="valueCount" alignment="0" max="32767" attributes="0"/>
<Component id="valueHigh" max="32767" attributes="0"/>
<Component id="valueCenter" max="32767" attributes="0"/>
<Component id="valueLow" max="32767" attributes="0"/>
<Component id="valueStep" alignment="1" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="valueCenter" linkSize="19" alignment="0" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueHigh" linkSize="19" alignment="0" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueStep" linkSize="19" alignment="1" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueWidth" linkSize="19" alignment="0" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueCount" linkSize="19" alignment="1" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueLow" linkSize="19" min="-2" pref="97" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -351,7 +257,7 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel12" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueLow" alignment="2" min="-2" max="-2" attributes="0"/>
@@ -363,8 +269,8 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel14" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueHigh" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel14" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
@@ -393,60 +299,24 @@
<Property name="text" type="java.lang.String" value="Low:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueLow">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel13">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Center:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueCenter">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel14">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="High:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueHigh">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel15">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Width:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueWidth">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueCount">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel20">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
@@ -459,12 +329,22 @@
<Property name="text" type="java.lang.String" value="Step:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueStep">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueLow">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueCenter">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueHigh">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueStep">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueCount">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueWidth">
<Properties>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
</SubComponents>
@@ -475,25 +355,6 @@
<Property name="text" type="java.lang.String" value="Pass Energy:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboPass">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="7">
<StringItem index="0" value="2"/>
<StringItem index="1" value="5"/>
<StringItem index="2" value="10"/>
<StringItem index="3" value="20"/>
<StringItem index="4" value="50"/>
<StringItem index="5" value="100"/>
<StringItem index="6" value="200"/>
</StringArray>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="comboPassActionPerformed"/>
</Events>
</Component>
<Container class="javax.swing.JPanel" name="jPanel10">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
@@ -516,14 +377,14 @@
<Component id="jLabel37" linkSize="16" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel38" linkSize="16" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="valueWidthTY" alignment="0" max="32767" attributes="0"/>
<Component id="valueCountTY" alignment="0" max="32767" attributes="0"/>
<Component id="valueHighTY" alignment="0" max="32767" attributes="0"/>
<Component id="valueCenterTY" alignment="0" max="32767" attributes="0"/>
<Component id="valueLowTY" alignment="0" max="32767" attributes="0"/>
<Component id="valueStepTY" alignment="1" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="valueCenterTY" alignment="0" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueHighTY" alignment="0" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueStepTY" alignment="1" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueWidthTY" alignment="0" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueCountTY" alignment="1" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueLowTY" alignment="1" min="-2" pref="97" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -531,8 +392,8 @@
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel34" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueLowTY" alignment="2" min="-2" max="-2" attributes="0"/>
@@ -574,66 +435,24 @@
<Property name="text" type="java.lang.String" value="Low:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueLowTY">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="maxValue" type="double" value="1000.0"/>
<Property name="minValue" type="double" value="-1000.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel35">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Center:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueCenterTY">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="maxValue" type="double" value="1000.0"/>
<Property name="minValue" type="double" value="-1000.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel36">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="High:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueHighTY">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="maxValue" type="double" value="1000.0"/>
<Property name="minValue" type="double" value="-1000.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel37">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Width:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueWidthTY">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueCountTY">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel38">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
@@ -646,12 +465,22 @@
<Property name="text" type="java.lang.String" value="Step:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueStepTY">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueLowTY">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueCenterTY">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueHighTY">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueStepTY">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueWidthTY">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueCountTY">
<Properties>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
</SubComponents>
@@ -678,14 +507,14 @@
<Component id="jLabel40" linkSize="18" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel41" linkSize="18" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="valueCenterTX" alignment="0" max="32767" attributes="0"/>
<Component id="valueStepTX" alignment="1" max="32767" attributes="0"/>
<Component id="valueHighTX" alignment="1" max="32767" attributes="0"/>
<Component id="valueLowTX" alignment="1" max="32767" attributes="0"/>
<Component id="valueWidthTX" alignment="0" max="32767" attributes="0"/>
<Component id="valueCountTX" alignment="0" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="valueCenterTX" alignment="0" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueHighTX" alignment="0" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueStepTX" alignment="1" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueWidthTX" alignment="0" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueCountTX" alignment="1" min="-2" pref="97" max="-2" attributes="0"/>
<Component id="valueLowTX" alignment="1" min="-2" pref="97" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -693,8 +522,8 @@
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel40" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueLowTX" alignment="2" min="-2" max="-2" attributes="0"/>
@@ -742,14 +571,6 @@
<Property name="text" type="java.lang.String" value="Center:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueCenterTX">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="maxValue" type="double" value="1000.0"/>
<Property name="minValue" type="double" value="-1000.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel42">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
@@ -762,24 +583,6 @@
<Property name="text" type="java.lang.String" value="Width:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueWidthTX">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueCountTX">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel44">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
@@ -792,31 +595,31 @@
<Property name="text" type="java.lang.String" value="Step:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueStepTX">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueLowTX">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueHighTX">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueCenterTX">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueHighTX">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="1000.0"/>
<Property name="minValue" type="double" value="-1000.0"/>
<Property name="showButtons" type="boolean" value="false"/>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueLowTX">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueStepTX">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="1000.0"/>
<Property name="minValue" type="double" value="-1000.0"/>
<Property name="showButtons" type="boolean" value="false"/>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueWidthTX">
<Properties>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueCountTX">
<Properties>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
</SubComponents>
@@ -827,23 +630,29 @@
<Property name="text" type="java.lang.String" value="Time Estimated:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textEst">
<Properties>
<Property name="editable" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel9">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Excit.:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valuExcit">
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboLens">
</Component>
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboAcquisition">
</Component>
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboEnergy">
</Component>
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboDetector">
</Component>
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboElement">
</Component>
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboPass">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueExcit">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueEst">
<Properties>
<Property name="decimals" type="int" value="3"/>
<Property name="maxValue" type="double" value="2000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
</SubComponents>
@@ -861,17 +670,17 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jLabel10" linkSize="3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="valueSlices" linkSize="11" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="valueSlices" pref="0" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jLabel17" linkSize="3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="valueChannels" linkSize="11" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="buttonZeroSupplies" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="valueChannels" pref="0" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="50" max="-2" attributes="0"/>
<Component id="buttonZeroSupplies" min="-2" pref="176" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -881,10 +690,10 @@
<EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel10" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueSlices" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel17" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueChannels" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="buttonZeroSupplies" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueSlices" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueChannels" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -898,14 +707,6 @@
<Property name="text" type="java.lang.String" value="Slices:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueSlices">
<Properties>
<Property name="decimals" type="int" value="0"/>
<Property name="maxValue" type="double" value="10000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="buttonZeroSupplies">
<Properties>
<Property name="text" type="java.lang.String" value="Zero Supplies"/>
@@ -920,13 +721,9 @@
<Property name="text" type="java.lang.String" value="Channels:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueChannels">
<Properties>
<Property name="decimals" type="int" value="0"/>
<Property name="maxValue" type="double" value="10000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueSlices">
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueChannels">
</Component>
</SubComponents>
</Container>
@@ -948,27 +745,27 @@
<Group type="102" attributes="0">
<Component id="jLabel6" linkSize="12" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="valueCurrent" linkSize="14" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="valueCurrent" min="-2" pref="66" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel16" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="valueTotal" min="-2" pref="66" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
<Component id="valueTotal" linkSize="14" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="progress" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel19" linkSize="12" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="textStatus" max="32767" attributes="0"/>
<Component id="valueStatus" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="jLabel7" linkSize="12" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="textState" max="32767" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jLabel18" min="-2" max="-2" attributes="0"/>
<Component id="valueState" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="valueImageCounter" linkSize="14" min="-2" max="-2" attributes="0"/>
<Component id="jLabel18" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
<Component id="valueImageCounter" min="-2" pref="66" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -981,22 +778,22 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel7" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueState" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel18" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueImageCounter" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textState" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel19" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="textStatus" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel19" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueStatus" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueCurrent" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel16" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="valueTotal" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="progress" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel16" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -1014,29 +811,11 @@
<Property name="text" type="java.lang.String" value="Current step:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueCurrent">
<Properties>
<Property name="decimals" type="int" value="0"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="100000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel16">
<Properties>
<Property name="text" type="java.lang.String" value="Total:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueTotal">
<Properties>
<Property name="decimals" type="int" value="0"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="100000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel7">
<Properties>
<Property name="text" type="java.lang.String" value="Det. State:"/>
@@ -1047,28 +826,34 @@
<Property name="text" type="java.lang.String" value="Image Counter:"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.ValueSelection" name="valueImageCounter">
<Properties>
<Property name="decimals" type="int" value="0"/>
<Property name="enabled" type="boolean" value="false"/>
<Property name="maxValue" type="double" value="100000.0"/>
<Property name="minValue" type="double" value="0.0"/>
<Property name="showButtons" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel19">
<Properties>
<Property name="text" type="java.lang.String" value="Status:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textState">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueCurrent">
<Properties>
<Property name="editable" type="boolean" value="false"/>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textStatus">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueTotal">
<Properties>
<Property name="editable" type="boolean" value="false"/>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueState">
<Properties>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueStatus">
<Properties>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="valueImageCounter">
<Properties>
<Property name="readOnly" type="boolean" value="true"/>
</Properties>
</Component>
</SubComponents>

File diff suppressed because it is too large Load Diff