Skip to content

Commit 6524160

Browse files
kostorrkostorr
committed
[roc-config] Add System ID & FEE ID options
1 parent 7b2e772 commit 6524160

File tree

18 files changed

+312
-90
lines changed

18 files changed

+312
-90
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,8 @@ metric format for the CRORC and the CRU is different, as different parameters ar
579579
| `"txFreq"` | - | double |
580580
| `"status"` | 0/1/2 (DOWN/UP/UP was DOWN) | int |
581581
| `"opticalPower"` | - | double |
582+
| `"systemId"` | 8-bit hex | string |
583+
| `"feeId"` | 12-bit hex | string |
582584
583585
| Tag key | Value |
584586
| --------------------- | --------------------- |

‎cru_template.cfg‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,17 @@ triggerWindowSize=1000
4848
gbtEnabled=true
4949

5050
# [true | false]
51-
userLogicEnabled=false
51+
userLogicEnabled=true
5252

5353
# [true | false]
5454
runStatsEnabled=true
5555

5656
# [true | false]
5757
userAndCommonLogicEnabled=false
5858

59+
# 8-bit System ID
60+
systemId=0xfd
61+
5962
#############################################
6063
# links
6164
#############################################
@@ -69,6 +72,9 @@ enabled=true
6972
# [TTC | DDG | SWT | TTCUP]
7073
gbtMux=TTC
7174

75+
# 16-bit FEE ID
76+
feeId=0xf00d
77+
7278
#############################################
7379
# link*
7480
#############################################
@@ -83,15 +89,19 @@ gbtMux=TTC
8389
[link1]
8490
enabled=true
8591
gbtMux=ttc
92+
feeId=0x1
8693

8794
[link2]
8895
enabled=true
8996
gbtMux=SWT
97+
feeId=0x2
9098

9199
[link3]
92100
enabled=false
93101
gbtMux=TTC
102+
feeId=0x2
94103

95104
[link4]
96105
enabled=false
97106
gbtMux=ddg
107+
feeId=0x4

‎doc/examples/roc-status/roc-status-cru.json‎

