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-04-05 11:18:16 +02:00
parent 13eba3d3eb
commit ed036b4d0c
10 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/HoloScan.form
View File

@@ -438,7 +438,6 @@
</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"/>
</Properties>

1
plugins/HoloScan.java
View File

@@ -339,7 +339,6 @@ public class HoloScan extends Panel {
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("Scienta.spectrum"); // NOI18N

2
plugins/ManipulatorScan.form
View File

@@ -435,7 +435,6 @@
</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"/>
@@ -450,7 +449,6 @@
</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"/>
</Properties>

2
plugins/ManipulatorScan.java
View File

@@ -359,7 +359,6 @@ public class ManipulatorScan extends Panel {
checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkImage.setSelected(true);
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
@@ -368,7 +367,6 @@ public class ManipulatorScan extends Panel {
checkCur3.setText("Aux Current");
checkCur3.setName("AuxCurrent"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("Scienta.spectrum"); // NOI18N

1
plugins/PhotonEnergy.form
View File

@@ -463,7 +463,6 @@
</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"/>
</Properties>

1
plugins/PhotonEnergy.java
View File

@@ -443,7 +443,6 @@ public class PhotonEnergy extends Panel {
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkSpectrum.setSelected(true);
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("Scienta.spectrum"); // NOI18N

1
script/HoloScan.py
View File

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

1
script/ManipulatorScan.py
View File

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

4
script/PhotonEnergy.py
View File

@@ -11,7 +11,6 @@ STEP (double)
if MODE == "swept":
Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept)
Scienta.getStepSize().write(STEP)
else:
Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed)
adjust_sensors()
@@ -23,5 +22,6 @@ if len(VECTOR[0]) == 2:
else:
#SWEPT
writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy)
print SENSORS
set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta, after_read = after_readout)

18
script/XPSSpectrum.py
View File

@@ -3,7 +3,6 @@
# pass_energy
#
# skip_iteration: if set to 1 then skips after end of current iteration
from ch.psi.pshell.data.LayoutDefault import ATTR_WRITABLE_DIMENSION as ATTR_WRITABLE_DIMENSION
cur_range = 0
@@ -20,7 +19,21 @@ Scienta.passEnergy = pass_energy
names=[]
for i in range(len(ranges)):
names.append(str(ranges[i]))
names.append("Spectrum")
plots = plot(None, names)
spectrum_series = plots[len(names)-1].getSeries(0)
def plot_cur_spectrum():
global spectrum_series
try:
while True:
y = Scienta.spectrum.take(100)
x = Scienta.spectrumX
spectrum_series.setData(x, y)
time.sleep(1.0)
finally:
print "Stopping spectrum plotting"
task = None
try:
for cur_range in range(len(ranges)):
cur_iteration = 0
@@ -39,6 +52,8 @@ try:
#iterations done in script
xdata = None
ydata = None
task = fork(plot_cur_spectrum)
for cur_iteration in range(vars[2]):
plots[cur_range].setTitle(str(ranges[cur_range]) + " - iteration " + str(cur_iteration+1))
trig_scienta()
@@ -80,4 +95,5 @@ finally:
if not Scienta.isReady():
Scienta.stop()
Scienta.update()
task[0].cancel(True)
set_return(to_array(ret,'o'))