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

Closedown

Browse Source
This commit is contained in:
X11MA
2016-02-04 16:32:24 +01:00
parent 659bae21b3
commit b95805ca8b
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/devices.properties
View File

@@ -1,7 +1,7 @@
MCPArray1=ch.psi.pshell.epics.ChannelDoubleArray|X11MA-ES4:PHC-CTRWF1|Read||true
MCPArray1=ch.psi.pshell.epics.ChannelIntegerArray|X11MA-ES4:PHC-CTRWF1|Read||true
SamplingTime=ch.psi.pshell.epics.ChannelDouble|X11MA-ES4:SAMPLE-TIME|Read||true
MCPArray2=ch.psi.pshell.epics.ChannelDoubleArray|X11MA-ES4:PHC-CTRWF2|Read||true
NrCounters=ch.psi.pshell.epics.ChannelDouble|X11MA-ES4:NCTR|Read||true
MCPArray2=ch.psi.pshell.epics.ChannelIntegerArray|X11MA-ES4:PHC-CTRWF2|Read||true
NrCounters=ch.psi.pshell.epics.ChannelInteger|X11MA-ES4:NCTR|Read||true
energy=ch.psi.pshell.epics.ChannelDouble|X11MA-PGM:rbkenergy|Read||true
keithley_1a=ch.psi.pshell.epics.ChannelDouble|X11MA-ES1:CADC1|Read||true
keithley_2a=ch.psi.pshell.epics.ChannelDouble|X11MA-ES1:CADC2|Read||true

12
plugins/EnergyScan.form
View File

@@ -347,7 +347,7 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="jSpinner1" pref="54" max="32767" attributes="0"/>
<Component id="jSpinner1" max="32767" attributes="0"/>
<Component id="jSpinner2" max="32767" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
@@ -490,8 +490,18 @@
</Properties>
</Component>
<Component class="javax.swing.JSpinner" name="jSpinner1">
<Properties>
<Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
<SpinnerModel initial="0" maximum="1000" minimum="0" numberType="java.lang.Integer" stepSize="1" type="number"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JSpinner" name="jSpinner2">
<Properties>
<Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
<SpinnerModel initial="0" maximum="1000" minimum="0" numberType="java.lang.Integer" stepSize="1" type="number"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel9">
<Properties>

6
plugins/EnergyScan.java
View File

@@ -420,6 +420,10 @@ public class EnergyScan extends Panel {
jLabel7.setText("Save MCP data");
jSpinner1.setModel(new javax.swing.SpinnerNumberModel(0, 0, 1000, 1));
jSpinner2.setModel(new javax.swing.SpinnerNumberModel(0, 0, 1000, 1));
jLabel9.setText("start");
jLabel14.setText("end");
@@ -454,7 +458,7 @@ public class EnergyScan extends Panel {
.addComponent(jLabel14))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(jSpinner1, javax.swing.GroupLayout.DEFAULT_SIZE, 54, Short.MAX_VALUE)
.addComponent(jSpinner1)
.addComponent(jSpinner2))
.addGap(18, 18, 18)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)