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 17:26:40 +02:00
parent 36bc8f9892
commit f588f10b66
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
script/HoloScan.py
View File

@@ -17,8 +17,8 @@ adjust_sensors()
set_adc_averaging()
set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
try:tryy:
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)
finally:
if ENDSCAN:
after_scan()
try:
ascan((ManipulatorPhi, ManipulatorTheta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, zigzag = ZIGZAG, before_read=before_readout, after_read = after_readout)
finally:
if ENDSCAN:
after_scan()

2
script/ManipulatorScan.py
View File

@@ -15,7 +15,7 @@ set_adc_averaging()
set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
try:
lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = after_readout)
lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=before_readout, after_read = after_readout)
finally:
if ENDSCAN:
after_scan()

2
script/PhotonEnergy.py
View File

@@ -26,7 +26,7 @@ else:
set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
try:
vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=trig_scienta, after_read = after_readout)
vscan(writables, SENSORS, VECTOR, True, LATENCY,False, before_read=before_readout, after_read = after_readout)
finally:
if ENDSCAN:
after_scan()

8
script/XPSSpectrum.py
View File

@@ -56,8 +56,12 @@ try:
for cur_iteration in range(vars[2]):
plots[cur_range+1].setTitle(str(ranges[cur_range]) + " - iteration " + str(cur_iteration+1))
trig_scienta()
spectrum_array = Scienta.spectrum.read()
while True:
wait_beam()
trig_scienta()
spectrum_array = Scienta.spectrum.read()
if beam_ok:
break
if ydata is None:
ydata = spectrum_array
else: