From d08f6cc847be43c856d6e977e9478fb1b7e4ce91 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Fri, 27 Aug 2021 15:52:39 +0200 Subject: [PATCH] switched a Delay to DelayStage; import Marker and as_shortcut; show GoTo panel; etc. --- maloja.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/maloja.py b/maloja.py index c2b529f..3cb1a82 100644 --- a/maloja.py +++ b/maloja.py @@ -6,9 +6,9 @@ from slic.core.acquisition import SFAcquisition from slic.core.condition import PVCondition from slic.core.scanner import Scanner from slic.devices.general.motor import Motor -from slic.devices.general.delay_stage import Delay +from slic.devices.general.delay_stage import DelayStage from slic.devices.general.smaract import SmarActAxis -from slic.utils import devices +from slic.utils import devices, Marker, as_shortcut #from slic.utils import Channels, Config, Elog, Screenshot, PV #from slic.core.acquisition.fakeacquisition import FakeAcquisition @@ -24,8 +24,9 @@ magnet = Magnet() 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") -delay = Motor("SLAAT21-LMOT-M708:MOT", name="Laser Delay as Motor") -#delay_motor = Delay(delay_motor, name="Laser Delay as Delay") +exp_delay = Motor("SLAAT21-LMOT-M704:MOT", name="PP delay chamber 3") +laser_delay = DelayStage("SLAAT21-LMOT-M708:MOT", name="Laser 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") @@ -75,7 +76,7 @@ channels_cam = [ ] channels_giges = [ - "SATES21-CAMS154-GIGE3:FPICTURE", +# "SATES21-CAMS154-GIGE3:FPICTURE", ] @@ -102,9 +103,9 @@ instrument = "maloja" #pgroup = "p18722" # commissioning sept 2020 #pgroup = "p18863" # JF commissioning april 2021 #pgroup = "p19241" # two colors -pgroup = "p19342" # XMCD +#pgroup = "p19342" # XMCD #pgroup = "p19343" # slic dev - +pgroup = "p19373" # laser daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors, rate_multiplicator=1) #daq = FakeAcquisition(instrument, pgroup) @@ -114,7 +115,7 @@ check_intensity = PVCondition("SATBD01-DBPM060:Q2", vmin=5, vmax=None, wait_time scan = Scanner(scan_info_dir=f"/sf/{instrument}/data/{pgroup}/res/scan_info", default_acquisitions=[daq], condition=check_intensity) -gui = GUI(scan) +gui = GUI(scan, show_goto=True)