current state
This commit is contained in:
44
maloja.py
44
maloja.py
@ -30,19 +30,22 @@ import colors
|
||||
|
||||
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")
|
||||
|
||||
source_delay = PVAdjustable("SATES20-CVME-EVR0:Pul14-Delay-SP", "SATES20-CVME-EVR0:Pul14-Delay-RB", accuracy=1, name="Source Delay")
|
||||
|
||||
waveplate = Motor("SLAAT21-LMOT-M702:MOT", name="Laser Waveplate")
|
||||
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")
|
||||
TT_delay = Motor("SLAAT21-LMOT-M704:MOT", name="TT_delay")
|
||||
#laser_comp21 = Motor("SLAAT21-LMOT-M701:MOT", name="Laser Comp T2")
|
||||
#laser_comp11 = Motor("SLAAT21-LMOT-M705:MOT", name="Laser Comp T1 1")
|
||||
pump_probe_delay = Motor("SLAAT21-LMOT-M703:MOT", name="pump_probe_delay")
|
||||
#laser_comp12 = Motor("SLAAT21-LMOT-M706:MOT", name="Laser Comp T1 2")
|
||||
#laser_delay = DelayStage("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")
|
||||
|
||||
source_y = Motor("SATES20-MANIP1:MOTOR_1", name="Source manipulator y")
|
||||
source_x = Motor("SATES20-MANIP1:MOTOR_2", name="Source manipulator x")
|
||||
source_y = Motor("SATES20-MANIP1:MOTOR_1", name="Aerosol Injector x")
|
||||
source_x = Motor("SATES20-MANIP1:MOTOR_2", name="Aerosol Injector y")
|
||||
|
||||
att = Attenuator("SATFE10-OATT064")
|
||||
chic_delay = TwoColorChicane("zz Two Color Chicane")
|
||||
@ -52,12 +55,13 @@ und = Undulators(name="z Athos Undulators (both colors)")
|
||||
und1 = Undulators([6, 7, 8, 9, 10, 11, 12, 13], n_und_ref=10, name="z Athos Undulators 6-13 (first color)")
|
||||
und2 = Undulators([15, 16, 17, 18, 19, 20, 21, 22], n_und_ref=19, name="z Athos Undulators 15-22 (second color)")
|
||||
|
||||
und.set_limits(390, 1000)
|
||||
und1.set_limits(390, 1000)
|
||||
und2.set_limits(390, 1000)
|
||||
und.set_limits(390, 1100)
|
||||
und1.set_limits(390, 1100)
|
||||
und2.set_limits(390, 1100)
|
||||
|
||||
|
||||
xota_z_trans = Motor("SATES21-XOTA166:W_Z", name="Table 1: Z coordinated")
|
||||
xota_y_trans = Motor("SATES21-XOTA166:W_Y", name="Table 1: Y coordinated")
|
||||
#xota_hori_z = Motor("SATES21-XOTA166:MOTOR_Z", name="Table 1: Z raw")
|
||||
|
||||
mot1_x = SmarActAxis("SATES21-XSMA166:MOT4", name="Table 1: sma X")
|
||||
@ -91,8 +95,8 @@ def cycle_magnet():
|
||||
|
||||
# add some more devices to the overview
|
||||
overview.standa = standa
|
||||
overview.exp_delay = exp_delay
|
||||
overview.laser_delay = laser_delay
|
||||
overview.TT_delay = TT_delay
|
||||
overview.pump_probe_delay = pump_probe_delay
|
||||
overview.LXT = lxt
|
||||
|
||||
|
||||
@ -113,15 +117,17 @@ instrument = "maloja"
|
||||
#pgroup = "p19727" # Laser only timing tests
|
||||
#pgroup = "p19509" # slic dev
|
||||
#pgroup = "p19743" # Focus tests and timing tests
|
||||
pgroup = "p19750" # pilot 3 -- SPI
|
||||
#pgroup = "p19582" # pilot 3 -- SPI
|
||||
pgroup = "p19583" # permalloy 2.0
|
||||
#pgroup = "p20073" # alvise
|
||||
|
||||
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, append_user_tag_to_data_dir=True)
|
||||
#daq = FakeAcquisition(instrument, pgroup)
|
||||
|
||||
#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 = None
|
||||
check_intensity = PVCondition("SATBD01-DBPM060:Q2", vmin=5, vmax=None, wait_time=1, required_fraction=0.8)
|
||||
#check_intensity = None
|
||||
|
||||
scan = Scanner(scan_info_dir=f"/sf/{instrument}/data/{pgroup}/res/scan_info", default_acquisitions=[daq], condition=check_intensity)
|
||||
|
||||
@ -129,9 +135,3 @@ gui = GUI(scan, show_goto=True, show_spec=True)
|
||||
|
||||
|
||||
|
||||
#@as_shortcut
|
||||
#def advance_run_number():
|
||||
# return daq.client.next_run()
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user