Closedown
This commit is contained in:
@@ -36,11 +36,9 @@ latency: seconds to wait between positioning command and triggering the detector
|
||||
close_shutter_at_end: close beam shutter and turn off analyser at the end of the scan
|
||||
"""
|
||||
|
||||
print("11")
|
||||
dir()
|
||||
#from local import trig_scienta
|
||||
|
||||
print("12")
|
||||
import ch.psi.pshell.device.ReadonlyRegisterBase as ReadonlyRegisterBase
|
||||
import ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterArray as ReadonlyRegisterArray
|
||||
import ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterMatrix as ReadonlyRegisterMatrix
|
||||
|
||||
def check_region(region):
|
||||
"""
|
||||
@@ -137,7 +135,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray):
|
||||
global current_region_index
|
||||
current_region_index = self.region_index
|
||||
self.setup()
|
||||
print("Acquiring region {0}.".format(self.region['name'])
|
||||
print("Acquiring region {0}.".format(self.region['name']))
|
||||
trig_scienta()
|
||||
time.sleep(0.5)
|
||||
sp = Scienta.getSpectrum().read()
|
||||
@@ -230,9 +228,9 @@ def multi_region_run(motors, positions, regions, latency=0.0, close_shutter_at_e
|
||||
"""
|
||||
try:
|
||||
print("1")
|
||||
setup_live_plots(regions)
|
||||
#setup_live_plots(regions)
|
||||
print("2")
|
||||
task = fork(update_live_plots)
|
||||
#task = fork(update_live_plots)
|
||||
print("3")
|
||||
do_scan(motors, positions, regions, latency)
|
||||
finally:
|
||||
|
||||
@@ -452,5 +452,3 @@ def get_plot_snapshots(title = None, file_type = "jpg", temp_path = get_context(
|
||||
p.saveSnapshot(file_name , file_type)
|
||||
ret.append(file_name)
|
||||
return ret
|
||||
|
||||
import MultiRegion
|
||||
|
||||
Reference in New Issue
Block a user