From 1d35635c717d1e82d06e5560211296b790812cbb Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Tue, 16 May 2023 10:50:29 +0200 Subject: [PATCH] change TDC addresses from 1/2 to a/b --- documents/Addresses.md | 2 +- installation/addresses.sh | 56 +++++++++++++++++------------------ pasttrec/pasttrec_baseline.db | 12 ++++---- scripts/MDC.pm | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/documents/Addresses.md b/documents/Addresses.md index 7b23367..0429b19 100644 --- a/documents/Addresses.md +++ b/documents/Addresses.md @@ -9,7 +9,7 @@ ## TDC FPGA - 1. digit: 1/2 (inner/outer MDC) + 1. digit: a/b (inner/outer MDC) 2. digit: 0..b (chamber number, 0..5 for MDC1/3 6..B for MDC2/4) 3. digit: 0..f (MBO number) 4. digit: 0..2 (FPGA number) diff --git a/installation/addresses.sh b/installation/addresses.sh index f6baf7d..fef1ba9 100755 --- a/installation/addresses.sh +++ b/installation/addresses.sh @@ -54,41 +54,41 @@ trbcmd s 0x00001ea600752941 0x01 0x8e0a trbcmd s 0x0000fe5c001f2941 0x01 0x8e0b -trbcmd s 0x0000028200752941 0x03 0x10a0 -trbcmd s 0x0000ede000742941 0x03 0x10a1 -trbcmd s 0x000024b200752941 0x03 0x1090 -trbcmd s 0x00003be300752941 0x03 0x1091 -trbcmd s 0x00003f3b00762941 0x03 0x1010 -trbcmd s 0x00005add00752941 0x03 0x1011 -trbcmd s 0x0000432d00752941 0x03 0x1080 -trbcmd s 0x000090d200752941 0x03 0x1081 -trbcmd s 0x0000f069001f2941 0x03 0x1020 -trbcmd s 0x0000fdd3001f2941 0x03 0x1021 -trbcmd s 0x00009b7400202941 0x03 0x10b0 -trbcmd s 0x0000f5a1001f2941 0x03 0x10b1 -trbcmd s 0x0000432d00752941 0x03 0x10c0 -trbcmd s 0x000090d200752941 0x03 0x10c1 +trbcmd s 0x0000028200752941 0x03 0xa0a0 +trbcmd s 0x0000ede000742941 0x03 0xa0a1 +trbcmd s 0x000024b200752941 0x03 0xa090 +trbcmd s 0x00003be300752941 0x03 0xa091 +trbcmd s 0x00003f3b00762941 0x03 0xa010 +trbcmd s 0x00005add00752941 0x03 0xa011 +trbcmd s 0x0000432d00752941 0x03 0xa080 +trbcmd s 0x000090d200752941 0x03 0xa081 +trbcmd s 0x0000f069001f2941 0x03 0xa020 +trbcmd s 0x0000fdd3001f2941 0x03 0xa021 +trbcmd s 0x00009b7400202941 0x03 0xa0b0 +trbcmd s 0x0000f5a1001f2941 0x03 0xa0b1 +trbcmd s 0x0000432d00752941 0x03 0xa0c0 +trbcmd s 0x000090d200752941 0x03 0xa0c1 #long mbos #SN 90 -trbcmd s 0x000066e000822941 0x01 0x8e0d -trbcmd s 0x0000b8a400822941 0x00 0x10d0 -trbcmd s 0x0000c9bc00822941 0x01 0x10d1 -trbcmd s 0x00003cb800822941 0x02 0x10d2 +trbcmd s 0x000066e000822941 0x05 0x8e0d +trbcmd s 0x0000b8a400822941 0x00 0xa0d0 +trbcmd s 0x0000c9bc00822941 0x01 0xa0d1 +trbcmd s 0x00003cb800822941 0x02 0xa0d2 #SN 91 -trbcmd s 0x0000620e00822941 0x01 0x8e0e -trbcmd s 0x0000194a00822941 0x00 0x10e0 -trbcmd s 0x00002a0200822941 0x01 0x10e1 -trbcmd s 0x000080c900822941 0x02 0x10e2 +trbcmd s 0x0000620e00822941 0x05 0x8e0e +trbcmd s 0x0000194a00822941 0x00 0xa0e0 +trbcmd s 0x00002a0200822941 0x01 0xa0e1 +trbcmd s 0x000080c900822941 0x02 0xa0e2 trbcmd s 0x000093ed00822941 5 0x8f00 -trbcmd s 0x00003e1100822941 0 0x1080 -trbcmd s 0x0000437500822941 1 0x1081 -trbcmd s 0x0000952800822941 2 0x1082 +trbcmd s 0x00003e1100822941 0 0xa080 +trbcmd s 0x0000437500822941 1 0xa081 +trbcmd s 0x0000952800822941 2 0xa082 trbcmd s 0x000060ef00822941 5 0x8f01 -trbcmd s 0x0000acb300822941 0 0x1090 -trbcmd s 0x0000615d00822941 1 0x1091 -trbcmd s 0x0000b12600822941 2 0x1092 +trbcmd s 0x0000acb300822941 0 0xa090 +trbcmd s 0x0000615d00822941 1 0xa091 +trbcmd s 0x0000b12600822941 2 0xa092 diff --git a/pasttrec/pasttrec_baseline.db b/pasttrec/pasttrec_baseline.db index fcd7987..cc37eb8 100644 --- a/pasttrec/pasttrec_baseline.db +++ b/pasttrec/pasttrec_baseline.db @@ -124,23 +124,23 @@ 0901 0 25 27 14 25 22 26 20 22 0901 1 30 24 77 26 77 24 21 77 0901 2 21 18 27 21 24 17 23 23 - 0901 3 20 77 77 77 25 18 77 77 + 0901 3 20 20 20 20 25 18 20 20 0902 0 24 30 19 22 10 22 20 25 0902 1 24 23 22 16 28 26 21 26 0902 2 23 22 23 21 21 18 23 17 0902 3 25 18 26 24 24 18 21 21 - 0920 0 18 19 77 20 14 28 25 19 + 0920 0 18 19 17 20 14 28 25 19 0920 1 23 21 23 25 22 24 25 21 0920 2 19 25 19 16 21 24 18 16 0920 3 22 20 18 23 21 19 21 21 0921 0 13 22 22 16 17 20 17 16 0921 1 16 25 25 21 25 18 20 21 - 0921 2 27 77 14 20 19 19 13 21 + 0921 2 27 17 14 20 19 19 13 21 0921 3 18 26 23 22 20 22 19 21 - 0922 0 21 21 18 77 17 18 12 16 + 0922 0 21 21 18 17 17 18 12 16 0922 1 20 24 22 25 17 20 22 20 - 0922 2 19 77 77 77 15 18 23 24 + 0922 2 16 17 14 17 13 18 21 24 0922 3 16 15 18 17 18 15 16 15 @@ -151,7 +151,7 @@ 0931 0 23 25 28 26 20 23 23 21 0931 1 23 23 19 21 21 20 26 26 0931 2 21 17 18 27 15 18 28 28 - 0931 3 24 20 19 26 28 27 24 14 + 0931 3 24 20 19 26 28 24 24 14 0932 0 24 23 20 15 15 15 17 19 0932 1 15 27 19 21 22 25 22 17 0932 2 28 26 20 16 19 18 17 23 diff --git a/scripts/MDC.pm b/scripts/MDC.pm index 04800c4..a4d1532 100644 --- a/scripts/MDC.pm +++ b/scripts/MDC.pm @@ -29,7 +29,7 @@ sub get_address { return 0x8000 + ($p<2?0x0e00:0x0f00) + ($p%2 ? $s*16+96 : $s*16) + $b; } else { - return ($p<2?0x1000:0x2000) + ($p%2 ? $s*256+6*256 : $s*256) + $b*16 + $e; + return ($p<2?0xa000:0xb000) + ($p%2 ? $s*256+6*256 : $s*256) + $b*16 + $e; } } -- 2.43.0