diff --git a/maloja.py b/maloja.py index 43b6b8a..ab9e3d5 100644 --- a/maloja.py +++ b/maloja.py @@ -4,7 +4,7 @@ from time import sleep from datetime import datetime import numpy as np from tqdm import trange -from epics import PV +#from epics import PV from slic.gui import GUI from slic.core.adjustable import Adjustable, PVAdjustable, DummyAdjustable @@ -31,12 +31,16 @@ dummy = DummyAdjustable(units="au") #gas_attenuator = PVAdjustable("SATFE10-VVRE054-A010:SET_VAL-UI", name="Gas Attenuator") -gas_attenuator = PVAdjustable("SATFE10-VVRE054-A010:SET_VAL-UI", process_time=20, name="Gas Attenuator") +gas_attenuator = PVAdjustable("SATFE10-VVRE054-A010:SET_VAL-UI", process_time=20, name="Gas Attenuator Volts") + +gas_attenuator_trans = PVAdjustable("SATFE10-OGAT053:TRANSMISSION", process_time=20, name="Gas Attenuator Transmission") #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") +mono_coupled = PVAdjustable("SATOP11-OSGM087:SetEnergy", "SATOP11-OSGM087:photonenergy", accuracy=0.1, process_time=11, name="Mono Coupled") + waveplate = Motor("SLAAT21-LMOT-M702: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") @@ -130,7 +134,8 @@ instrument = "maloja" #pgroup = "p19583" # permalloy 2.0 #pgroup = "p20073" # alvise #pgroup = "p20194" # TOF beamtime heated valve -pgroup = "p20276" # COLTRIMS commissioning +#pgroup = "p20276" # COLTRIMS commissioning +pgroup = "p20553" 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)