diff --git a/channels/bs_channels.py b/channels/bs_channels.py index 0dc2d47..8ab8ae5 100644 --- a/channels/bs_channels.py +++ b/channels/bs_channels.py @@ -12,7 +12,6 @@ detectors = [ "JF16T03V01", ] - # ALLOWED_PARAMS = dict( # adc_to_energy = bool, # compression = bool, @@ -40,8 +39,8 @@ detectors_MX.add("JF17T16V01", adc_to_energy=True, compression=True, crystfel_li camera_channels = [ # "SARES30-CAMS156-PCO1:FPICTURE", # PCO edge camera for the wavefront analysis (from Alvra) - "SARES30-CAMS156-SMX-OAV:FPICTURE", # SwissMX OAV camera picture - "SARES30-CAMS156-SMX-OAV.jet_projection", #SWISSMX oav jET PROJECTION +# "SARES30-CAMS156-SMX-OAV:FPICTURE", # SwissMX OAV camera picture +# "SARES30-CAMS156-SMX-OAV.jet_projection", #SWISSMX oav jET PROJECTION # "SARES30-CAMS156-XE:FPICTURE", # X-ray eye ] @@ -166,22 +165,25 @@ channels_PSSS059 = [ "SARFE10-PSSS059:SPECTRUM_Y_SUM", "SARFE10-PSSS059:SPECTRUM_X", "SARFE10-PSSS059:SPECTRUM_Y", - # "SARFE10-PSSS059:FPICTURE", + "SARFE10-PSSS059:FPICTURE", "SARFE10-PSSS059:processing_parameters", -# Experimental large bandwith camera +] + +# Large bandwidth camera +channels_PSSS059_LB = [ + "SARFE10-PSSS059-LB:FIT-COM", + "SARFE10-PSSS059-LB:FIT-FWHM", + "SARFE10-PSSS059-LB:FIT-RES", + "SARFE10-PSSS059-LB:FIT-RMS", + "SARFE10-PSSS059-LB:SPECT-COM", + "SARFE10-PSSS059-LB:SPECT-RES", + "SARFE10-PSSS059-LB:SPECT-RMS", + "SARFE10-PSSS059-LB:SPECTRUM_X", + "SARFE10-PSSS059-LB:SPECTRUM_Y", + "SARFE10-PSSS059-LB:SPECTRUM_Y_SUM", + "SARFE10-PSSS059-LB:processing_parameters", + "SARFE10-PSSS059-LB:FPICTURE", "SARFE10-PSSS059-LB:FIT-BRT", -"SARFE10-PSSS059-LB:FIT-COM", -"SARFE10-PSSS059-LB:FIT-FWHM", -"SARFE10-PSSS059-LB:FIT-RES", -"SARFE10-PSSS059-LB:FIT-RMS", -"SARFE10-PSSS059-LB:SPECT-COM", -"SARFE10-PSSS059-LB:SPECT-RES", -"SARFE10-PSSS059-LB:SPECT-RMS", -"SARFE10-PSSS059-LB:SPECTRUM_X", -"SARFE10-PSSS059-LB:SPECTRUM_Y", -"SARFE10-PSSS059-LB:SPECTRUM_Y_SUM", -"SARFE10-PSSS059-LB:processing_parameters", -"SARFE10-PSSS059-LB:FPICTURE", ] ################################### @@ -300,10 +302,12 @@ channels_EVR = [ ####################### # Digitizer channels_digitizer = [ - "SARES30-LTIM01-EVR0:DUMMY_PV1_NBS", - "SARES30-LTIM01-EVR0:DUMMY_PV2_NBS", - "SARES30-LTIM01-EVR0:DUMMY_PV3_NBS", - "SARES30-LTIM01-EVR0:DUMMY_PV4_NBS", + # extra non-beam synchronous channels: + #"SARES30-LTIM01-EVR0:DUMMY_PV1_NBS", + #"SARES30-LTIM01-EVR0:DUMMY_PV2_NBS", + #"SARES30-LTIM01-EVR0:DUMMY_PV3_NBS", + #"SARES30-LTIM01-EVR0:DUMMY_PV4_NBS", + # other EVR channels: "SARES30-LSCP1-FNS:CH0:VAL_GET", # Signal-Background "SARES30-LSCP1-CRISTA1:CH0:1", # Waveform signal "SARES30-LSCP1-CRISTA1:CH2:1", # Waveform trigger @@ -321,7 +325,7 @@ bs_channels = ( camera_channels + channels_gas_monitor # + channels_RF - + channels_Xeye + # + channels_Xeye + channels_PBPS053 + channels_PSSS059 + channels_PBPS113 @@ -329,24 +333,9 @@ bs_channels = ( # + channels_PPRM113 + channels_PBPS149 # + channels_PBPS149_waveforms - + channels_PPRM150 # only if screen is inserted + # + channels_PPRM150 # only if screen is inserted + channels_EVR # + channels_digitizer + channels_other ) -bs_channels_OAPU107_scan = ( - channels_gas_monitor - + channels_PBPS053 - + channels_PSSS059 - + channels_PBPS113 - + channels_PPRM113 -) - -bs_channels_pbps_snapshot = ( -channels_gas_monitor - + channels_PBPS053 - + channels_PSSS059 - + channels_PBPS113 - + channels_PBPS149 -) diff --git a/channels/pv_channels.py b/channels/pv_channels.py index 008b1d0..270dce8 100644 --- a/channels/pv_channels.py +++ b/channels/pv_channels.py @@ -12,6 +12,7 @@ pvs_machine = [ "SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-AVG.VAL", # Average pulse energy from the gas detector ] +# accelerator parameters pvs_RF = [ "SINSB01-RSYS:GET-VSUM-PHASE-OFFSET", "SINSB02-RSYS:GET-VSUM-PHASE-OFFSET", @@ -147,7 +148,7 @@ pvs_PSSS059 = [ #################### # Upstream attenuator OATT053 -pvs_OATT053 = [ +pvs_OATT053_old = [ "SARFE10-OATT053:MOTOR_1", "SARFE10-OATT053:MOTOR_1.RBV", "SARFE10-OATT053:MOTOR_2", @@ -165,6 +166,23 @@ pvs_OATT053 = [ "SARFE10-OATT053:TRANS_RB", ] + +#################### +# New Upstream attenuator OATT053 +pvs_OATT053 = [ + "SARFE10-OATT053:photonenergy", # Photon energy for Transmission + "SARFE10-OATT053:transmission", # Total Transmission of all stages + "SARFE10-OATT053:transmission3", # + "SARFE10-OATT053:PHOTONENERGY_local", # Manually entered Photon Energy + "SARFE10-OATT053:ENERGY", # Energy eV" + "SARFE10-OATT053:MOTOR_1", # motor Motor 1 + "SARFE10-OATT053:MOTOR_2", # motor Motor 2 + "SARFE10-OATT053:MOTOR_3", # motor Motor 3 + "SARFE10-OATT053:MOTOR_4", # motor Motor 4 + "SARFE10-OATT053:MOTOR_5", # motor Motor 5 + "SARFE10-OATT053:MOTOR_6", # motor Motor 6 +] + ################### # Beam profile monitor PPRM053 pvs_PPRM053 = [ @@ -291,7 +309,7 @@ pvs_PPRM150 = [ #################### # Attenuators OATA150 -pvs_OATA150 = [ +pvs_OATA150_old = [ "SAROP31-OATA150:MOTOR_1.RBV", "SAROP31-OATA150:MOTOR_2.RBV", "SAROP31-OATA150:MOTOR_3.RBV", @@ -305,6 +323,24 @@ pvs_OATA150 = [ "SAROP31-OATA150:MOT2TRANS.VALD" ] +#################### +# New Attenuators OATA150 +pvs_OATA150 = [ + "SAROP31-OATA150:photonenergy", # ai Photon energy for Transmission SAROP31-CPCL-OSAT150 swissfel + "SAROP31-OATA150:transmission", # ai Total Transmission of all stages SAROP31-CPCL-OSAT150 swissfel + "SAROP31-OATA150:transmission3", # + "SAROP31-OATA150:PHOTONENERGY_local", # Manually entered Photon Energy + "SAROP31-OATA150:ENERGY", # Energy eV" + "SAROP31-OATA150:MOTOR_1", # motor Motor 1 SAROP31-CPPM-MOT7171 swissfel + "SAROP31-OATA150:MOTOR_2", # motor Motor 2 SAROP31-CPPM-MOT7171 swissfel + "SAROP31-OATA150:MOTOR_3", # motor Motor 3 SAROP31-CPPM-MOT7171 swissfel + "SAROP31-OATA150:MOTOR_4", # motor Motor 4 SAROP31-CPPM-MOT7171 swissfel + "SAROP31-OATA150:MOTOR_5", # motor Motor 5 SAROP31-CPPM-MOT7171 swissfel + "SAROP31-OATA150:MOTOR_6", # motor Motor 6 +] + + + #################### # Pulse picker OPPI151 pvs_OPPI151 = [ @@ -449,7 +485,7 @@ pvs = ( + pvs_PSCD153 + pvs_OKBH154 + pvs_standa - + pvs_newport_300 +# + pvs_newport_300 # + pvs_smaract_xyz + pvs_diffractometer_1 # + pvs_Bernina diff --git a/cristallina.py b/cristallina.py index 69aa671..07bfa96 100644 --- a/cristallina.py +++ b/cristallina.py @@ -223,26 +223,27 @@ instrument = "cristallina" # pgroup = "p20558" # SwissMX commissioning 3 # pgroup = "p20557" # CrQ PMS commisioning 1 -# pgroup = "p20509" # CrQ commissoing DilSc1 +# pgroup = "p20509" # CrQ commisioning DilSc1 # pgroup = "p20519" # beamline commissioning 2 # pgroup = "p20841" # CrQ PMS commisioning 2 (Jan 2023) -# pgroup = "p20993" # CrQ commissoing DilSc2 (March 2023) +# pgroup = "p20993" # CrQ commisioning DilSc2 (March 2023) # pgroup = "p21147" # SAXS # pgroup = "p21238" # Cristallina photon diagnostics p-group with Chris -# pgroup = "p21224" # SwissMX commissioning 7 +# pgroup = "p21224" # SwissMX commisioning 7 -# pgroup = "p19150" # Scratch +pgroup = "p19150" # Scratch # pgroup = "p19152" # Scratch # pgroup = "p20840" # Cr beamline commisioning (Jan-Feb 2023) # pgroup = "p21261" # CrQ PMS-3 July 2023 # pgroup = "p21528" # Cr-MX Colletier 2023-09-05 -# pgroup = "p21516" # Beamline commissioning September 26-27, Noveber 7 2023 +# pgroup = "p21516" # Beamline commissioning September 26-27, November 7 2023 # pgroup = "p21563" # Dil-Sc / diffractometer / tilted bunch / LiErF4 (/ TmVO4) # pgroup = "p21569" # Dil-Sc / diffractometer / tilted bunch / LiErF4 (/ TmVO4), November 17- # pgroup = "p21592" # HVE commissioning +pgroup = "p21640" # Dil-Sc / diffractometer / LiErF4 : 4 March 2024 # setup pgroup specific logger setup_logging_pgroup(pgroup) diff --git a/devices/diffractometer.py b/devices/diffractometer.py index be76761..8ede227 100644 --- a/devices/diffractometer.py +++ b/devices/diffractometer.py @@ -9,7 +9,7 @@ """ -from slic.core.adjustable import Adjustable, PrimarySecondary +from slic.core.adjustable import Adjustable, Linked from slic.core.device import Device, SimpleDevice from slic.devices.general.motor import Motor @@ -35,7 +35,7 @@ class Diffractometer(Device): # Set speed: # diffractometer.theta._motor.VELO = 0.25 -class ThetasCombined(PrimarySecondary): +class ThetasCombined(Linked): def __init__(self, *args, **kwargs): super().__init__(self, *args, **kwargs)