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

Closedown

Browse Source
This commit is contained in:
x03daop
2016-03-08 15:40:57 +01:00
parent f21d5abd41
commit 8489b556b6
11 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/devices.properties
View File

@@ -87,10 +87,10 @@ AuxVoltage=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4|Read||true
SampleCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP1:GainSel|Read||true
RefCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP2:GainSel|Read||true
AuxCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP3:GainSel|Read||true
SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC1.N|Read||true
RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC2.N|Read||true
AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|Read||true
AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|Read||true
SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC1.N|||true
RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC2.N|||true
AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|||true
AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|||true
SampleCurrentSampling=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-ADC1:Vraw.SCAN|Read||true
RefCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC2:Vraw.SCAN|Read||true
AuxCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC3:Vraw.SCAN|Read||true

2
plugins/HoloScan.form
View File

@@ -425,7 +425,7 @@
<Property name="text" type="java.lang.String" value="Scienta Energy Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="ImageEnergyDistribution" noResource="true"/>
<Property name="name" type="java.lang.String" value="EnergyDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">

2
plugins/HoloScan.java
View File

@@ -330,7 +330,7 @@ public class HoloScan extends Panel {
checkImageIntegration.setText("Scienta Energy Distribution");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("ImageEnergyDistribution"); // NOI18N
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");

2
plugins/ManipulatorScan.form
View File

@@ -491,7 +491,7 @@
<Property name="text" type="java.lang.String" value="Scienta Energy Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="ImageEnergyDistribution" noResource="true"/>
<Property name="name" type="java.lang.String" value="EnergyDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">

2
plugins/ManipulatorScan.java
View File

@@ -391,7 +391,7 @@ public class ManipulatorScan extends Panel {
checkImageIntegration.setText("Scienta Energy Distribution");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("ImageEnergyDistribution"); // NOI18N
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");

2
plugins/PhotonEnergy.form
View File

@@ -458,7 +458,7 @@
<Property name="text" type="java.lang.String" value="Scienta Energy Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="ImageEnergyDistribution" noResource="true"/>
<Property name="name" type="java.lang.String" value="EnergyDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">

2
plugins/PhotonEnergy.java
View File

@@ -438,7 +438,7 @@ public class PhotonEnergy extends Panel {
checkImageIntegration.setText("Scienta Energy Distribution");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("ImageEnergyDistribution"); // NOI18N
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");

1
script/HoloScan.py
View File

@@ -13,4 +13,5 @@ RELATIVE (BOOLEAN)
#set_preference(Preference.ENABLED_PLOTS, [ManipulatorPhi, ManipulatorTheta, Scienta.dataMatrix, ImageIntegrator])
#set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
adjust_sensors()
set_adc_averaging()
ascan((ManipulatorPhi, ManipulatorTheta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout)

1
script/ManipulatorScan.py
View File

@@ -11,4 +11,5 @@ RELATIVE (BOOLEAN)
#set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
adjust_sensors()
set_adc_averaging()
lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout)

1
script/PhotonEnergy.py
View File

@@ -7,6 +7,7 @@ LATENCY (double)
"""
adjust_sensors()
set_averaging()
#set_preference(Preference.PLOT_TYPES,{'ImageEnergyDistribution':1})
if len(VECTOR[0]) == 2:

2
script/XPSSpectrum.py
View File

@@ -34,6 +34,8 @@ try:
Scienta.stepSize.write(vars[1])
Scienta.setIterations(1)
set_averaging()
#iterations done in script
xdata = None
ydata = None