slic/maloja
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added some Adjustables; added some pgroups; removed detector

Browse Source
This commit is contained in:
augustin_s
2023-03-25 15:41:27 +01:00
parent d85a35a942
commit 6a12413d88
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
maloja.py
View File

@ -44,7 +44,7 @@ source_delay = PVAdjustable("SATES20-CVME-EVR0:Pul14-Delay-SP", "SATES20-CVME-EV
mono = PVAdjustable("SATOP11-OSGM087:SetEnergy", "SATOP11-OSGM087:photonenergy", accuracy=0.1, process_time=3, name="Mono Coupled")
waveplate = Motor("SLAAT21-LMOT-M712:MOT", name="Laser Waveplate")
#waveplate = Motor("SLAAT21-LMOT-M712:MOT", name="Laser Waveplate")
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")
@ -59,6 +59,7 @@ source_x = Motor("SATES20-MANIP2:MOTOR_1", name="Needle x")
injector_x = Motor("SATES20-MANIP1:MOTOR_1", name="Injector X")
injector_y = Motor("SATES20-MANIP1:MOTOR_2", name="Injector Y")
pump_pulse_energy = Motor("SLAAT21-LMOT-M702:MOT", name="Pump Pulse Energy (Waveplate)")
@ -135,6 +136,10 @@ xota3_y_trans = Motor("SATES23-XOTA169:W_Y", name="Table 3: Y coordinated")
mot3_x = SmarActAxis("SATES23-XSMA169:MOT7", name="Table 3: sma x")
mot3_y = SmarActAxis("SATES23-XSMA169:MOT8", name="Table 3: sma y")
mirror_tilt = PVAdjustable("SATES20-XSMA165:MOT17:DRIVE", name="Mirror_tilt")
mirror_tip = PVAdjustable("SATES20-XSMA165:MOT16:DRIVE", name="Mirror_tip")
jet_rot = SmarActAxis("SATES24-XSMA171:MOT1", name="Jet Rotation degrees")
jet_X = SmarActAxis("SATES24-XSMA171:MOT4", name="Jet X mm")
jet_Z = SmarActAxis("SATES24-XSMA171:MOT6", name="Jet Z mm")
@ -206,10 +211,14 @@ instrument = "maloja"
#pgroup = "p20562" # Circular dichroism -- Woerner
#pgroup = "p20560" # Four-wave-mixing -- Knopp
#pgroup = "p20279" # SPI -- Ban
pgroup = "p20848" # Holo -- Boris
#pgroup = "p20851" # Camera test Edwin
#pgroup = "p20848" # Holo -- Boris
#pgroup = "p20851" # Camera test Edwin, use below instead
pgroup = "p21011" # Camera test Edwin
#pgroup = "p20823" # SPI - Issendorf
#pgroup = "p21108" # SPI commisioning multi-stage
daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors, rate_multiplicator=1, append_user_tag_to_data_dir=True, spreadsheet=spreadsheet)
daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=None, rate_multiplicator=1, append_user_tag_to_data_dir=True, spreadsheet=spreadsheet)
#daq = FakeAcquisition(instrument, pgroup)
#daqPV = PVAcquisition(instrument, pgroup, default_channels=channels_ks) # workaround for KS not going to DB