import spreadsheet utils; some more stages; some more pgroups

This commit is contained in:
2022-03-02 15:38:01 +01:00
parent 09e5439b69
commit 032d4532fa

View File

@ -24,7 +24,7 @@ from devices.undulator import Undulators, TwoColorChicane, Phases
from devices.magnet import Magnet from devices.magnet import Magnet
from channels import channels, pvs, detectors from channels import channels, pvs, detectors
from spreadsheet import overview from spreadsheet import overview, print_overview, print_line_for_spreadsheet
import colors import colors
@ -33,9 +33,12 @@ dummy = DummyAdjustable(units="au")
jet_delay = PVAdjustable("SATES20-CVME-EVR0:Pul6-Delay-SP", "SATES20-CVME-EVR0:Pul6-Delay-RB", accuracy=1, name="Jet Delay") jet_delay = PVAdjustable("SATES20-CVME-EVR0:Pul6-Delay-SP", "SATES20-CVME-EVR0:Pul6-Delay-RB", accuracy=1, name="Jet Delay")
waveplate = Motor("SLAAT21-LMOT-M702:MOT", name="Laser Waveplate") waveplate = Motor("SLAAT21-LMOT-M702:MOT", name="Laser Waveplate")
exp_delay = Motor("SLAAT21-LMOT-M704:MOT", name="PP delay chamber 3") exp_delay = Motor("SLAAT21-LMOT-M704:MOT", name="Laser Exp delay")
laser_comp21 = Motor("SLAAT21-LMOT-M701:MOT", name="Laser Comp T2")
laser_comp11 = Motor("SLAAT21-LMOT-M705:MOT", name="Laser Comp T1 1")
laser_comp12 = Motor("SLAAT21-LMOT-M706:MOT", name="Laser Comp T1 2")
#laser_delay = DelayStage("SLAAT21-LMOT-M708:MOT", name="Laser Delay") #laser_delay = DelayStage("SLAAT21-LMOT-M708:MOT", name="Laser Delay")
laser_delay = Motor("SLAAT21-LMOT-M708:MOT", name="Laser Delay") laser_delay = Motor("SLAAT21-LMOT-M708:MOT", name="Laser Global Delay")
lxt = PVAdjustable("SLAAT01-LTIM-PDLY:DELAY", pvname_done_moving="SLAAT01-LTIM-PDLY:WAITING", name="LXT") lxt = PVAdjustable("SLAAT01-LTIM-PDLY:DELAY", pvname_done_moving="SLAAT01-LTIM-PDLY:WAITING", name="LXT")
source_y = Motor("SATES20-MANIP1:MOTOR_1", name="Source manipulator y") source_y = Motor("SATES20-MANIP1:MOTOR_1", name="Source manipulator y")
@ -106,16 +109,19 @@ instrument = "maloja"
#pgroup = "p19373" # laser #pgroup = "p19373" # laser
#pgroup = "p19483" # pilot 1 -- TRXPS #pgroup = "p19483" # pilot 1 -- TRXPS
#pgroup = "p19488" # pilot 2 -- Non-Linear Spectroscopy #pgroup = "p19488" # pilot 2 -- Non-Linear Spectroscopy
pgroup = "p19510" # pilot 2 -- Non-Linear Spectroscopy #pgroup = "p19510" # pilot 2 -- Non-Linear Spectroscopy
#pgroup = "p19727" # Laser only timing tests
#pgroup = "p19509" # slic dev
#pgroup = "p19743" # Focus tests and timing tests
pgroup = "p19750" # pilot 3 -- SPI
daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors, rate_multiplicator=1) daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors, rate_multiplicator=1)
#daq = FakeAcquisition(instrument, pgroup) #daq = FakeAcquisition(instrument, pgroup)
#daqPV = PVAcquisition(instrument, pgroup, default_channels=channels_ks) # workaround for KS not going to DB #daqPV = PVAcquisition(instrument, pgroup, default_channels=channels_ks) # workaround for KS not going to DB
check_intensity = PVCondition("SATBD01-DBPM060:Q2", vmin=5, vmax=None, wait_time=1, required_fraction=0.8) #check_intensity = PVCondition("SATBD01-DBPM060:Q2", vmin=5, vmax=None, wait_time=1, required_fraction=0.8)
#check_intensity = None check_intensity = None
scan = Scanner(scan_info_dir=f"/sf/{instrument}/data/{pgroup}/res/scan_info", default_acquisitions=[daq], condition=check_intensity) scan = Scanner(scan_info_dir=f"/sf/{instrument}/data/{pgroup}/res/scan_info", default_acquisitions=[daq], condition=check_intensity)
@ -123,3 +129,9 @@ gui = GUI(scan, show_goto=True, show_spec=True)
#@as_shortcut
#def advance_run_number():
# return daq.client.next_run()