From 8d7f2a818a68d8105990abe4b1a4b8cfe853160e Mon Sep 17 00:00:00 2001 From: gac-furka Date: Tue, 26 Apr 2022 14:35:50 +0200 Subject: [PATCH] current state --- furka.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/furka.py b/furka.py index c9cbdca..53f1624 100644 --- a/furka.py +++ b/furka.py @@ -2,6 +2,7 @@ from slic.core.acquisition import SFAcquisition from slic.core.acquisition import PVAcquisition +#from slic.core.acquisition import FakeAcquisition from slic.core.adjustable import PVAdjustable, DummyAdjustable from slic.core.condition import PVCondition from slic.core.scanner import Scanner @@ -58,7 +59,7 @@ n_unds = [ 15, 16, 17, 18, 19, 20, 21, 22 ] chic_fudge_offset = 0 -Mon2Unds_offset = -2. +Mon2Unds_offset = -5 und = Undulators(n_unds, n_und_ref, chic_fudge_offset, name="z Athos Undulators") #und = Undulators(name="Undulators") @@ -83,11 +84,12 @@ channels = [ "SATES30-LSCP10-FNS:CH2:VAL_GET", "SATES30-LSCP10-FNS:CH4:VAL_GET", # "SATES30-LSCP10-FNS:CH0:WFMi" - "SATES21-CAMS-PATT1:intensity", - "SATES21-CAMS-PATT1:x_profile", - "SATES21-CAMS-PATT1:y_profile", - "SATES21-CAMS-PATT1:FPICTURE", - "SATES21-CAMS-PATT1:spectrum" +# "SATES31-CAMS187-RIXS1:SPC", +# "SATES31-CAMS187-RIXS1:SPC_gauss", +# "SATES31-CAMS187-RIXS1:SPC_wgt", + "SATES31-CAMS187-RIXS1:Spectrum", +# "SATES31-CAMS187-RIXS1:evt_list", + "SATES31-CAMS187-RIXS1:FPICTURE" ] @@ -96,7 +98,8 @@ pvs = [ "SATES30-RETRO:MOT_RY.RBV", "SATES30-RETRO:MOT_X.RBV", "SATES30-RETRO:MOT_Y.RBV", - "SATES30-RETRO:MOT_Z.RBV" + "SATES30-RETRO:MOT_Z.RBV", + "SATUN:FELPHOTENE" ] live_channels = [ @@ -112,9 +115,12 @@ instrument = "furka" pgroup = "p19735" #Commissioning p group #check_intensity = PVCondition("SATFE10-PEPG046:FCUP-INTENSITY-CAL", vmin=5, vmax=None, wait_time=3, required_fraction=0.8) -check_intensity = None +#check_intensity = None +check_intensity = PVCondition("SATBD01-DBPM060:Q2", vmin=5, vmax=None, wait_time=1, required_fraction=0.8) daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, rate_multiplicator=1) +#daq = FakeAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, rate_multiplicator=1) + #daqPV = PVAcquisition(instrument, pgroup, default_channels=live_channels) scan = Scanner(default_acquisitions=[daq], condition=check_intensity)