Lines changed: 71 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,142 +2,166 @@
22
"pciAddress": "af:00.0",
33
"serial": "243",
44
"endpoint": "0",
5-
"cruId": "0",
5+
"cruId": "66",
66
"clock": "Local",
77
"offset": "Fixed",
8-
"userLogic": "Disabled",
9-
"runStats": "Disabled",
8+
"userLogic": "Enabled",
9+
"runStats": "Enabled",
1010
"userAndCommonLogic": "Disabled",
1111
"0": {
12-
"gbtMode": "GBT\/GBT",
13-
"loopback": "Enabled",
14-
"gbtMux": "TTC:PATTERN",
12+
"gbtMode": "GBT\/WB",
13+
"loopback": "None",
14+
"gbtMux": "TTC:MIDTRG",
1515
"datapathMode": "Streaming",
1616
"datapath": "Enabled",
1717
"rxFreq": "240.47",
1818
"txFreq": "240.47",
1919
"status": "UP",
20-
"opticalPower": "500.00"
20+
"opticalPower": "472.70",
21+
"systemId": "0xfd",
22+
"feeId": "0xf00d"
2123
},
2224
"1": {
23-
"gbtMode": "GBT\/GBT",
24-
"loopback": "Enabled",
25-
"gbtMux": "DDG",
25+
"gbtMode": "GBT\/WB",
26+
"loopback": "None",
27+
"gbtMux": "TTC:MIDTRG",
2628
"datapathMode": "Streaming",
2729
"datapath": "Enabled",
2830
"rxFreq": "240.47",
2931
"txFreq": "240.47",
3032
"status": "UP",
31-
"opticalPower": "546.80"
33+
"opticalPower": "542.60",
34+
"systemId": "0xfd",
35+
"feeId": "0x1"
3236
},
3337
"2": {
34-
"gbtMode": "GBT\/GBT",
35-
"loopback": "Enabled",
36-
"gbtMux": "TTC:PATTERN",
38+
"gbtMode": "GBT\/WB",
39+
"loopback": "None",
40+
"gbtMux": "SWT",
3741
"datapathMode": "Streaming",
3842
"datapath": "Enabled",
3943
"rxFreq": "240.47",
4044
"txFreq": "240.47",
4145
"status": "UP",
42-
"opticalPower": "667.20"
46+
"opticalPower": "654.10",
47+
"systemId": "0xfd",
48+
"feeId": "0x2"
4349
},
4450
"3": {
4551
"gbtMode": "GBT\/GBT",
4652
"loopback": "None",
47-
"gbtMux": "DDG",
53+
"gbtMux": "TTC:MIDTRG",
4854
"datapathMode": "Streaming",
4955
"datapath": "Disabled",
5056
"rxFreq": "240.47",
5157
"txFreq": "240.47",
5258
"status": "UP",
53-
"opticalPower": "578.60"
59+
"opticalPower": "589.30",
60+
"systemId": "0xfd",
61+
"feeId": "0x0"
5462
},
5563
"4": {
5664
"gbtMode": "GBT\/GBT",
5765
"loopback": "None",
58-
"gbtMux": "TTC:PATTERN",
66+
"gbtMux": "TTC:MIDTRG",
5967
"datapathMode": "Streaming",
6068
"datapath": "Disabled",
6169
"rxFreq": "240.47",
6270
"txFreq": "240.47",
6371
"status": "UP",
64-
"opticalPower": "682.60"
72+
"opticalPower": "629.90",
73+
"systemId": "0xfd",
74+
"feeId": "0x0"
6575
},
6676
"5": {
67-
"gbtMode": "GBT\/GBT",
77+
"gbtMode": "GBT\/WB",
6878
"loopback": "None",
69-
"gbtMux": "DDG",
79+
"gbtMux": "TTC:MIDTRG",
7080
"datapathMode": "Streaming",
71-
"datapath": "Disabled",
81+
"datapath": "Enabled",
7282
"rxFreq": "240.47",
7383
"txFreq": "240.47",
7484
"status": "UP",
75-
"opticalPower": "750.90"
85+
"opticalPower": "823.70",
86+
"systemId": "0xfd",
87+
"feeId": "0xf00d"
7688
},
7789
"6": {
78-
"gbtMode": "GBT\/GBT",
90+
"gbtMode": "GBT\/WB",
7991
"loopback": "None",
80-
"gbtMux": "TTC:PATTERN",
92+
"gbtMux": "TTC:MIDTRG",
8193
"datapathMode": "Streaming",
82-
"datapath": "Disabled",
94+
"datapath": "Enabled",
8395
"rxFreq": "240.47",
8496
"txFreq": "240.47",
8597
"status": "UP",
86-
"opticalPower": "679.10"
98+
"opticalPower": "703.70",
99+
"systemId": "0xfd",
100+
"feeId": "0xf00d"
87101
},
88102
"7": {
89-
"gbtMode": "GBT\/GBT",
103+
"gbtMode": "GBT\/WB",
90104
"loopback": "None",
91-
"gbtMux": "TTC:PATTERN",
105+
"gbtMux": "TTC:MIDTRG",
92106
"datapathMode": "Streaming",
93-
"datapath": "Disabled",
107+
"datapath": "Enabled",
94108
"rxFreq": "240.47",
95109
"txFreq": "240.47",
96110
"status": "UP",
97-
"opticalPower": "530.30"
111+
"opticalPower": "534.10",
112+
"systemId": "0xfd",
113+
"feeId": "0xf00d"
98114
},
99115
"8": {
100-
"gbtMode": "GBT\/GBT",
116+
"gbtMode": "GBT\/WB",
101117
"loopback": "None",
102-
"gbtMux": "TTC:PATTERN",
118+
"gbtMux": "TTC:MIDTRG",
103119
"datapathMode": "Streaming",
104-
"datapath": "Disabled",
120+
"datapath": "Enabled",
105121
"rxFreq": "240.47",
106122
"txFreq": "240.47",
107123
"status": "UP",
108-
"opticalPower": "782.80"
124+
"opticalPower": "769.00",
125+
"systemId": "0xfd",
126+
"feeId": "0xf00d"
109127
},
110128
"9": {
111-
"gbtMode": "GBT\/GBT",
129+
"gbtMode": "GBT\/WB",
112130
"loopback": "None",
113-
"gbtMux": "TTC:PATTERN",
131+
"gbtMux": "TTC:MIDTRG",
114132
"datapathMode": "Streaming",
115-
"datapath": "Disabled",
133+
"datapath": "Enabled",
116134
"rxFreq": "240.47",
117135
"txFreq": "240.47",
118136
"status": "UP",
119-
"opticalPower": "557.20"
137+
"opticalPower": "560.80",
138+
"systemId": "0xfd",
139+
"feeId": "0xf00d"
120140
},
121141
"10": {
122-
"gbtMode": "GBT\/GBT",
142+
"gbtMode": "GBT\/WB",
123143
"loopback": "None",
124-
"gbtMux": "TTC:PATTERN",
144+
"gbtMux": "TTC:MIDTRG",
125145
"datapathMode": "Streaming",
126-
"datapath": "Disabled",
146+
"datapath": "Enabled",
127147
"rxFreq": "240.47",
128148
"txFreq": "240.47",
129149
"status": "UP",
130-
"opticalPower": "747.40"
150+
"opticalPower": "718.30",
151+
"systemId": "0xfd",
152+
"feeId": "0xf00d"
131153
},
132154
"11": {
133-
"gbtMode": "GBT\/GBT",
155+
"gbtMode": "GBT\/WB",
134156
"loopback": "None",
135-
"gbtMux": "TTC:PATTERN",
157+
"gbtMux": "TTC:MIDTRG",
136158
"datapathMode": "Streaming",
137-
"datapath": "Disabled",
159+
"datapath": "Enabled",
138160
"rxFreq": "240.47",
139161
"txFreq": "240.47",
140162
"status": "UP",
141-
"opticalPower": "239.30"
163+
"opticalPower": "242.90",
164+
"systemId": "0xfd",
165+
"feeId": "0xf00d"
142166
}
143167
}

