Live scienta controls

This commit is contained in:
gac-x09la
2022-03-11 14:59:17 +01:00
parent 37fd09cfd8
commit 9f99157f0f
4 changed files with 644 additions and 708 deletions
Binary file not shown.
+267 -295
View File
@@ -27,8 +27,10 @@
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="textTime" min="-2" pref="120" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="textTime" min="-2" pref="170" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="progress" min="-2" pref="153" max="-2" attributes="0"/>
<EmptySpace type="separate" 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"/>
@@ -53,7 +55,7 @@
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="buttonOpen" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -66,13 +68,14 @@
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jPanel2" max="32767" attributes="0"/>
<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="buttonStart" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonAbort" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="buttonData" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="textTime" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="progress" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textTime" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="buttonStart" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="buttonAbort" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="buttonData" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="buttonScienta" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -153,32 +156,30 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<Component id="jPanel10" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jPanel10" max="32767" attributes="0"/>
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
<Component id="panelEnergy" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
<Component id="panelX" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="panelY" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="100" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanel10" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="panelEnergy" alignment="0" max="32767" attributes="0"/>
<Component id="panelY" alignment="0" max="32767" attributes="0"/>
<Component id="panelX" alignment="1" max="32767" attributes="0"/>
</Group>
<Component id="panelY" linkSize="17" alignment="0" max="32767" attributes="0"/>
<Component id="panelX" linkSize="17" alignment="0" max="32767" attributes="0"/>
<Component id="panelEnergy" linkSize="17" alignment="0" max="32767" attributes="0"/>
<Component id="jPanel10" linkSize="17" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="169" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -197,7 +198,7 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" 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" alignment="1" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
@@ -205,20 +206,20 @@
<Component id="jLabel12" linkSize="7" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel13" linkSize="7" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="textLowEnergy" linkSize="5" alignment="0" min="-2" pref="68" max="-2" attributes="0"/>
<Component id="textCenterEnergy" linkSize="5" alignment="0" min="-2" pref="68" max="-2" attributes="0"/>
<Component id="textHighEnergy" linkSize="5" alignment="0" min="-2" pref="68" max="-2" attributes="0"/>
<Component id="textLowEnergy" pref="80" max="32767" attributes="0"/>
<Component id="textCenterEnergy" pref="80" max="32767" attributes="0"/>
<Component id="textHighEnergy" pref="80" max="32767" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="jLabel15" linkSize="7" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="textStepEnergy" linkSize="5" min="-2" pref="68" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="textStepEnergy" pref="80" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -226,26 +227,26 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textLowEnergy" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel12" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel12" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textLowEnergy" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textCenterEnergy" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel13" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel13" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textCenterEnergy" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textHighEnergy" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel14" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel14" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textHighEnergy" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textStepEnergy" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel15" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel15" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textStepEnergy" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="16" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -257,11 +258,6 @@
<Property name="text" type="java.lang.String" value="High:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textStepEnergy">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.energyStepSize" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel13">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
@@ -280,19 +276,24 @@
<Property name="text" type="java.lang.String" value="Step:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textHighEnergy">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textLowEnergy">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.highEnergy" noResource="true"/>
<Property name="name" type="java.lang.String" value="scienta.lowEnergy" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textCenterEnergy">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textCenterEnergy">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.centerEnergy" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textLowEnergy">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textHighEnergy">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.lowEnergy" noResource="true"/>
<Property name="name" type="java.lang.String" value="scienta.highEnergy" noResource="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textStepEnergy">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.energyStepSize" noResource="true"/>
</Properties>
</Component>
</SubComponents>
@@ -310,7 +311,7 @@
<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"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
@@ -318,20 +319,20 @@
<Component id="jLabel19" linkSize="8" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="jLabel18" linkSize="8" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="textLowThetaY" alignment="0" min="-2" pref="68" max="-2" attributes="0"/>
<Component id="textCenterThetaY" alignment="0" min="-2" pref="68" max="-2" attributes="0"/>
<Component id="textHighThetaY" alignment="0" min="-2" pref="68" max="-2" attributes="0"/>
<Component id="textLowThetaY" pref="80" max="32767" attributes="0"/>
<Component id="textCenterThetaY" pref="80" max="32767" attributes="0"/>
<Component id="textHighThetaY" pref="80" max="32767" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="jLabel20" linkSize="8" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="textStepThetaY" min="-2" pref="68" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="textStepThetaY" pref="80" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -339,26 +340,26 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textLowThetaY" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel19" 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="textLowThetaY" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textCenterThetaY" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel18" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel18" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textCenterThetaY" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textHighThetaY" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel17" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel17" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textHighThetaY" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textStepThetaY" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel20" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel20" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textStepThetaY" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="16" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -370,11 +371,6 @@
<Property name="text" type="java.lang.String" value="High:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textStepThetaY">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.thetaYStepSize" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel18">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
@@ -393,19 +389,24 @@
<Property name="text" type="java.lang.String" value="Step:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textHighThetaY">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textLowThetaY">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.highThetaY" noResource="true"/>
<Property name="name" type="java.lang.String" value="scienta.lowThetaY" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textCenterThetaY">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textCenterThetaY">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.centerThetaY" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textLowThetaY">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textHighThetaY">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.lowThetaY" noResource="true"/>
<Property name="name" type="java.lang.String" value="scienta.highThetaY" noResource="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textStepThetaY">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.thetaYStepSize" noResource="true"/>
</Properties>
</Component>
</SubComponents>
@@ -423,23 +424,23 @@
<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="jLabel26" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="textCenterThetaX" min="-2" pref="68" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="textCenterThetaX" pref="80" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="38" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textCenterThetaX" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel26" alignment="3" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel26" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textCenterThetaX" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="67" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -451,7 +452,7 @@
<Property name="text" type="java.lang.String" value="Center:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textCenterThetaX">
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textCenterThetaX">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.centerThetaX" noResource="true"/>
</Properties>
@@ -463,129 +464,98 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel5" linkSize="6" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel6" linkSize="6" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel11" linkSize="6" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="comboPass" linkSize="4" alignment="0" min="-2" pref="103" max="-2" attributes="0"/>
<Component id="comboAcquisition" linkSize="4" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="comboEnergy" linkSize="4" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel7" linkSize="6" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="comboLens" linkSize="4" min="-2" pref="103" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel24" linkSize="14" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel28" linkSize="14" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel29" linkSize="14" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel30" linkSize="14" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="comboLens" alignment="0" pref="150" max="32767" attributes="0"/>
<Component id="comboEnergy" alignment="0" pref="150" max="32767" attributes="0"/>
<Component id="comboAcquisition" alignment="0" pref="150" max="32767" attributes="0"/>
<Component id="comboPass" alignment="0" pref="150" max="32767" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel11" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboPass" alignment="3" min="-2" pref="27" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel24" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboPass" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel6" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboAcquisition" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel28" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboAcquisition" alignment="2" 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="comboEnergy" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel29" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboEnergy" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel7" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboLens" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel30" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboLens" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace pref="18" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabel11">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Pass Energy:"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel6">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Acquisition:"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel5">
<Component class="javax.swing.JLabel" name="jLabel29">
<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="comboPass">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="1">
<StringItem index="0" value=" "/>
</StringArray>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="name" type="java.lang.String" value="scienta.passEnergyDev" noResource="true"/>
</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="1">
<StringItem index="0" value=" "/>
</StringArray>
</Property>
<Property name="name" type="java.lang.String" value="scienta.lensModeDev" noResource="true"/>
</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="jLabel7">
<Component class="javax.swing.JLabel" name="jLabel30">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Lens Mode:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboAcquisition">
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboLens">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.lensModeDev" noResource="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboAcquisition">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="1">
<StringItem index="0" value=" "/>
</StringArray>
</Property>
<Property name="name" type="java.lang.String" value="scienta.acquisitionModeDev" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboEnergy">
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboEnergy">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="1">
<StringItem index="0" value=" "/>
</StringArray>
</Property>
<Property name="name" type="java.lang.String" value="scienta.energyModeDev" noResource="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboPass">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.passEnergyDev" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel24">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Pass Energy:"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel28">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Acquisition:"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
@@ -617,7 +587,7 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="textXChannelMax" min="-2" pref="68" max="-2" attributes="0"/>
</Group>
<Component id="comboDetMode" min="-2" pref="103" max="-2" attributes="0"/>
<Component id="comboDetMode" min="-2" pref="132" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" attributes="0">
@@ -627,12 +597,12 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="textSlices" min="-2" pref="68" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="textYChannelMin" min="-2" pref="68" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="textYChannelMax" min="-2" pref="68" max="-2" attributes="0"/>
</Group>
<Component id="textSlices" min="-2" pref="68" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
@@ -642,8 +612,8 @@
</Group>
<Component id="butonPlot" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<Component id="detectorPlot" pref="561" max="32767" attributes="0"/>
<EmptySpace pref="26" max="32767" attributes="0"/>
<Component id="detectorPlot" pref="543" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
@@ -653,39 +623,39 @@
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="21" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel16" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboDetMode" alignment="3" min="-2" pref="27" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel16" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="comboDetMode" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel9" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="textXChannelMin" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="textXChannelMax" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel9" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textXChannelMax" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textXChannelMin" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textChannels" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel27" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel27" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textChannels" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel10" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="textYChannelMin" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="textYChannelMax" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel10" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textYChannelMin" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textYChannelMax" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="textSlices" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel25" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel25" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="textSlices" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="32767" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="butonPlot" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="detectorPlot" pref="0" max="32767" attributes="0"/>
<Component id="detectorPlot" pref="301" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -700,17 +670,6 @@
<Property name="text" type="java.lang.String" value="Mode:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboDetMode">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="1">
<StringItem index="0" value=" "/>
</StringArray>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="name" type="java.lang.String" value="scienta.detectorModeDev" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel9">
<Properties>
<Property name="text" type="java.lang.String" value="X Channel Range:"/>
@@ -722,22 +681,6 @@
<Property name="text" type="java.lang.String" value="Slices:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textSlices">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.slices" noResource="true"/>
</Properties>
<Events>
<EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="roiChanged"/>
</Events>
</Component>
<Component class="javax.swing.JTextField" name="textChannels">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.channels" noResource="true"/>
</Properties>
<Events>
<EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="roiChanged"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel27">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
@@ -798,6 +741,21 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="butonPlotActionPerformed"/>
</Events>
</Component>
<Component class="ch.psi.pshell.swing.DiscretePositionerSelector" name="comboDetMode">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.detectorModeDev" noResource="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textChannels">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.channels" noResource="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.RegisterPanel" name="textSlices">
<Properties>
<Property name="name" type="java.lang.String" value="scienta.slices" noResource="true"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel11">
@@ -813,7 +771,7 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace pref="175" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="151" max="-2" 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"/>
@@ -822,45 +780,53 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="checkCompression" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="spinnerPasses" linkSize="3" 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"/>
<Group type="102" alignment="0" attributes="0">
<Component id="spinnerPasses" linkSize="3" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<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"/>
</Group>
<EmptySpace min="-2" pref="139" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="jLabel21" min="-2" max="-2" attributes="0"/>
<Component id="jLabel23" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="comboPol" pref="150" max="32767" attributes="0"/>
<Component id="comboGrating" max="32767" attributes="0"/>
</Group>
<EmptySpace pref="141" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace min="-2" pref="139" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="jLabel21" min="-2" max="-2" attributes="0"/>
<Component id="jLabel23" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="comboPol" linkSize="13" alignment="0" min="-2" pref="103" max="-2" attributes="0"/>
<Component id="comboGrating" linkSize="13" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="175" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="52" 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="checkCompression" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel22" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="43" max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel22" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="checkCompression" alignment="2" 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"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="jLabel8" alignment="2" min="-2" max="-2" attributes="0"/>
<Component id="checkZigzag" alignment="2" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="42" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel21" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="comboPol" alignment="3" min="-2" pref="27" max="-2" attributes="0"/>
<Component id="comboPol" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
@@ -879,7 +845,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="134" max="32767" attributes="0"/>
<EmptySpace pref="177" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -933,33 +899,34 @@
<Property name="text" type="java.lang.String" value="Polarization:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboPol">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="1">
<StringItem index="0" value=" "/>
</StringArray>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="name" type="java.lang.String" value="id_mode" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboGrating">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="1">
<StringItem index="0" value=" "/>
</StringArray>
</Property>
<Property name="name" type="java.lang.String" value="grating" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel23">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" value="Grating:"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="comboPol">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="0"/>
</Property>
<Property name="name" type="java.lang.String" value="id_mode" noResource="true"/>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
</AuxValues>
</Component>
<Component class="javax.swing.JComboBox" name="comboGrating">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="0"/>
</Property>
<Property name="name" type="java.lang.String" value="grating" noResource="true"/>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
</AuxValues>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel6">
@@ -982,7 +949,7 @@
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="jScrollPane8" pref="743" max="32767" attributes="0"/>
<Component id="jScrollPane8" pref="732" max="32767" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonEditMaster" min="-2" pref="100" max="-2" attributes="0"/>
</Group>
@@ -996,7 +963,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jScrollPane8" pref="238" max="32767" attributes="0"/>
<Component id="jScrollPane8" pref="269" max="32767" attributes="0"/>
<Component id="buttonEditMaster" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="13" max="-2" attributes="0"/>
@@ -1075,11 +1042,11 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="217" max="32767" attributes="0"/>
<Component id="jScrollPane1" pref="223" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jScrollPane2" pref="262" max="32767" attributes="0"/>
<Component id="jScrollPane2" pref="266" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jScrollPane3" pref="371" max="32767" attributes="0"/>
<Component id="jScrollPane3" pref="373" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -1088,7 +1055,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="jScrollPane3" pref="201" max="32767" attributes="0"/>
<Component id="jScrollPane3" pref="299" max="32767" attributes="0"/>
<Component id="jScrollPane2" alignment="0" pref="0" max="32767" attributes="0"/>
<Component id="jScrollPane1" alignment="0" pref="0" max="32767" attributes="0"/>
</Group>
@@ -1207,13 +1174,13 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="jScrollPane4" pref="211" max="32767" attributes="0"/>
<Component id="jScrollPane4" pref="213" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jScrollPane5" pref="211" max="32767" attributes="0"/>
<Component id="jScrollPane5" pref="214" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jScrollPane6" pref="211" max="32767" attributes="0"/>
<Component id="jScrollPane6" pref="213" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jScrollPane7" pref="211" max="32767" attributes="0"/>
<Component id="jScrollPane7" pref="216" max="32767" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/>
</Group>
</Group>
@@ -1223,7 +1190,7 @@
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="jScrollPane6" alignment="0" pref="201" max="32767" attributes="0"/>
<Component id="jScrollPane6" alignment="0" pref="299" max="32767" attributes="0"/>
<Component id="jScrollPane5" alignment="0" max="32767" attributes="0"/>
<Component id="jScrollPane4" alignment="0" max="32767" attributes="0"/>
<Component id="jScrollPane7" max="32767" attributes="0"/>
@@ -1387,7 +1354,7 @@
</Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="text" type="java.lang.String" value="Acquisition Time:"/>
<Property name="text" type="java.lang.String" value="Time:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="textTime">
@@ -1396,5 +1363,10 @@
<Property name="horizontalAlignment" type="int" value="0"/>
</Properties>
</Component>
<Component class="javax.swing.JProgressBar" name="progress">
<Properties>
<Property name="maximum" type="int" value="1000"/>
</Properties>
</Component>
</SubComponents>
</Form>
+364 -403
View File
File diff suppressed because it is too large Load Diff
+13 -10
View File
@@ -1,18 +1,21 @@
{
"PASSES" : 1,
"STOP" : [ 1.0 ],
"STOP" : [ ],
"DIAGS" : [ "phi", "theta", "tilt", "x", "y", "z" ],
"PRE_ACTIONS" : {
"id_mode" : "OFF",
"grating" : "G1 300",
"scienta.passEnergyDev" : "20",
"scienta.passEnergyDev" : "50",
"scienta.acquisitionModeDev" : "Fixed",
"scienta.energyModeDev" : "Kinetic",
"scienta.lensModeDev" : "DA7_08",
"scienta.detectorModeDev" : "ADC",
"scienta.lowEnergy" : 14.0,
"scienta.centerEnergy" : 14.5,
"scienta.lowEnergy" : 10.0,
"scienta.centerEnergy" : 12.0,
"scienta.highEnergy" : 15.0,
"scienta.energyStepSize" : 0.005,
"scienta.lowThetaY" : 2.0,
"scienta.centerThetaY" : 4.0,
"scienta.highThetaY" : 6.0,
"scienta.thetaYStepSize" : 0.1,
"scienta.centerThetaX" : 0.0,
"scienta.slices" : 601,
"scienta.channels" : 801
@@ -22,9 +25,9 @@
"ZIGZAG" : false,
"SETTLING_TIME" : 0.0,
"MONITORS" : [ "current" ],
"START" : [ 0.0 ],
"RANGE" : [ 900, 100, 800, 200 ],
"POSITIONERS" : [ "tilt" ],
"STEPS" : [ 10 ],
"START" : [ ],
"RANGE" : [ null, null, null, null ],
"POSITIONERS" : [ ],
"STEPS" : [ ],
"SNAPS" : [ "acmi", "cff", "energy", "exit_slit", "fe_horiz_width", "fe_vert_width", "helium_valve", "master", "pgm_cff", "photon_energy", "tcmp", "temp_boot1", "temp_boot2", "temp_cryopump", "temp_cryostat", "temp_headmech", "temp_sample1", "temp_sample2", "temp_shield" ]
}