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

Closedown

Browse Source
This commit is contained in:
x03daop
2015-11-02 12:07:36 +01:00
parent 49dc30ce17
commit cd46b12f17
15 changed files with 488 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+76 -20
View File
@@ -1,27 +1,83 @@
#det=ch.psi.pshell.epics.AreaDetector X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1
scienta=ch.psi.pshell.epics.Scienta X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1
manip=ch.psi.pshell.epics.Manipulator
$eph=ch.psi.pshell.epics.Positionable X03DA-PHS-E:GO.A X03DA-PGM:rbkenergy
x=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRX
y=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRY
z=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRZ
theta=ch.psi.pshell.epics.Motor X03DA-ES2-MA:THT
tilt=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TLT
phi=ch.psi.pshell.epics.Motor X03DA-ES2-MA:PHI
Scienta=ch.psi.pshell.epics.Scienta X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1
Manip=ch.psi.pshell.epics.Manipulator
$Eph=ch.psi.pshell.epics.Positionable X03DA-PHS-E:GO.A X03DA-PGM:rbkenergy
ManipulatorX=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRX
ManipulatorY=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRY
ManipulatorZ=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRZ
ManipulatorTheta=ch.psi.pshell.epics.Motor X03DA-ES2-MA:THT
ManipulatorTilt=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TLT
ManipulatorPhi=ch.psi.pshell.epics.Motor X03DA-ES2-MA:PHI
$dummy=ch.psi.pshell.epics.Motor XXX
sctrg=ch.psi.pshell.epics.ChannelInteger X03DA-SCIENTA:cam1:Acquire
adctrg=ch.psi.pshell.epics.ChannelInteger X03DA-OP-10ADC:TRG
current=ch.psi.pshell.epics.ChannelDouble ARIDI-PCT:CURRENT Read 3
cur1=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CURRENT1 Read 12
cur2=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CURRENT2 Read 12
cur3=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CURRENT3 Read 12
counts=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats5:Total_RBV Read 3
countsr1=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats1:Total_RBV Read 3
countsr2=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats2:Total_RBV Read 3
countsr3=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats3:Total_RBV Read 3
countsr4=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats4:Total_RBV Read 3
#sctrg=ch.psi.pshell.epics.ChannelInteger X03DA-SCIENTA:cam1:Acquire
#adctrg=ch.psi.pshell.epics.ChannelInteger X03DA-OP-10ADC:TRG
MachineCurrent=ch.psi.pshell.epics.ChannelDouble ARIDI-PCT:CURRENT Read 3
SampleCurrent=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CURRENT1 Read 12
RefCurrent=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CURRENT2 Read 12
AuxCurrent=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CURRENT3 Read 12
Counts=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats5:Total_RBV Read 3
CountsR1=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats1:Total_RBV Read 3
CountsR2=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats2:Total_RBV Read 3
CountsR3=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats3:Total_RBV Read 3
CountsR4=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats4:Total_RBV Read 3
#sizex=ch.psi.pshell.epics.ChannelInteger X03DA-SCIENTA:cam1:SizeX_RBV
#lowen=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:LOW_ENERGY 6
#highen=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:HIGH_ENERGY 6
MachineBumpXOffset=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:X-SYM Read
MachineBumpXAngle=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:X-ASYM Read
MachineBumpYOffset=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:Y-SYM Read
MachineBumpYAngle=ch.psi.pshell.epics.ChannelDouble X03DA-LBB:Y-ASYM Read
DynamicBumpYOffset=ch.psi.pshell.epics.ChannelDouble X03DA-DBB:Y-SYM Read
DynamicBumpYAngle=ch.psi.pshell.epics.ChannelDouble X03DA-DBB:Y-ASYM Read
FrontendVCenter=ch.psi.pshell.epics.ChannelDouble X03DA-FE-SV:ctr Read
FrontendVSize=ch.psi.pshell.epics.ChannelDouble X03DA-FE-SV:size Read
FrontendHCenter=ch.psi.pshell.epics.ChannelDouble X03DA-FE-SH:ctr Read
FrontendHSize=ch.psi.pshell.epics.ChannelDouble X03DA-FE-SH:size Read
MonoVCenter=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SV:ctr Read
MonoVSize=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SV:size Read
MonoBladeDown=ch.psi.pshell.epics.ChannelDouble X03DA-AU:DW Read
MonoBladeUp=ch.psi.pshell.epics.ChannelDouble X03DA-AU:UP Read
MonoHCenter=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SH:ctr Read
MonoHSize=ch.psi.pshell.epics.ChannelDouble 03DA-AU-SH:size Read
MonoApertureMode=ch.psi.pshell.epics.ChannelDouble X03DA-PHS:AU Read
RefocusVCenter=ch.psi.pshell.epics.ChannelDouble X03DA-RMU-SV:ctr Read
RefocusVSize=ch.psi.pshell.epics.ChannelDouble X03DA-RMU-SV:size Read
RefocusHCenter=ch.psi.pshell.epics.ChannelDouble X03DA-RMU-SH:ctr Read
RefocusHSize=ch.psi.pshell.epics.ChannelDouble X03DA-RMU-SH:size Read
FocusYTrans=ch.psi.pshell.epics.ChannelDouble X03DA-OP-FMU:oy Read
FocusZTrans=ch.psi.pshell.epics.ChannelDouble X03DA-OP-FMU:oz Read
FocusXRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-FMU:oRx Read
FocusYRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-FMU:oRy Read
FocusZRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-FMU:oRz Read
RefocusYTrans=ch.psi.pshell.epics.ChannelDouble "X03DA-OP-RMU:oy))
RefocusZTrans=ch.psi.pshell.epics.ChannelDouble X03DA-OP-RMU:oz Read
RefocusXRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-RMU:oRx Read
RefocusYRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-RMU:oRy Read
RefocusZRot=ch.psi.pshell.epics.ChannelDouble X03DA-OP-RMU:oRz Read
MonoEnergy=ch.psi.pshell.epics.ChannelDouble X03DA-PGM:CERBK Read
MonoCff=ch.psi.pshell.epics.ChannelDouble X03DA-PGM:rbkcff Read
MonoBeta=ch.psi.pshell.epics.ChannelDouble X03DA-PGM:rbkbeta Read
MonoTheta=ch.psi.pshell.epics.ChannelDouble X03DA-PGM:rbktheta Read
ExitSlit=ch.psi.pshell.epics.ChannelDouble X03DA-OP-EXS:AP Read
FocusWaterTemp=ch.psi.pshell.epics.ChannelDouble X03DA-PC-HUBER:TEMP-I-RBV Read
AuxVoltage=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CADC4 Read
SampleCurrentGain=ch.psi.pshell.epics.ChannelString X03DA-OP-CURAMP1:GainSel Read
RefCurrentGain=ch.psi.pshell.epics.ChannelString X03DA-OP-CURAMP2:GainSel Read
AuxCurrentGain=ch.psi.pshell.epics.ChannelString X03DA-OP-CURAMP3:GainSel Read
SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CADC1.N Read
RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CADC2.N Read
AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CADC3.N Read
AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble X03DA-OP:CADC4.N Read
SampleCurrentSampling=ch.psi.pshell.epics.ChannelDouble X03DA-OP-ADC1:Vraw.SCAN Read
RefCurrentSampling=ch.psi.pshell.epics.ChannelString X03DA-OP-ADC2:Vraw.SCAN Read
AuxCurrentSampling=ch.psi.pshell.epics.ChannelString X03DA-OP-ADC3:Vraw.SCAN Read
AuxVoltageSampling=ch.psi.pshell.epics.ChannelString X03DA-OP-ADC4:Vraw.SCAN")
ChamberPressure=ch.psi.pshell.epics.ChannelString X03DA-PVC-XA:IG-PRESSURE Read
BeamlinePressure=ch.psi.pshell.epics.ChannelDouble X03DA-PVC-XA:IG-PRESSURE Read
ManipulatorTempA=ch.psi.pshell.epics.ChannelDouble X03DA-PC-LAKESHORE:A-TEMP_RBV Read
ManipulatorTempB=ch.psi.pshell.epics.ChannelDouble X03DA-PC-LAKESHORE:A-TEMP_RBV Read
ManipulatorCoolFlow=ch.psi.pshell.epics.ChannelDouble X03DA-PC-BRONKHORST:GET-MEASURE Read
ManipulatorCoolFlowSet=ch.psi.pshell.epics.ChannelDouble X03DA-PC-BRONKHORST:GET-SETPOINT Read
ps1=ch.psi.pshell.epics.AreaDetector X03DA-ES-PS1:cam1 X03DA-ES-PS1:image1
op-ps1=ch.psi.pshell.epics.AreaDetector X03DA-OP-PS1:cam1 X03DA-OP-PS1:image1
config/update.properties
+21 -21
View File
@@ -1,30 +1,30 @@
det=
scienta=monitored
manip=monitored
eph=monitored
x=monitored
y=monitored
z=monitored
theta=monitored
tilt=monitored
phi=monitored
Det=
Scienta=monitored
Manip=monitored
Eph=monitored
ManipulatorX=monitored
ManipulatorY=monitored
ManipulatorZ=monitored
ManipulatorTheta=monitored
ManipulatorYilt=monitored
ManipulatorPhi=monitored
dummy=monitored
sctrg=monitored
ctrg=monitored
adctrg=monitored
current=monitored
cur1=monitored
cur2=monitored
cur3=monitored
counts=
countsr1=
countsr2=
countsr3=
countsr4=
MachineCurrent=monitored
SampleCurrent=monitored
RefCurrent=monitored
AuxCurrent=monitored
Counts=
CountsR1=
CountsR2=
CountsR3=
CountsR4=
sizex=
lowen=
highen=
ps1=
op-ps1=
scienta.data=monitored
Scienta.data=monitored
ps1.data=
op-ps1.data=
plugins/HoloScan.form
+16 -16
View File
@@ -482,7 +482,7 @@
<Property name="text" type="java.lang.String" value="Scienta Image"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="scienta.dataMatrix" noResource="true"/>
<Property name="name" type="java.lang.String" value="Scienta.dataMatrix" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImageIntegration">
@@ -491,69 +491,69 @@
<Property name="text" type="java.lang.String" value="Scienta Image Integration"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="integration" noResource="true"/>
<Property name="name" type="java.lang.String" value="Integration" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Spectrum"/>
<Property name="name" type="java.lang.String" value="scienta.spectrum" noResource="true"/>
<Property name="name" type="java.lang.String" value="Scienta.spectrum" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts1">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 1"/>
<Property name="name" type="java.lang.String" value="countsr1" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR1" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkTotalCount">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Total Counts"/>
<Property name="name" type="java.lang.String" value="counts" noResource="true"/>
<Property name="name" type="java.lang.String" value="Counts" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts2">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 2"/>
<Property name="name" type="java.lang.String" value="countsr2" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR2" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts3">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 3"/>
<Property name="name" type="java.lang.String" value="countsr3" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR3" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts4">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 4"/>
<Property name="name" type="java.lang.String" value="countsr4" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR4" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCurrent">
<Properties>
<Property name="text" type="java.lang.String" value="Current"/>
<Property name="name" type="java.lang.String" value="current" noResource="true"/>
<Property name="text" type="java.lang.String" value="MachineCurrent"/>
<Property name="name" type="java.lang.String" value="MachineCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur1">
<Properties>
<Property name="text" type="java.lang.String" value="Cur 1"/>
<Property name="name" type="java.lang.String" value="cur1" noResource="true"/>
<Property name="text" type="java.lang.String" value="SampleCurrent"/>
<Property name="name" type="java.lang.String" value="SampleCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur2">
<Properties>
<Property name="text" type="java.lang.String" value="Cur 2"/>
<Property name="name" type="java.lang.String" value="cur2" noResource="true"/>
<Property name="text" type="java.lang.String" value="RefCurrent"/>
<Property name="name" type="java.lang.String" value="RefCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur3">
<Properties>
<Property name="text" type="java.lang.String" value="Cur 3"/>
<Property name="name" type="java.lang.String" value="cur3" noResource="true"/>
<Property name="text" type="java.lang.String" value="AuxCurrent"/>
<Property name="name" type="java.lang.String" value="AuxCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="buttonScientaSetup">
plugins/HoloScan.java
+18 -18
View File
@@ -379,45 +379,45 @@ public class HoloScan extends Panel {
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("scienta.dataMatrix"); // NOI18N
checkImage.setName("Scienta.dataMatrix"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Image Integration");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("integration"); // NOI18N
checkImageIntegration.setName("Integration"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("scienta.spectrum"); // NOI18N
checkSpectrum.setName("Scienta.spectrum"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("countsr1"); // NOI18N
checkCounts1.setName("CountsR1"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("counts"); // NOI18N
checkTotalCount.setName("Counts"); // NOI18N
checkCounts2.setText("Counts Region 2");
checkCounts2.setName("countsr2"); // NOI18N
checkCounts2.setName("CountsR2"); // NOI18N
checkCounts3.setText("Counts Region 3");
checkCounts3.setName("countsr3"); // NOI18N
checkCounts3.setName("CountsR3"); // NOI18N
checkCounts4.setText("Counts Region 4");
checkCounts4.setName("countsr4"); // NOI18N
checkCounts4.setName("CountsR4"); // NOI18N
checkCurrent.setText("Current");
checkCurrent.setName("current"); // NOI18N
checkCurrent.setText("MachineCurrent");
checkCurrent.setName("MachineCurrent"); // NOI18N
checkCur1.setText("Cur 1");
checkCur1.setName("cur1"); // NOI18N
checkCur1.setText("SampleCurrent");
checkCur1.setName("SampleCurrent"); // NOI18N
checkCur2.setText("Cur 2");
checkCur2.setName("cur2"); // NOI18N
checkCur2.setText("RefCurrent");
checkCur2.setName("RefCurrent"); // NOI18N
checkCur3.setText("Cur 3");
checkCur3.setName("cur3"); // NOI18N
checkCur3.setText("AuxCurrent");
checkCur3.setName("AuxCurrent"); // NOI18N
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
@@ -551,7 +551,7 @@ public class HoloScan extends Panel {
private void buttonScientaSetupActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScientaSetupActionPerformed
try{
showDevicePanel("scienta");
showDevicePanel("Scienta");
} catch (Exception ex){
SwingUtils.showException(this, ex);
}
@@ -568,7 +568,7 @@ public class HoloScan extends Panel {
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
try {
abort();
((Scienta) getDevice("scienta")).stop();
((Scienta) getDevice("Scienta")).stop();
} catch (Exception ex) {
showException(ex);
}
plugins/ManipulatorScan.form
+50 -50
View File
@@ -77,7 +77,7 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="41" max="32767" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="spinnerLatency" linkSize="4" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
@@ -188,12 +188,12 @@
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="7">
<StringItem index="0" value="dummy"/>
<StringItem index="1" value="x"/>
<StringItem index="2" value="y"/>
<StringItem index="3" value="z"/>
<StringItem index="4" value="theta"/>
<StringItem index="5" value="tilt"/>
<StringItem index="6" value="phi"/>
<StringItem index="1" value="ManipulatorX"/>
<StringItem index="2" value="ManipulatorY"/>
<StringItem index="3" value="ManipulatorZ"/>
<StringItem index="4" value="ManipulatorTheta"/>
<StringItem index="5" value="ManipulatorTilt"/>
<StringItem index="6" value="ManipulatorPhi"/>
</StringArray>
</Property>
</Properties>
@@ -342,11 +342,11 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonScientaSetup" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="buttonScientaSetup" pref="212" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="checkImage" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkImageIntegration" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -355,13 +355,13 @@
<Component id="checkTotalCount" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="14" max="32767" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -397,19 +397,45 @@
<Component id="checkCur3" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JButton" name="buttonScientaSetup">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Setup"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur1">
<Properties>
<Property name="text" type="java.lang.String" value="SampleCurrent"/>
<Property name="name" type="java.lang.String" value="SampleCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur2">
<Properties>
<Property name="text" type="java.lang.String" value="RefCurrent"/>
<Property name="name" type="java.lang.String" value="RefCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImage">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Image"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="scienta.dataMatrix" noResource="true"/>
<Property name="name" type="java.lang.String" value="Scienta.dataMatrix" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur3">
<Properties>
<Property name="text" type="java.lang.String" value="AuxCurrent"/>
<Property name="name" type="java.lang.String" value="AuxCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImageIntegration">
@@ -418,79 +444,53 @@
<Property name="text" type="java.lang.String" value="Scienta Image Integration"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="integration" noResource="true"/>
<Property name="name" type="java.lang.String" value="Integration" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Spectrum"/>
<Property name="name" type="java.lang.String" value="scienta.spectrum" noResource="true"/>
<Property name="name" type="java.lang.String" value="Scienta.spectrum" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts1">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 1"/>
<Property name="name" type="java.lang.String" value="countsr1" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR1" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkTotalCount">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Total Counts"/>
<Property name="name" type="java.lang.String" value="counts" noResource="true"/>
<Property name="name" type="java.lang.String" value="Counts" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts2">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 2"/>
<Property name="name" type="java.lang.String" value="countsr2" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR2" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts3">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 3"/>
<Property name="name" type="java.lang.String" value="countsr3" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR3" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts4">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 4"/>
<Property name="name" type="java.lang.String" value="countsr4" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR4" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCurrent">
<Properties>
<Property name="text" type="java.lang.String" value="Current"/>
<Property name="name" type="java.lang.String" value="current" noResource="true"/>
<Property name="text" type="java.lang.String" value="MachineCurrent"/>
<Property name="name" type="java.lang.String" value="MachineCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur1">
<Properties>
<Property name="text" type="java.lang.String" value="Cur 1"/>
<Property name="name" type="java.lang.String" value="cur1" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur2">
<Properties>
<Property name="text" type="java.lang.String" value="Cur 2"/>
<Property name="name" type="java.lang.String" value="cur2" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur3">
<Properties>
<Property name="text" type="java.lang.String" value="Cur 3"/>
<Property name="name" type="java.lang.String" value="cur3" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="buttonScientaSetup">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Setup"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">
@@ -509,7 +509,7 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonStart" max="32767" attributes="0"/>
<Component id="buttonAbort" pref="203" max="32767" attributes="0"/>
<Component id="buttonAbort" pref="212" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
plugins/ManipulatorScan.java
+58 -58
View File
@@ -150,7 +150,11 @@ public class ManipulatorScan extends Panel {
jLabel7 = new javax.swing.JLabel();
jLabel8 = new javax.swing.JLabel();
panelSensors = new javax.swing.JPanel();
buttonScientaSetup = new javax.swing.JButton();
checkCur1 = new javax.swing.JCheckBox();
checkCur2 = new javax.swing.JCheckBox();
checkImage = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
checkImageIntegration = new javax.swing.JCheckBox();
checkSpectrum = new javax.swing.JCheckBox();
checkCounts1 = new javax.swing.JCheckBox();
@@ -159,10 +163,6 @@ public class ManipulatorScan extends Panel {
checkCounts3 = new javax.swing.JCheckBox();
checkCounts4 = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
checkCur1 = new javax.swing.JCheckBox();
checkCur2 = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
buttonScientaSetup = new javax.swing.JButton();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -171,7 +171,7 @@ public class ManipulatorScan extends Panel {
jLabel1.setText("Motor:");
comboMotor.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "dummy", "x", "y", "z", "theta", "tilt", "phi" }));
comboMotor.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "dummy", "ManipulatorX", "ManipulatorY", "ManipulatorZ", "ManipulatorTheta", "ManipulatorTilt", "ManipulatorPhi" }));
comboMotor.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
comboMotorActionPerformed(evt);
@@ -258,7 +258,7 @@ public class ManipulatorScan extends Panel {
.addComponent(comboMotor, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addGroup(panelPositionerLayout.createSequentialGroup()
.addComponent(jLabel3)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 41, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(panelPositionerLayout.createSequentialGroup()
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -340,50 +340,6 @@ public class ManipulatorScan extends Panel {
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
checkImage.setSelected(true);
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("scienta.dataMatrix"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Image Integration");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("integration"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("scienta.spectrum"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("countsr1"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("counts"); // NOI18N
checkCounts2.setText("Counts Region 2");
checkCounts2.setName("countsr2"); // NOI18N
checkCounts3.setText("Counts Region 3");
checkCounts3.setName("countsr3"); // NOI18N
checkCounts4.setText("Counts Region 4");
checkCounts4.setName("countsr4"); // NOI18N
checkCurrent.setText("Current");
checkCurrent.setName("current"); // NOI18N
checkCur1.setText("Cur 1");
checkCur1.setName("cur1"); // NOI18N
checkCur2.setText("Cur 2");
checkCur2.setName("cur2"); // NOI18N
checkCur3.setText("Cur 3");
checkCur3.setName("cur3"); // NOI18N
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -391,6 +347,50 @@ public class ManipulatorScan extends Panel {
}
});
checkCur1.setText("SampleCurrent");
checkCur1.setName("SampleCurrent"); // NOI18N
checkCur2.setText("RefCurrent");
checkCur2.setName("RefCurrent"); // NOI18N
checkImage.setSelected(true);
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("Scienta.dataMatrix"); // NOI18N
checkCur3.setText("AuxCurrent");
checkCur3.setName("AuxCurrent"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Image Integration");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("Integration"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("Scienta.spectrum"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCounts2.setText("Counts Region 2");
checkCounts2.setName("CountsR2"); // NOI18N
checkCounts3.setText("Counts Region 3");
checkCounts3.setName("CountsR3"); // NOI18N
checkCounts4.setText("Counts Region 4");
checkCounts4.setName("CountsR4"); // NOI18N
checkCurrent.setText("MachineCurrent");
checkCurrent.setName("MachineCurrent"); // NOI18N
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);
panelSensorsLayout.setHorizontalGroup(
@@ -398,7 +398,7 @@ public class ManipulatorScan extends Panel {
.addGroup(panelSensorsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE)
.addGroup(panelSensorsLayout.createSequentialGroup()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkImage)
@@ -408,12 +408,12 @@ public class ManipulatorScan extends Panel {
.addComponent(checkTotalCount)
.addComponent(checkCounts2)
.addComponent(checkCounts3)
.addComponent(checkCounts4)
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkCounts4))
.addGap(0, 14, Short.MAX_VALUE)))
.addComponent(checkCur3))
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
panelSensorsLayout.setVerticalGroup(
@@ -445,7 +445,7 @@ public class ManipulatorScan extends Panel {
.addComponent(checkCur3)
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(buttonScientaSetup)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGap(26, 26, 26))
);
jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
@@ -472,7 +472,7 @@ public class ManipulatorScan extends Panel {
.addContainerGap()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 203, Short.MAX_VALUE))
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE))
.addContainerGap())
);
jPanel3Layout.setVerticalGroup(
@@ -515,7 +515,7 @@ public class ManipulatorScan extends Panel {
private void buttonScientaSetupActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScientaSetupActionPerformed
try {
showDevicePanel("scienta");
showDevicePanel("Scienta");
} catch (Exception ex) {
SwingUtils.showException(this, ex);
}
@@ -532,7 +532,7 @@ public class ManipulatorScan extends Panel {
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
try {
abort();
((Scienta) getDevice("scienta")).stop();
((Scienta) getDevice("Scienta")).stop();
} catch (Exception ex) {
showException(ex);
}
plugins/PhotonEnergy.form
+44 -44
View File
@@ -160,7 +160,7 @@
<Component id="spinnerStep" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="0" max="32767" attributes="0"/>
<Component id="jScrollPane1" pref="90" max="32767" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -353,11 +353,11 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonScientaSetup" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="buttonScientaSetup" pref="241" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="checkImage" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkImageIntegration" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -366,13 +366,13 @@
<Component id="checkTotalCount" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCurrent" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkCounts4" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="52" max="32767" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -406,21 +406,47 @@
<Component id="checkCur2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkCur3" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" pref="65" max="32767" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="58" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="84" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JButton" name="buttonScientaSetup">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Setup"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur1">
<Properties>
<Property name="text" type="java.lang.String" value="SampleCurrent"/>
<Property name="name" type="java.lang.String" value="SampleCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur2">
<Properties>
<Property name="text" type="java.lang.String" value="RefCurrent"/>
<Property name="name" type="java.lang.String" value="RefCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImage">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Image"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="det.dataMatrix" noResource="true"/>
<Property name="name" type="java.lang.String" value="Scienta.dataMatrix" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur3">
<Properties>
<Property name="text" type="java.lang.String" value="AuxCurrent"/>
<Property name="name" type="java.lang.String" value="AuxCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkImageIntegration">
@@ -429,79 +455,53 @@
<Property name="text" type="java.lang.String" value="Scienta Image Integration"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="integration" noResource="true"/>
<Property name="name" type="java.lang.String" value="Integration" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Spectrum"/>
<Property name="name" type="java.lang.String" value="scienta.spectrum" noResource="true"/>
<Property name="name" type="java.lang.String" value="Scienta.spectrum" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts1">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 1"/>
<Property name="name" type="java.lang.String" value="countsr1" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR1" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkTotalCount">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Total Counts"/>
<Property name="name" type="java.lang.String" value="sinp" noResource="true"/>
<Property name="name" type="java.lang.String" value="Counts" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts2">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 2"/>
<Property name="name" type="java.lang.String" value="countsr2" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR2" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts3">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 3"/>
<Property name="name" type="java.lang.String" value="countsr3" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR3" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCounts4">
<Properties>
<Property name="text" type="java.lang.String" value="Counts Region 4"/>
<Property name="name" type="java.lang.String" value="countsr4" noResource="true"/>
<Property name="name" type="java.lang.String" value="CountsR4" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCurrent">
<Properties>
<Property name="text" type="java.lang.String" value="Current"/>
<Property name="name" type="java.lang.String" value="current" noResource="true"/>
<Property name="text" type="java.lang.String" value="MachineCurrent"/>
<Property name="name" type="java.lang.String" value="MachineCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur1">
<Properties>
<Property name="text" type="java.lang.String" value="Cur 1"/>
<Property name="name" type="java.lang.String" value="cur1" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur2">
<Properties>
<Property name="text" type="java.lang.String" value="Cur 2"/>
<Property name="name" type="java.lang.String" value="cur2" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkCur3">
<Properties>
<Property name="text" type="java.lang.String" value="Cur 3"/>
<Property name="name" type="java.lang.String" value="cur3" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="buttonScientaSetup">
<Properties>
<Property name="text" type="java.lang.String" value="Scienta Setup"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">
plugins/PhotonEnergy.java
+58 -58
View File
@@ -191,7 +191,11 @@ public class PhotonEnergy extends Panel {
jLabel9 = new javax.swing.JLabel();
spinnerHigh = new javax.swing.JSpinner();
panelSensors = new javax.swing.JPanel();
buttonScientaSetup = new javax.swing.JButton();
checkCur1 = new javax.swing.JCheckBox();
checkCur2 = new javax.swing.JCheckBox();
checkImage = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
checkImageIntegration = new javax.swing.JCheckBox();
checkSpectrum = new javax.swing.JCheckBox();
checkCounts1 = new javax.swing.JCheckBox();
@@ -200,10 +204,6 @@ public class PhotonEnergy extends Panel {
checkCounts3 = new javax.swing.JCheckBox();
checkCounts4 = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
checkCur1 = new javax.swing.JCheckBox();
checkCur2 = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
buttonScientaSetup = new javax.swing.JButton();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -324,7 +324,7 @@ public class PhotonEnergy extends Panel {
.addComponent(radioCfs, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPositionerLayout.createSequentialGroup()
.addComponent(jLabel4)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 90, Short.MAX_VALUE)
.addComponent(spinnerStart, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(panelPositionerLayout.createSequentialGroup()
.addComponent(jLabel5)
@@ -399,7 +399,7 @@ public class PhotonEnergy extends Panel {
.addComponent(jLabel6)
.addComponent(spinnerStep, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel3)
@@ -409,50 +409,6 @@ public class PhotonEnergy extends Panel {
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
checkImage.setSelected(true);
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("det.dataMatrix"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Image Integration");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("integration"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("scienta.spectrum"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("countsr1"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("sinp"); // NOI18N
checkCounts2.setText("Counts Region 2");
checkCounts2.setName("countsr2"); // NOI18N
checkCounts3.setText("Counts Region 3");
checkCounts3.setName("countsr3"); // NOI18N
checkCounts4.setText("Counts Region 4");
checkCounts4.setName("countsr4"); // NOI18N
checkCurrent.setText("Current");
checkCurrent.setName("current"); // NOI18N
checkCur1.setText("Cur 1");
checkCur1.setName("cur1"); // NOI18N
checkCur2.setText("Cur 2");
checkCur2.setName("cur2"); // NOI18N
checkCur3.setText("Cur 3");
checkCur3.setName("cur3"); // NOI18N
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -460,6 +416,50 @@ public class PhotonEnergy extends Panel {
}
});
checkCur1.setText("SampleCurrent");
checkCur1.setName("SampleCurrent"); // NOI18N
checkCur2.setText("RefCurrent");
checkCur2.setName("RefCurrent"); // NOI18N
checkImage.setSelected(true);
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("Scienta.dataMatrix"); // NOI18N
checkCur3.setText("AuxCurrent");
checkCur3.setName("AuxCurrent"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Image Integration");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("Integration"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("Scienta.spectrum"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCounts2.setText("Counts Region 2");
checkCounts2.setName("CountsR2"); // NOI18N
checkCounts3.setText("Counts Region 3");
checkCounts3.setName("CountsR3"); // NOI18N
checkCounts4.setText("Counts Region 4");
checkCounts4.setName("CountsR4"); // NOI18N
checkCurrent.setText("MachineCurrent");
checkCurrent.setName("MachineCurrent"); // NOI18N
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);
panelSensorsLayout.setHorizontalGroup(
@@ -467,7 +467,7 @@ public class PhotonEnergy extends Panel {
.addGroup(panelSensorsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE)
.addGroup(panelSensorsLayout.createSequentialGroup()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(checkImage)
@@ -477,12 +477,12 @@ public class PhotonEnergy extends Panel {
.addComponent(checkTotalCount)
.addComponent(checkCounts2)
.addComponent(checkCounts3)
.addComponent(checkCounts4)
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkCounts4))
.addGap(0, 52, Short.MAX_VALUE)))
.addComponent(checkCur3))
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
panelSensorsLayout.setVerticalGroup(
@@ -512,9 +512,9 @@ public class PhotonEnergy extends Panel {
.addComponent(checkCur2)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkCur3)
.addGap(18, 65, Short.MAX_VALUE)
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(buttonScientaSetup)
.addContainerGap(58, Short.MAX_VALUE))
.addGap(84, 84, 84))
);
jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
@@ -541,7 +541,7 @@ public class PhotonEnergy extends Panel {
.addContainerGap()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 203, Short.MAX_VALUE))
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE))
.addContainerGap())
);
jPanel3Layout.setVerticalGroup(
@@ -584,7 +584,7 @@ public class PhotonEnergy extends Panel {
private void buttonScientaSetupActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScientaSetupActionPerformed
try {
showDevicePanel("scienta");
showDevicePanel("Scienta");
} catch (Exception ex) {
SwingUtils.showException(this, ex);
}
plugins/XPSSpectrum.java
+2 -2
View File
@@ -66,7 +66,7 @@ public class XPSSpectrum extends Panel {
@Override
public void onInitialize(int runCount) {
scienta = (Scienta) getDevice("scienta");
scienta = (Scienta) getDevice("Scienta");
scienta.getTotalChannels().addListener(progressListener);
scienta.getCurrentChannel().addListener(progressListener);
}
@@ -583,7 +583,7 @@ public class XPSSpectrum extends Panel {
private void buttonScientaSetupActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScientaSetupActionPerformed
try{
showDevicePanel("scienta");
showDevicePanel("Scienta");
} catch (Exception ex){
SwingUtils.showException(this, ex);
}
script/HoloScan.py
+2 -2
View File
@@ -10,6 +10,6 @@ RELATIVE (BOOLEAN)
"""
#set_preference(Preference.ENABLED_PLOTS, [phi, theta, scienta.dataMatrix, integration])
set_preference(Preference.PLOT_TYPES, {integration:1})
#set_preference(Preference.ENABLED_PLOTS, [ManipulatorPhi, ManipulatorTheta, Scienta.dataMatrix, Integration])
set_preference(Preference.PLOT_TYPES, {Integration:1})
ascan((phi, theta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, before_read=trig_scienta)
script/ManipulatorScan.py
+1 -1
View File
@@ -10,5 +10,5 @@ RELATIVE (BOOLEAN)
"""
set_preference(Preference.PLOT_TYPES,{'integration':1});
set_preference(Preference.PLOT_TYPES,{'Integration':1});
lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta)
script/PhotonEnergy.py
+4 -4
View File
@@ -1,18 +1,18 @@
"""
Arguments:
VECTOR (Double[][], Scan verctor: Eph,Elow,Ehigh or Eph,Ecenter)
VECTOR (Double[][], Scan vector: Eph,Elow,Ehigh or Eph,Ecenter)
SENSORS (list)
LATENCY (double)
"""
set_preference(Preference.PLOT_TYPES,{'integration':1});
set_preference(Preference.PLOT_TYPES,{'Integration':1});
if len(VECTOR[0]) == 2:
#FIXED
writables = (eph, scienta.centerEnergy)
writables = (Eph, Scienta.centerEnergy)
else:
#SWEPT
writables = (eph, scienta.lowEnergy, scienta.highEnergy)
writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy)
vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta)
script/XPSSpectrum.py
+14 -14
View File
@@ -9,13 +9,13 @@ from ch.psi.pshell.data.ScanPersistenceStrategyDefault import ATTR_WRITABLE_DIME
cur_range = 0
cur_iteration = 0
if scienta.acquisitionMode == scienta.AcquisitionMode.Fixed:
scienta.acquisitionMode = scienta.AcquisitionMode.Swept
if Scienta.acquisitionMode == Scienta.AcquisitionMode.Fixed:
Scienta.acquisitionMode = Scienta.AcquisitionMode.Swept
ret=[]
#Global arguments
scienta.passEnergy = pass_energy
Scienta.passEnergy = pass_energy
names=[]
for i in range(len(ranges)):
@@ -25,14 +25,14 @@ try:
for cur_range in range(len(ranges)):
cur_iteration = 0
skip_iteration = False
scienta.lowEnergy.put(ranges[cur_range].min)
scienta.highEnergy.put(ranges[cur_range].max)
scienta.update()
Scienta.lowEnergy.put(ranges[cur_range].min)
Scienta.highEnergy.put(ranges[cur_range].max)
Scienta.update()
vars = ranges[cur_range].vars
scienta.stepTime.write(vars[0])
scienta.stepSize.write(vars[1])
scienta.setIterations(1)
Scienta.stepTime.write(vars[0])
Scienta.stepSize.write(vars[1])
Scienta.setIterations(1)
#iterations done in script
xdata = None
@@ -40,14 +40,14 @@ try:
for cur_iteration in range(vars[2]):
plots[cur_range].setTitle(str(ranges[cur_range]) + " - iteration " + str(cur_iteration+1))
trig_scienta()
spectrum_array = scienta.spectrum.read()
spectrum_array = Scienta.spectrum.read()
if ydata is None:
ydata = spectrum_array
else:
for k in range (len(spectrum_array)):
ydata[k] = ydata[k] + spectrum_array[k]
if xdata is None:
xdata = scienta.spectrumX
xdata = Scienta.spectrumX
plots[cur_range].getSeries(0).setData(xdata, ydata)
if skip_iteration:
break
@@ -70,7 +70,7 @@ try:
finally:
cur_range = 0
if not scienta.isReady():
scienta.stop()
scienta.update()
if not Scienta.isReady():
Scienta.stop()
Scienta.update()
set_return(to_array(ret,'o'))
script/local.py
+116 -6
View File
@@ -20,9 +20,9 @@ sout = SimulatedOutput()
sinp = SimulatedInput()
def integrate_image():
data = scienta.data.read()
data = Scienta.data.read()
#Integrate and plot
(width,height) = scienta.getImageSize().tolist()
(width,height) = Scienta.getImageSize().tolist()
integration = []
for i in range(width):
p=0.0
@@ -34,15 +34,125 @@ def integrate_image():
class ImageIntegrator(ReadableArray):
def getSize(self):
(width,height) = scienta.getImageSize().tolist()
(width,height) = Scienta.getImageSize().tolist()
return width
def read(self):
return to_array(integrate_image(),'d')
integration = ImageIntegrator()
Integration = ImageIntegrator()
def trig_scienta():
scienta.start()
scienta.waitReady(-1)
Scienta.start()
Scienta.waitReady(-1)
diag_channels = []
diag_channels.append(Scienta.channelBegin) #diag_channels.append(ChannelDouble("ChannelBegin", "X03DA-SCIENTA:cam1:CHANNEL_BEGIN_RBV"))
diag_channels.append(Scienta.channelEnd) #diag_channels.append(ChannelDouble("ChannelEnd", "X03DA-SCIENTA:cam1:CHANNEL_END_RBV"))
diag_channels.append(Scienta.sliceBegin) # diag_channels.append(ChannelDouble("SliceBegin", "X03DA-SCIENTA:cam1:SLICE_BEGIN_RBV"))
diag_channels.append(Scienta.sliceEnd) #diag_channels.append(ChannelDouble("StepTime", "X03DA-SCIENTA:cam1:SLICE_END_RBV"))
diag_channels.append(Scienta.numSlices) # diag_channels.append(ChannelDouble("NumSlices", "X03DA-SCIENTA:cam1:SLICES_RBV"))
diag_channels.append(Scienta.frames) # diag_channels.append(ChannelDouble("NumFrames", "X03DA-SCIENTA:cam1:FRAMES"))
diag_channels.append(Scienta.numChannels) #diag_channels.append(ChannelDouble("NumChannels", "X03DA-SCIENTA:cam1:NUM_CHANNELS_RBV"))
diag_channels.append(Scienta.lowEnergy) #diag_channels.append(ChannelDouble("LowEnergy", "X03DA-SCIENTA:cam1:LOW_ENERGY_RBV"))
diag_channels.append(Scienta.centerEnergy) #diag_channels.append(ChannelDouble("CenterEnergy", "X03DA-SCIENTA:cam1:CENTRE_ENERGY_RBV"))
diag_channels.append(Scienta.highEnergy) #diag_channels.append(ChannelDouble("HighEnergy", "X03DA-SCIENTA:cam1:HIGH_ENERGY_RBV"))
#TODO: These are not of Scienta device interface. Should be included?
#diag_channels.append(ChannelDouble("AcquisitionModeNum", "X03DA-SCIENTA:cam1:ACQ_MODE_RBV"))
#diag_channels.append(ChannelDouble("EnergyModeNum", "X03DA-SCIENTA:cam1:ENERGY_MODE_RBV"))
#diag_channels.append(ChannelDouble("LensModeNum", "X03DA-SCIENTA:cam1:LENS_MODE_RBV"))
#diag_channels.append(ChannelDouble("DetectorModeNum", "X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV"))
#diag_channels.append(ChannelDouble("PassEnergyNum", "X03DA-SCIENTA:cam1:PASS_ENERGY_RBV"))
#diag_channels.append(ChannelDouble("ElementSetNum", "X03DA-SCIENTA:cam1:ELEMENT_SET_RBV"))
diag_channels.append(ExcitationEnergy) #diag_channels.append(ChannelDouble("ExcitationEnergy", "X03DA-SCIENTA:cam1:EXCITATION_ENERGY_RBV"))
diag_channels.append(StepSize) #diag_channels.append(ChannelDouble("StepSize", "X03DA-SCIENTA:cam1:STEP_SIZE_RBV"))
diag_channels.append(NumIterations) #diag_channels.append(ChannelDouble("NumIterations", "X03DA-SCIENTA:cam1:NumExposures_RBV"))
diag_channels.append(PassEnergy) #diag_attrs.append(ChannelString("PassEnergy", "X03DA-SCIENTA:cam1:PASS_ENERGY_RBV"))
diag_channels.append(LensMode) #diag_attrs.append(ChannelString("LensMode", "X03DA-SCIENTA:cam1:LENS_MODE_RBV"))
diag_channels.append(AcquisitionMode) #diag_attrs.append(ChannelString("AcquisitionMode", "X03DA-SCIENTA:cam1:ACQ_MODE_RBV"))
diag_channels.append(EnergyMode) #diag_attrs.append(ChannelString("EnergyMode", "X03DA-SCIENTA:cam1:ENERGY_MODE_RBV"))
diag_channels.append(DetectorMode) #diag_attrs.append(ChannelString("DetectorMode", "X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV"))
diag_channels.append(ElementSet) #diag_attrs.append(ChannelString("ElementSet", "X03DA-SCIENTA:cam1:ELEMENT_SET_RBV"))
diag_channels.append(ExcitationEnergyElemeAnalyserSlitntSet #diag_attrs.append(ChannelString("ElemeAnalyserSlitntSet", "X03DA-SCIENTA:cam1:ANALYSER_SLIT_RBV"))
#Manipulator Settings
diag_channels.append(ManipulatorX)
diag_channels.append(ManipulatorY)
diag_channels.append(ManipulatorZ)
diag_channels.append(ManipulatorTheta
diag_channels.append(ManipulatorTilt)
diag_channels.append(ManipulatorPhi)
# Beamline Settings
diag_channels.append(MachineBumpXOffset)
diag_channels.append(MachineBumpXAngle)
diag_channels.append(MachineBumpYOffset)
diag_channels.append(MachineBumpYAngle)
diag_channels.append(DynamicBumpYOffset)
diag_channels.append(DynamicBumpYAngle)
diag_channels.append(FrontendVCenter)
diag_channels.append(FrontendVSize)
diag_channels.append(FrontendHCenter)
diag_channels.append(FrontendHSize)
diag_channels.append(MonoVCenter)
diag_channels.append(MonoVSize)
diag_channels.append(MonoBladeDown)
diag_channels.append(MonoBladeUp)
diag_channels.append(MonoHCenter)
diag_channels.append(MonoHSize)
diag_channels.append(MonoApertureMode)
diag_channels.append(RefocusVCenter)
diag_channels.append(RefocusVSize)
diag_channels.append(RefocusHCenter)
diag_channels.append(RefocusHSize)
diag_channels.append(FocusYTrans)
diag_channels.append(FocusZTrans)
diag_channels.append(FocusXRot)
diag_channels.append(FocusYRot)
diag_channels.append(FocusZRot)
diag_channels.append(RefocusYTrans)
diag_channels.append(RefocusZTrans)
diag_channels.append(RefocusXRot)
diag_channels.append(RefocusYRot)
diag_channels.append(RefocusZRot)
diag_channels.append(MonoEnergy)
diag_channels.append(MonoCff)
diag_channels.append(MonoBeta)
diag_channels.append(MonoTheta)
diag_channels.append(ExitSlit)
# Auxiliary Measurements
diag_channels.append(MachineCurrent)
diag_channels.append(FocusWaterTemp)
diag_channels.append(SampleCurrent)
diag_channels.append(RefCurrent)
diag_channels.append(AuxCurrent)
diag_channels.append(AuxVoltage)
diag_channels.append(SampleCurrentGain)
diag_channels.append(RefCurrentGain)
diag_channels.append(AuxCurrentGain)
diag_channels.append(SampleCurrentAveraging)
diag_channels.append(RefCurrentAveraging)
diag_channels.append(AuxCurrentAveraging)
diag_channels.append(AuxVoltageAveraging)
diag_channels.append(SampleCurrentSampling)
diag_channels.append(RefCurrentSampling)
diag_channels.append(AuxCurrentSampling)
diag_channels.append(AuxVoltageSampling)
diag_channels.append(ChamberPressure)
diag_channels.append(BeamlinePressure)
diag_channels.append(ManipulatorTempA)
diag_channels.append(ManipulatorTempB)
diag_channels.append(ManipulatorCoolFlow)
diag_channels.append(ManipulatorCoolFlowSet)
def print_diag():
for f in diag_channels:
print f.getName() + " = " + str(f.read())
script/scan1.py
+8 -8
View File
@@ -1,17 +1,17 @@
import time
#plot(None)
#a= lscan(scienta.sizeX, (scienta.spectrum,current,cur1), 980.0, 992.0, 12, 0.1)
#a= lscan(Scienta.sizeX, (Scienta.spectrum,current,cur1), 980.0, 992.0, 12, 0.1)
#scienta.lowEnergy.write(397.0)
#scienta.highEnergy.write(403.0)
#Scienta.lowEnergy.write(397.0)
#Scienta.highEnergy.write(403.0)
formerData = scienta.data.take()
scienta.start()
scienta.waitReady(-1)
formerData = Scienta.data.take()
Scienta.start()
Scienta.waitReady(-1)
while True:
data = scienta.data.take()
data = Scienta.data.take()
if (data is not formerData):
break;
time.sleep(0.01)
@@ -20,7 +20,7 @@ print data.tolist()[0]
#Integrate and plot
(width,height) = scienta.getImageSize().tolist()
(width,height) = Scienta.getImageSize().tolist()
integtation = []
for i in range(width):
p=0.0