‎doc/examples/roc-status/roc-status-cru.mon‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
2020-08-25 13:51:35 InfluxDB backend initialized
2-
CRU,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,id=1,type=CRU pciAddress="af:00.0",clock="Local",dynamicOffset=0i,userLogic=0i,runStats=0i,userAndCommonLogic=0i 1598356296147878091
3-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=0,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=1i,gbtMux="TTC:PATTERN",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=495.5 1598356296148122058
4-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=1,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=1i,gbtMux="DDG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=546.8 1598356296148227123
5-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=2,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=1i,gbtMux="TTC:PATTERN",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=667.2 1598356296148283013
6-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=3,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="DDG",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=582.1 1598356296148329781
7-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=4,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="TTC:PATTERN",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=686.1 1598356296148373508
8-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=5,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="DDG",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=747.3 1598356296148415069
9-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=6,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="TTC:PATTERN",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=679.1 1598356296148456983
10-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=7,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="TTC:PATTERN",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=530.3 1598356296148498582
11-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=8,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="TTC:PATTERN",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=782.8 1598356296148539590
12-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=9,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="TTC:PATTERN",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=560.8 1598356296148594690
13-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=10,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="TTC:PATTERN",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=751 1598356296148636312
14-
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=11,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="TTC:PATTERN",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=239.3 1598356296148678427
1+
2020-09-18 16:36:02 InfluxDB backend initialized
2+
CRU,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,id=1,type=CRU pciAddress="af:00.0",cruId=66i,clock="Local",dynamicOffset=0i,userLogic=1i,runStats=1i,userAndCommonLogic=0i 1600439762841974371
3+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=0,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=472.7,systemId="0xfd",feeId="0xf00d" 1600439762842344788
4+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=1,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=542.6,systemId="0xfd",feeId="0x1" 1600439762842455530
5+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=2,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="SWT",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=654.1,systemId="0xfd",feeId="0x2" 1600439762842519052
6+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=3,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=589.3,systemId="0xfd",feeId="0x0" 1600439762842576144
7+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=4,type=CRU pciAddress="af:00.0",gbtMode="GBT/GBT",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=0i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=633.4,systemId="0xfd",feeId="0x0" 1600439762842628626
8+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=5,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=830.9,systemId="0xfd",feeId="0xf00d" 1600439762842678038
9+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=6,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=703.7,systemId="0xfd",feeId="0xf00d" 1600439762842731231
10+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=7,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=534.1,systemId="0xfd",feeId="0xf00d" 1600439762842803967
11+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=8,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=769,systemId="0xfd",feeId="0xf00d" 1600439762842867949
12+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=9,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=560.8,systemId="0xfd",feeId="0xf00d" 1600439762842925469
13+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=10,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=718.3,systemId="0xfd",feeId="0xf00d" 1600439762842969811
14+
link,hostname=flp-kostas.cern.ch,serialId=243,endpoint=0,CRU=1,id=11,type=CRU pciAddress="af:00.0",gbtMode="GBT/WB",loopback=0i,gbtMux="TTC:MIDTRG",datapathMode="Streaming",datapath=1i,rxFreq=240.471,txFreq=240.471,status=1i,opticalPower=242.9,systemId="0xfd",feeId="0xf00d" 1600439762843029318

