merge changes from Frankfurt

diff --git a/installation/addresses.sh b/installation/addresses.sh
index f053306a52441e1cfa690f271ccd0ae00093975c..6553e3c5251a8a6c40e88b39c4a31ec940f23221 100644 (file)
--- a/installation/addresses.sh
+++ b/installation/addresses.sh
@@ -68,3 +68,14 @@ trbcmd s  0x00009b7400202941  0x03  0x10b0
 trbcmd s  0x0000f5a1001f2941  0x03  0x10b1
 
 
+trbcmd s 0x000093ed00822941  5  0x8f00
+trbcmd s 0x00003e1100822941  0  0x1080
+trbcmd s 0x0000437500822941  1  0x1081
+trbcmd s 0x0000952800822941  2  0x1082
+
+
+trbcmd s 0x000060ef00822941  5  0x8f01
+trbcmd s 0x0000acb300822941  0  0x1090
+trbcmd s 0x0000615d00822941  1  0x1091
+trbcmd s 0x0000b12600822941  2  0x1092
+

diff --git a/installation/mbo_positions.db b/installation/mbo_positions.db
index 7144791c148bfa44d17d4595690a4ec4d46b289e..38decb82f1cefbb2ef8efd1043f5b727e7441d97 100644 (file)
--- a/installation/mbo_positions.db
+++ b/installation/mbo_positions.db
@@ -19,10 +19,10 @@
 0        1        1        1        0
 0        1        2        1        0
 0        1        3        0        0
-0        1        4        0        0
-0        1        5        0        0
-0        1        6        1        0
-0        1        7        1        0
+0        1        4        0        003
+0        1        5        0        016
+0        1        6        1        093
+0        1        7        1        092
 0        1        8        0        0
 0        1        9        0        0
 0        1        10       1        0

diff --git a/pasttrec/pasttrec_baseline.db b/pasttrec/pasttrec_baseline.db
index 96e6411904016412d4460f70978d1e9fd6ea53fd..a832e3300a6636e2feb180fb99044530013e2eb2 100644 (file)
--- a/pasttrec/pasttrec_baseline.db
+++ b/pasttrec/pasttrec_baseline.db
@@ -1,7 +1,7 @@
 
 #Serial is the ID written on the board (3 digits) plus the Endpoint ID (0-2, counting from OEP side).
-#       e.g. 0361 or 1230
-#       for the first version boards a 6 or 7 is added and endpoint ID is always '1'. e.g. 6ID1 or 7ID1
+#      e.g. 0361 or 1230
+#      for the first version boards a 6 or 7 is added and endpoint ID is always '3'. e.g. 6ID1 or 7ID1
 
 #PT is id of Pasttrec chip, 0-3. PT 0 has channels 0..7, PT 3 has channels 24..31
 
@@ -91,6 +91,17 @@
    70153       2       22      18      23      21      23      22      25      21
    70153       3       15      25      24      20      16      21      21      16
    
+   60161       0       15      19      22      21      22      19      22      25
+   60161       1       24      26      19      22      26      21      19      19
+   60161       2       20      22      22      25      20      21      21      23
+   60161       3       21      20      20      24      24      23      20      22
+
+   70161       0       22      25      24      22      23      28      21      29
+   70161       1       23      24      21      16      23      24      19      18
+   70161       2       14      22      21      18      20      20      19      25
+   70161       3       24      19      13      22      19      23      23      31
+
+   
    0910        0       19      19      27      21      17      21      20      22
    0910          1     19      23      23      14      15      09      20      25
    0910        2       21      25      22      18      18      23      18      23
@@ -121,3 +132,30 @@
    0902        2       77      77      77      77      23      77      77      17
    0902        3       77      77      77      77      24      18      21      77
 
+   0920  0     18      19      77      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  3     18      26      23      22      20      22      19      21
+   0922  0     21      21      18      77      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  3     16      15      18      17      18      15      16      15
+
+
+   0930  0     26      26      16      24      22      26      24      22
+   0930  1     20      21      19      27      20      22      26      22
+   0930  2     26      25      17      26      18      21      18      20
+   0930  3     25      20      21      20      22      26      20      26
+   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
+   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
+   0932  3     20      23      16      20      24      12      23      17
+

diff --git a/serials/serials_mdcmbo.db b/serials/serials_mdcmbo.db
index 175667844315a78cf8a876cbdfcff42de6339373..4235c2e3ad50427f794d4378e2634ca0cbaa6012 100644 (file)
--- a/serials/serials_mdcmbo.db
+++ b/serials/serials_mdcmbo.db
@@ -10,26 +10,26 @@
 80021 0x0000e6cf001f2941  
 60023 0x0000f069001f2941  
 70023 0x0000fdd3001f2941  
-@ GU
-80031 0x000065a100202941
+
+80031 0x000065a100202941 #@GU
 60033 0x000099bd00202941
 70033 0x0000dfab001f2941
 
-80041
+#80041
 
-80051
+#80051
 
-80061
+#80061
 
-80071
+#80071
 
 80081 0x000009d700762941  
 60083 0x000090d700752941
 70083 0x0000766e00752941
 
-80091  0x0000023000752941  
-60093  0x00001e4a00752941  
-70093  0x0000064e00752941  
+80091 0x0000023000752941  
+60093 0x00001e4a00752941  
+70093 0x0000064e00752941  
 
 80101 0x000060a900752941  
 60103 0x0000432d00752941
@@ -47,20 +47,17 @@
 60133 0x00003f3b00762941
 70133 0x00005add00752941
 
-80141
+#80141
 
 80015 0x0000fe5c001f2941
 60015 0x00009b7400202941
 70015 0x0000f5a1001f2941
 
-@ GU
-80161 0x000084d200202941 
+80161 0x000084d200202941  #@GU
 60163 0x00004f3800202941
 70163 0x0000e820001f2941
 
-
-long mbo first 4 prototypes
-
+#long prototype MBO, with 85k FPGA
 0905 0x000066e000822941
 0900 0x0000b8a400822941
 0901 0x0000c9bc00822941
@@ -71,3 +68,17 @@ long mbo first 4 prototypes
 0911 0x00002a0200822941
 0912 0x000080c900822941
 
+0925 0x000093ed00822941
+0920 0x00003e1100822941
+0921 0x0000437500822941
+0922 0x0000952800822941
+
+0935 0x000060ef00822941
+0930 0x0000acb300822941
+0931 0x0000615d00822941
+0932 0x0000b12600822941
+
+
+
+
+