Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update timing tables and add new high level triggers #283

Merged
merged 6 commits into from
Apr 20, 2023
Merged

Update timing tables and add new high level triggers #283

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92b594a
TI.ENH: update timing connections table
anacso17 Apr 14, 2023
912cf3c
TI.ENH: add new SI-01SA:TI-InjNLKckr-CCoilH and SI-01SA:TI-InjNLKckr-…
anacso17 Apr 14, 2023
ceb7274
Update version to 1.52.0
anacso17 Apr 14, 2023
f5a7a56
TI.ENH: update new high level trigger event name
anacso17 Apr 17, 2023
af2eec6
TI.ENH: remove NLK CCoil high level triggers and move respective chan…
anacso17 Apr 18, 2023
65940d6
Revert unnecessary version update
anacso17 Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.51.0
1.52.0
34 changes: 29 additions & 5 deletions timesys/high-level-triggers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,30 @@
},
'channels': ('SI-01SA:PU-InjNLKckrCtrl:TRIGIN', ),
},
'SI-01SA:TI-InjNLKckr-CCoilH': {
'database': {
'Src': {'enums': ('InjSI', )},
'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': (2, 0)}, # EVR-OTP port
},
'channels': ('SI-01SA:PU-InjNLKckrCtrl-CCoilH:TRIGIN', ),
},
'SI-01SA:TI-InjNLKckr-CCoilV': {
'database': {
'Src': {'enums': ('InjSI', )},
'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': (2, 0)}, # EVR-OTP port
},
'channels': ('SI-01SA:PU-InjNLKckrCtrl-CCoilV:TRIGIN', ),
},
'SI-19C4:TI-PingV': {
'database': {
'Src': {'enums': ('InjSI', )},
Expand All @@ -1018,17 +1042,17 @@
},
'channels': ('SI-19C4:PU-PingVCtrl:TRIGIN', ),
},
'SI-01SA:TI-PingH': {
'AS-Glob:TI-Osc-InjNLKckr': {
'database': {
'Src': {'enums': ('InjSI', )},
'Delay': {'value': 0.0},
'RFDelayType': {'value': 1, 'states': (2, 0)},
'NrPulses': {'value': 1, 'hilim': 30},
'NrPulses': {'value': 1, 'hilim': 2},
'Duration': {'value': 150, 'hilim': 550},
'State': {'value': 0},
'Polarity': {'value': 1, 'states': (1, 0)}, # EVR-OTP port
},
'channels': ('SI-01SA:PU-PingHCtrl:TRIGIN', ),
'Polarity': {'value': 1, 'states': (2, 0)}, # EVR-OTP port
},
'channels': ('IA-01RaInj05:PU-Osc:AUXIN', ),
},
# ### LLRF ###
'BO-Glob:TI-LLRF-Rmp': {
Expand Down
11 changes: 8 additions & 3 deletions timesys/timing-devices-connection.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@



# 553
# 558
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
Expand Down Expand Up @@ -45,6 +45,7 @@ CA-RaTim:TI-Fout-2:OUT3 CA-RaCtrl:CO-DIO-1:P048
CA-RaTim:TI-Fout-2:OUT4 CA-RaCtrl:CO-DIO-6:P12
CA-RaTim:TI-Fout-2:OUT5 CA-RaCtrl:CO-DIO-7:P06
CA-RaTim:TI-Fout-2:OUT6 CA-RaCtrl:CO-DIO-5:P18
CA-RaTim:TI-Fout-2:OUT7 BA-09SA:TI-EVE:UPLINK
CA-RaTim:TI-Fout-3:OUT0 CA-RaCtrl:CO-DIO-2:P05
CA-RaTim:TI-Fout-3:OUT1 CA-RaCtrl:CO-DIO-2:P17
CA-RaTim:TI-Fout-3:OUT2 CA-RaCtrl:CO-DIO-2:P23
Expand All @@ -58,7 +59,7 @@ CA-RaTim:TI-Fout-4:OUT2 CA-RaCtrl:CO-DIO-4:P17
CA-RaTim:TI-Fout-4:OUT3 CA-RaCtrl:CO-DIO-4:P23
CA-RaTim:TI-Fout-4:OUT4 CA-RaCtrl:CO-DIO-5:P05
CA-RaTim:TI-Fout-4:OUT5 CA-RaCtrl:CO-DIO-5:P11
CA-RaTim:TI-Fout-4:OUT7 CA-RaCtrl:CO-DIO-5:P17
CA-RaTim:TI-Fout-4:OUT6 CA-RaCtrl:CO-DIO-5:P17
CA-RaTim:TI-Fout-5:OUT0 CA-RaCtrl:CO-DIO-6:P05
CA-RaTim:TI-Fout-5:OUT1 CA-RaCtrl:CO-DIO-6:P11
CA-RaTim:TI-Fout-5:OUT2 CA-RaCtrl:CO-DIO-6:P23
Expand Down Expand Up @@ -165,6 +166,8 @@ IA-01RaInj05:TI-EVR:OTP6 IA-01RaInj04:TI-OEMultPOF:IN4
IA-01RaInj05:TI-EVR:OTP7 IA-01RaInj05:TI-OEMultPOF:IN1
IA-01RaInj05:TI-EVR:OTP8 IA-01RaInj05:TI-OEMultPOF:IN2
IA-01RaInj05:TI-EVR:OTP9 IA-01RaInj05:TI-OEMultPOF:IN3
IA-01RaInj05:TI-EVR:OTP10 SI-01SA:TI-OEMultPOF:IN2
IA-01RaInj05:TI-EVR:OTP11 SI-01SA:TI-OEMultPOF:IN3
IA-01RaInj05:TI-EVR:OUT0 IA-01RaCtrl:CO-DIO-1:P13
IA-01RaInj05:TI-EVR:OUT1 IA-01RaCtrl:CO-DIO-1:P14
IA-01RaInj05:TI-EVR:OUT2 IA-01RaCtrl:CO-DIO-1:P15
Expand Down Expand Up @@ -425,7 +428,9 @@ IA-01RaInj04:TI-OEMultPOF:OUT3 TS-04:PU-InjSeptFCtrl:TRIGIN
IA-01RaInj04:TI-OEMultPOF:OUT4 IA-01RaInj04:PU-Osc:CH1
IA-01RaInj05:TI-OEMultPOF:OUT1 SI-01SA:PU-InjNLKckrCtrl:TRIGIN
IA-01RaInj05:TI-OEMultPOF:OUT2 SI-01SA:PU-InjDpKckrCtrl:TRIGIN
IA-01RaInj05:TI-OEMultPOF:OUT3 SI-01SA:PU-PingHCtrl:TRIGIN
IA-01RaInj05:TI-OEMultPOF:OUT3 IA-01RaInj05:PU-Osc:AUXIN
SI-01SA:TI-OEMultPOF:OUT2 SI-01SA:PU-InjNLKckrCtrl-CCoilH:TRIGIN
SI-01SA:TI-OEMultPOF:OUT3 SI-01SA:PU-InjNLKckrCtrl-CCoilV:TRIGIN
IA-01RaCtrl:CO-DIO-1:P13 IA-20RaCtrl:CO-DIO-1:P19
IA-01RaCtrl:CO-DIO-1:P14 IA-20RaCtrl:CO-DIO-1:P20
IA-01RaCtrl:CO-DIO-1:P15 IA-20RaCtrl:CO-DIO-1:P21
Expand Down