‎doc/examples/roc-status/roc-status-cru.out‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
-----------------------------
2-
CRU ID: 0
2+
CRU ID: 66
33
Local clock | Fixed offset
4-
=============================================================================================================================================
5-
Link ID GBT Mode Tx/Rx Loopback GBT MUX Datapath Mode Datapath RX freq(MHz) TX freq(MHz) Status Optical power(uW)
6-
---------------------------------------------------------------------------------------------------------------------------------------------
7-
0 GBT/GBT Enabled TTC:PATTERN Streaming Enabled 240.47 240.47 UP 500.0
8-
1 GBT/GBT Enabled DDG Streaming Enabled 240.47 240.47 UP 546.8
9-
2 GBT/GBT Enabled TTC:PATTERN Streaming Enabled 240.47 240.47 UP 667.2
10-
3 GBT/GBT None DDG Streaming Disabled 240.47 240.47 UP 582.1
11-
4 GBT/GBT None TTC:PATTERN Streaming Disabled 240.47 240.47 UP 679.1
12-
5 GBT/GBT None DDG Streaming Disabled 240.47 240.47 UP 747.3
13-
6 GBT/GBT None TTC:PATTERN Streaming Disabled 240.47 240.47 UP 672.1
14-
7 GBT/GBT None TTC:PATTERN Streaming Disabled 240.47 240.47 UP 534.1
15-
8 GBT/GBT None TTC:PATTERN Streaming Disabled 240.47 240.47 UP 779.4
16-
9 GBT/GBT None TTC:PATTERN Streaming Disabled 240.47 240.47 UP 560.8
17-
10 GBT/GBT None TTC:PATTERN Streaming Disabled 240.47 240.47 UP 751.0
18-
11 GBT/GBT None TTC:PATTERN Streaming Disabled 240.47 240.47 UP 239.3
19-
=============================================================================================================================================
4+
User Logic enabled
5+
Run statistics enabled
6+
=================================================================================================================================================================
7+
Link ID GBT Mode Tx/Rx Loopback GBT MUX Datapath Mode Datapath RX freq(MHz) TX freq(MHz) Status Optical power(uW) System ID FEE ID
8+
-----------------------------------------------------------------------------------------------------------------------------------------------------------------
9+
0 GBT/WB None TTC:MIDTRG Streaming Enabled 240.47 240.47 UP 472.7 0xfd 0xf00d
10+
1 GBT/WB None TTC:MIDTRG Streaming Enabled 240.47 240.47 UP 546.8 0xfd 0x1
11+
2 GBT/WB None SWT Streaming Enabled 240.47 240.47 UP 647.5 0xfd 0x2
12+
3 GBT/GBT None TTC:MIDTRG Streaming Disabled 240.47 240.47 UP 589.3 0xfd 0x0
13+
4 GBT/GBT None TTC:MIDTRG Streaming Disabled 240.47 240.47 UP 626.4 0xfd 0x0
14+
5 GBT/WB None TTC:MIDTRG Streaming Enabled 240.47 240.47 UP 823.7 0xfd 0xf00d
15+
6 GBT/WB None TTC:MIDTRG Streaming Enabled 240.47 240.47 UP 703.7 0xfd 0xf00d
16+
7 GBT/WB None TTC:MIDTRG Streaming Enabled 240.47 240.47 UP 541.7 0xfd 0xf00d
17+
8 GBT/WB None TTC:MIDTRG Streaming Enabled 240.47 240.47 UP 769.0 0xfd 0xf00d
18+
9 GBT/WB None TTC:MIDTRG Streaming Enabled 240.47 240.47 UP 560.8 0xfd 0xf00d
19+
10 GBT/WB None TTC:MIDTRG Streaming Enabled 240.47 240.47 UP 721.9 0xfd 0xf00d
20+
11 GBT/WB None TTC:MIDTRG Streaming Enabled 240.47 240.47 UP 242.9 0xfd 0xf00d
21+
=================================================================================================================================================================

0 commit comments

Comments
 (0)