From 60fb43ceff0805acea625f3deb6d13ae4fc18896 Mon Sep 17 00:00:00 2001 From: Ana Clara Oliveira Date: Mon, 5 Feb 2024 12:26:08 -0300 Subject: [PATCH] TI.ENH: update connections and add new high level trigger for streak camera --- timesys/high-level-triggers.py | 36 +++++++++------------------ timesys/timing-devices-connection.txt | 8 ++---- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/timesys/high-level-triggers.py b/timesys/high-level-triggers.py index 24261f3..e670996 100644 --- a/timesys/high-level-triggers.py +++ b/timesys/high-level-triggers.py @@ -1385,30 +1385,18 @@ 'TS-04:DI-ICTDig:TRIGIN', ), }, - # 'SI-Glob:TI-StrkCam-Trig1': { - # 'database': { - # 'Src': {'enums': ()}, - # 'Delay': {'value': 0.0}, - # 'RFDelayType': {'value': 1, 'states': (2, 0)}, - # 'NrPulses': {'value': 1, 'hilim': 2}, - # 'Duration': {'value': 150, 'hilim': 550}, - # 'State': {'value': 0}, - # 'Polarity': {'value': 1, 'states': (1, 0)}, - # }, - # 'channels': ('BA-01B1RaCtrl:DI-StrkCam:TRIG1', ), - # }, - # 'SI-Glob:TI-StrkCam-Trig2': { - # 'database': { - # 'Src': {'enums': ()}, - # 'Delay': {'value': 0.0}, - # 'RFDelayType': {'value': 1, 'states': (2, 0)}, - # 'NrPulses': {'value': 1, 'hilim': 2}, - # 'Duration': {'value': 150, 'hilim': 550}, - # 'State': {'value': 0}, - # 'Polarity': {'value': 1, 'states': (1, 0)}, - # }, - # 'channels': ('BA-01B1RaCtrl:DI-StrkCam:TRIG2', ), - # }, + 'BA-IMBA:TI-StrkCam': { + 'database': { + 'Src': {'enums': ()}, + 'Delay': {'value': 0.0}, + 'RFDelayType': {'value': 1, 'states': (2, 0)}, + 'NrPulses': {'value': 1, 'hilim': 2}, + 'Duration': {'value': 150, 'hilim': 550}, + 'State': {'value': 0}, + 'Polarity': {'value': 1, 'states': (1, 0)}, + }, + 'channels': ('BA-IMBA:DI-StrkCam:TRIG1', ), + }, 'SI-Glob:TI-BbBProcH-Trig1': { 'database': { 'Src': {'enums': ()}, diff --git a/timesys/timing-devices-connection.txt b/timesys/timing-devices-connection.txt index 1de648b..ff0e2be 100644 --- a/timesys/timing-devices-connection.txt +++ b/timesys/timing-devices-connection.txt @@ -13,7 +13,7 @@ -# 580 +# 576 AS-RaMO:TI-EVG:OUT0 RA-RaMO:CO-DIO:P05 AS-RaMO:TI-EVG:OUT1 RA-RaMO:CO-DIO:P01 AS-RaMO:TI-EVG:OUT2 RA-RaMO:CO-DIO:P02 @@ -80,7 +80,6 @@ CA-RaCtrl:CO-DIO-9:P09 PA-RaCtrl:CO-DIO:P051 CA-RaCtrl:CO-DIO-9:P10 PA-RaCtrl:CO-DIO:P046 CA-RaCtrl:CO-DIO-4:P18 IA-10RaCtrl:CO-DIO-2:P06 CA-RaCtrl:CO-DIO-8:P03 IA-20RaCtrl:CO-DIO-2:P03 -CA-RaCtrl:CO-DIO-1:P048 BA-01B1RaCtrl:CO-DIO:P048 CA-RaCtrl:CO-DIO-6:P12 IA-16RaCtrl:CO-DIO-2:P06 CA-RaCtrl:CO-DIO-7:P06 IA-18RaCtrl:CO-DIO-2:P06 CA-RaCtrl:CO-DIO-5:P18 IA-14RaCtrl:CO-DIO-2:P06 @@ -122,7 +121,6 @@ PA-RaCtrl:CO-DIO:P051 PA-RaCtrl:TI-EVR-1:UPLINK PA-RaCtrl:CO-DIO:P046 PA-RaCtrl:TI-EVR-2:UPLINK IA-10RaCtrl:CO-DIO-2:P06 IA-10RaBPM:TI-EVR:UPLINK IA-20RaCtrl:CO-DIO-2:P03 IA-20RaDiag01:TI-EVR:UPLINK -#BA-01B1RaCtrl:CO-DIO:P048 BA-01B1RaCtrl:TI-EVE:UPLINK IA-16RaCtrl:CO-DIO-2:P06 IA-16RaBbB:TI-EVE:UPLINK IA-18RaCtrl:CO-DIO-2:P06 IA-18RaDiag04:TI-EVE:UPLINK IA-14RaCtrl:CO-DIO-2:P06 IA-14RaDiag03:TI-EVE:UPLINK @@ -230,9 +228,6 @@ IA-20RaDiag01:TI-EVR:OUT4 IA-20RaDiag02:TI-OEMultSFP:OE1 IA-20RaDiag01:TI-EVR:OUT5 IA-20RaDiag02:TI-OEMultSFP:OE2 IA-20RaDiag01:TI-EVR:OUT6 BO-50U:TI-OESglSFP:INRX IA-20RaDiag01:TI-EVR:OUT7 SI-01C2FE:TI-OESglSFP:INRX -#BA-01B1RaCtrl:TI-EVE:OUT0 BA-01B1RaCtrl:DI-StrkCam:TRIG1 -#BA-01B1RaCtrl:TI-EVE:OUT1 BA-01B1RaCtrl:DI-StrkCam:TRIG2 -#BA-01B1RaCtrl:TI-EVE:RFOUT BA-01B1RaCtrl:DI-StrkCam:RFIN IA-16RaBbB:TI-EVE:OTP0 SI-Glob:DI-BbBProc-H:TRIG1 IA-16RaBbB:TI-EVE:OTP1 SI-Glob:DI-BbBProc-H:TRIG2 IA-16RaBbB:TI-EVE:OTP2 SI-Glob:DI-BbBProc-V:TRIG1 @@ -566,6 +561,7 @@ TS-02:TI-OESglSFP:INTX TS-03:TI-OESglSFP:INRX TS-04:TI-OESglSFP-2:OUT TS-04:DI-ScrnCam-2:TRIGIN TS-04:TI-OESglSFP-2:INTX TS-04:TI-OESglSFP-3:INRX IA-10RaPS02:PS-UDC-SI5:SYNCOUT IA-10RaPS02:PS-UDC-SI7:SYNCIN +BA-IMBA:TI-EVR:OUT2 BA-IMBA:DI-StrkCam:TRIG1 LI-IET01RACK1:TI-OEMultSFP:OUT1 LI-01:EG-EGun:SINGLEPULSEAMPLIFIER LI-IET01RACK1:TI-OEMultSFP:OUT2 LI-01:EG-EGun:MULTIPULSEAMPLIFIER LI-IET01RACK1:TI-OEMultSFP:OUT3 LI-01:EG-EGun:MULTIPRETRIGGERAMPLIFIER