From c54463a4dd76bf757cbfa3238670a7637dd5ecd3 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Sat, 4 May 2019 01:55:22 +0200 Subject: [PATCH] Closedown --- script/MultiRegionScan.py | 8 ++++---- script/XPSSpectrum.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index 7819e51c..2b20c870 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -13,8 +13,8 @@ ZIGZAG = True MOTORS = [dummy] # comma-separated discrete list of scan positions #POSITIONS = [(PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS] -#POSITIONS = [-175., 180., 5.] -POSITIONS = [0.] +POSITIONS = [0., 100., 1.] +#POSITIONS = [0.] # seconds to wait between positioning command and triggering the detector LATENCY = 0.0 @@ -233,8 +233,8 @@ def do_scan(motors, positions, regions, latency): set_adc_averaging() #ascan(motors, SENSORS, positions[0], positions[1], positions[2], latency, False, zigzag = True, before_read=wait_beam, after_read = after_readout) - #lscan(motors, SENSORS, positions[0], positions[1], positions[2], latency, False, before_read=wait_beam, after_read = after_readout) - vscan(motors, SENSORS, positions, True, latency,False, before_read=wait_beam, after_read = after_readout) + lscan(motors, SENSORS, positions[0], positions[1], positions[2], latency, False, before_read=wait_beam, after_read = after_readout) + #vscan(motors, SENSORS, positions, True, latency,False, before_read=wait_beam, after_read = after_readout) for (index, region) in enumerate(regions): set_attribute(get_exec_pars().scanPath + "region{0}/ScientaSpectrum".format(index + 1), "RegionName", region['name']) diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py index b8bd3978..60879dee 100644 --- a/script/XPSSpectrum.py +++ b/script/XPSSpectrum.py @@ -45,9 +45,9 @@ for p in plots[1:]: # online spectrum -# p = plots[0] -# spectrum_series = p.getSeries(0) -# spectrum_eb_axis = p.chart.plot.getDomainAxis(1) +p = plots[0] +spectrum_series = p.getSeries(0) +spectrum_eb_axis = p.chart.plot.getDomainAxis(1) def plot_cur_spectrum_eb(): """ plot online spectrum function for forked task. @@ -113,7 +113,7 @@ try: xdata = None ydata = None image_data = None - task = fork(plot_cur_spectrum) + task = fork(plot_cur_spectrum_eb) path="scan" + str(cur_range+1) + "/" for cur_iteration in range(vars[2]):