update database files with long MBO prototypes at GSI

diff --git a/installation/mbo_positions.db b/installation/mbo_positions.db
index 00bd8a2bb6bd914415f149c70e862f8d0270995d..7144791c148bfa44d17d4595690a4ec4d46b289e 100644 (file)
--- a/installation/mbo_positions.db
+++ b/installation/mbo_positions.db
@@ -1,15 +1,15 @@
-#Plane   Sector   Board    Long     Serial
+#Plane   Sector   MBO     Long     Serial
 ##########################################
 0        0        0        0        001
-0        0        1        1        013
-0        0        2        1        008
-0        0        3        0        0
-0        0        4        0        0
+0        0        1        1        090
+0        0        2        1        091
+0        0        3        0        013
+0        0        4        0        008
 0        0        5        0        0
 0        0        6        1        0
 0        0        7        1        0
 0        0        8        0        0
-0        0        9        0        0
+0        0        9        0        015
 0        0        10       1        012
 0        0        11       0        002
 0        0        12       1        011

diff --git a/installation/power_outputs.db b/installation/power_outputs.db
index e95380071d15661e1c09479375dcd21bf51f18d5..d8f6cfd2450e99d3d4f25c1a6a90004f3b3e36cc 100644 (file)
--- a/installation/power_outputs.db
+++ b/installation/power_outputs.db
@@ -1,19 +1,19 @@
 #Plane   Sector   MBO     Power   Output
 ##########################################
-0        0        0        0        0
-0        0        1        0        1
-0        0        2        0        2
-0        0        3        0        3
-0        0        4        1        0
-0        0        5        1        1
-0        0        6        1        2
-0        0        7        1        3
+0        0        0        0        2
+0        0        1        0        0
+0        0        2        0        3
+0        0        3        0        1
+0        0        4        3        0
+0        0        5        3        1
+0        0        6        3        2
+0        0        7        3        3
 0        0        8        2        0
 0        0        9        2        1
-0        0        10       2        2
-0        0        11       2        3
-0        0        12       3        0
-0        0        13       3        1
+0        0        10       1        3
+0        0        11       1        1
+0        0        12       1        2
+0        0        13       1        0
 
 0        1        0        0        0
 0        1        1        0        1

diff --git a/pasttrec/pasttrec_baseline.db b/pasttrec/pasttrec_baseline.db
index c4865782404e1dc5d075b2ad34ae8cd9ae67cba9..96e6411904016412d4460f70978d1e9fd6ea53fd 100644 (file)
--- a/pasttrec/pasttrec_baseline.db
+++ b/pasttrec/pasttrec_baseline.db
@@ -11,91 +11,113 @@
 #  Serial  #   PT   #   C0   #  C1   #  C2   #  C3   #  C4   #  C5   #  C6   #  C7   #
 ######################################################################################
 
-   60011        0       21      16      16      18      19      23      16      21
-   60011        1       18      18      17      16      17      13      14      00
-   60011        2       20      22      21      15      15      18      19      23
-   60011        3       16      20      18      14      21      23      20      23
-   
-   60021        0       25      23      28      99      21      99      24      24
-   60021        1       25      17      15      23      25      18      22      21
-   60021        2       16      13      15      13      20      23      24      20
-   60021        3       19      19      19      14      18      21      19      15
-   70021        0       19      28      17      28      20      29      15      20
-   70021        1       16      17      19      17      15      20      18      18
-   70021        2       20      18      24      16      18      18      17      14
-   70021        3       14      24      19      23      18      20      25      16
-
-   60031        0       22      16      21      99      18      19      99      99
-   60031        1       20      99      19      18      99      18      99      15
-   60031        2       99      99      16      20      19      99      99      22
-   60031        3       99      99      99      16      20      19      15      99
-   70031        0       17      17      20      17      99      21      16      15
-   70031        1       19      99      99      99      20      99      16      17
-   70031        2       19      99      17      19      18      28      99      99
-   70031        3       22      25      21      22      20      17      99      21
-   
-   60091        0       21      21      14      18      20      21      20      18
-   60091        1       20      26      22      20      18      29      24      29
-   60091        2       27      19      19      18      16      24      20      16
-   60091        3       19      28      15      24      20      17      17      21
-   70091        0       22      23      14      21      21      17      23      13
-   70091        1       25      20      14      18      15      19      22      15
-   70091        2       18      21      18      23      24      20      22      25
-   70091        3       25      22      23      24      23      19      20      22
-   
-   60101        0       14      18      19      20      14      17      16      14
-   60101        1       26      22      25      20      20      23      27      20
-   60101        2       17      14      15      18      16      19      17      18
-   60101        3       21      24      21      22      18      19      26      19
-   70101        0       21      20      12      19      14      20      14      24
-   70101        1       17      25      18      20      18      22      19      18
-   70101        2       24      19      19      22      22      14      22      21
-   70101        3       24      26      22      19      18      20      21      21
-   
-   60111        0       28      18      21      27      24      25      28      22
-   60111        1       25      20      28      24      18      26      25      16
-   60111        2       26      27      24      28      23      19      20      22
-   60111        3       20      21      17      21      22      24      21      27
-   70111        0       18      23      21      27      18      30      25      23
-   70111        1       22      17      22      23      23      22      28      16
-   70111        2       17      22      20      17      26      25      22      26
-   70111        3       27      17      20      21      18      29      16      14
-   
-   60121        0       21      23      14      23      22      26      17      26
-   60121        1       31      23      19      22      22      22      24      26
-   60121        2       22      17      17      21      21      19      27      20
-   60121        3       16      22      24      16      17      22      18      19
-   70121        0       27      23      24      29      27      28      25      31
-   70121        1       23      26      15      14      25      25      20      13
-   70121        2       17      16      26      22      25      23      24      20
-   70121        3       21      20      23      30      10      22      26      22
-
-   60131        0       20      16      21      21      14      18      20      20
-   60131        1       09      24      22      10      13      20      19      15
-   60131        2       20      15      10      17      17      12      15      17
-   60131        3       24      27      20      22      19      15      14      29
-
-   70131        0       24      27      28      20      22      21      24      19
-   70131        1       25      18      18      21      23      20      21      22
-   70131        2       20      20      18      17      21      15      16      22
-   70131        3       16      27      27      20      22      16      18      20
-
-   60151       0       77      17      22      77      16      77      18      19
-   60151       1       77      15      77      77      77      13      26      77
-   60151       2       17      77      18      17      15      77      20      15
-   60151       3       77      77      23      77      20      15      18      20
-
-   70151       0       17      20      15      16      13      17      16      13
-   70151       1       18      77      21      18      18      19      19      77
-   70151       2       21      77      77      21      23      22      25      20
-   70151       3       77      25      23      77      16      77      21      16
+   60013       0       21      16      16      17      19      23      16      21
+   60013       1       18      18      17      16      17      13      14      22
+   60013       2       20      22      21      15      15      18      19      23
+   60013       3       16      20      19      14      21      23      20      23
+
+   70013       0       19      23      21      19      23      20      23      19
+   70013       1       19      16      23      18      23      19      25      16
+   70013       2       14      19      25      19      14      17      21      21
+   70013       3       14      20      15      17      23      19      22      10
+
+   60133       0       20      16      21      21      14      18      20      20
+   60133       1       09      24      22      11      14      20      19      15
+   60133       2       20      15      10      16      17      12      15      17
+   60133       3       24      27      20      22      18      15      14      29
+
+   70133       0       24      27      28      20      22      21      25      19
+   70133       1       25      18      18      21      24      20      21      22
+   70133       2       20      20      19      17      21      15      16      22
+   70133       3       16      26      27      20      22      16      18      20
+
+   60083       0       23      22      10      26      18      24      21      14
+   60083       1       20      24      16      22      21      21      22      23
+   60083       2       24      25      21      16      26      24      25      26
+   60083       3       19      20      21      24      24      23      27      22
+
+   70083       0       14      13      25      17      17      20      21      17
+   70083       1       14      23      18      17      28      25      25      19
+   70083       2       25      24      15      17      17      17      22      27
+   70083       3       23      23      15      28      22      25      19      17
+
+   60123       0       21      23      14      23      22      26      17      26
+   60123       1       30      23      18      22      22      23      24      26
+   60123       2       22      17      16      21      21      18      27      19
+   60123       3       16      22      24      16      17      22      18      18
+
+   70123       0       27      23      24      28      27      28      25      31
+   70123       1       23      26      15      14      25      25      20      13
+   70123       2       17      16      25      22      25      23      25      20
+   70123       3       21      20      23      30      10      22      26      22
+
+   60023       0       25      23      28      21      21      26      24      24
+   60023       1       25      17      15      23      25      18      22      21
+   60023       2       16      13      15      13      19      23      24      19
+   60023       3       19      18      19      13      18      21      19      15
+
+   70023       0       19      28      17      28      20      28      15      20
+   70023       1       16      17      19      17      15      19      18      18
+   70023       2       20      18      24      16      17      17      17      15
+   70023       3       14      24      19      23      18      19      25      16
+
+   60113       0       28      18      21      26      23      25      27      22
+   60113       1       25      19      27      25      18      26      25      16
+   60113       2       26      26      24      27      23      19      20      23
+   60113       3       19      21      16      21      22      24      21      26
+
+   70113       0       17      22      21      27      18      28      24      23
+   70113       1       22      17      23      23      23      22      28      15
+   70113       2       17      22      20      17      25      25      22      26
+   70113       3       27      17      20      21      18      29      16      14
+
+   60103       0       14      18      19      20      14      17      16      14
+   60103       1       25      21      25      20      19      23      27      20
+   60103       2       17      14      15      18      16      19      17      17
+   60103       3       20      24      21      22      18      18      26      18
+
+   70103       0       21      20      12      19      14      20      14      24
+   70103       1       17      25      18      20      17      22      18      17
+   70103       2       24      19      19      22      22      14      22      20
+   70103       3       24      26      22      19      17      20      21      20
+
+   60153       0       20      17      19      19      16      21      18      19
+   60153       1       20      15      18      23      26      13      25      23
+   60153       2       17      19      18      17      15      19      20      15
+   60153       3       21      17      23      19      20      15      77      20
+
+   70153       0       17      20      15      16      13      16      16      13
+   70153       1       18      13      21      18      18      19      19      22
+   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
+   0910        3       21      20      21      21      21      21      21      21
+
+   0911        0       21      16      16      22      16      21      23      13
+   0911        1       22      20      21      20      28      27      26      14
+   0911        2       23      22      16      20      19      22      22      26
+   0911        3       15      15      15      15      15      15      15      15
+
+   0912          0     20      22      18      20      28      20      14      17
+   0912          1     21      19      26      16      23      19      19      24
+   0912        2       15      15      15      15      15      15      15      15
+   0912        3       15      15      15      15      15      15      15      15
+ 
+   0900        0       28      77      77      19      77      25      21      19
+   0900        1       77      77      77      77      77      77      77      77
+   0900        2       77      77      23      19      25      19      16      22
+   0900        3       18      26      77      77      77      77      77      16
+
+   0901        0       25      77      14      77      22      26      20      77
+   0901        1       30      77      77      26      77      24      77      20
+   0901        2       21      18      77      21      24      77      77      23
+   0901        3       77      77      77      77      77      77      77      77
+
+   0902          0     24      77      24      77      77      77      77      24
+   0902        1       23      23      77      16      28      77      77      77
+   0902        2       77      77      77      77      23      77      77      17
+   0902        3       77      77      77      77      24      18      21      77
+

diff --git a/scripts/generate_address_list.pl b/scripts/generate_address_list.pl
index 923496ca57263f7dae6eef1677783a9de4fb80c9..d74151d44ccf119300c375675584fa52086d821c 100755 (executable)
--- a/scripts/generate_address_list.pl
+++ b/scripts/generate_address_list.pl
@@ -45,7 +45,7 @@ foreach my $p (0..3) {
     foreach my $b (0..15) {
     
       my $str;
-      if($boards->[$p][$s][$b] > 100) {
+      if($boards->[$p][$s][$b] > 80) {
         my $addr;
         $addr = MDC::get_address($p,$s,$b,5);
         $str .= sprintf("  0x%04x      %03i        %i\n",$addr,$boards->[$p][$s][$b],5);

diff --git a/serials/serials_mdcmbo.db b/serials/serials_mdcmbo.db
index 6f6f3fc3c5a1a8fa6d49ef1413e51cef2cb79033..175667844315a78cf8a876cbdfcff42de6339373 100644 (file)
--- a/serials/serials_mdcmbo.db
+++ b/serials/serials_mdcmbo.db
@@ -4,16 +4,16 @@
 ########################################
 #first version misses endpoint IDs, prefix with 8 (oep) and 6/7 (near and far tdc)
 80011 0x0000e4b3001f2941
-60011 0x0000f34c001f2941
-70011 0x00009c7d00202941
+60013 0x0000f34c001f2941
+70013 0x00009c7d00202941
 
 80021 0x0000e6cf001f2941  
-60021 0x0000f069001f2941  
-70021 0x0000fdd3001f2941  
+60023 0x0000f069001f2941  
+70023 0x0000fdd3001f2941  
 @ GU
 80031 0x000065a100202941
-60031 0x000099bd00202941
-70031 0x0000dfab001f2941
+60033 0x000099bd00202941
+70033 0x0000dfab001f2941
 
 80041
 
@@ -24,44 +24,50 @@
 80071
 
 80081 0x000009d700762941  
-60081 0x000090d700752941
-70081 0x0000766e00752941
+60083 0x000090d700752941
+70083 0x0000766e00752941
 
 80091  0x0000023000752941  
-60091  0x00001e4a00752941  
-70091  0x0000064e00752941  
+60093  0x00001e4a00752941  
+70093  0x0000064e00752941  
 
 80101 0x000060a900752941  
-60101 0x0000432d00752941
-70101 0x000090d200752941
+60103 0x0000432d00752941
+70103 0x000090d200752941
  
 80111 0x0000904400752941  
-60111 0x000024b200752941
-70111 0x00003be300752941
+60113 0x000024b200752941
+70113 0x00003be300752941
 
 80121 0x00001ea600752941 
-60121 0x0000028200752941
-70121 0x0000ede000742941
+60123 0x0000028200752941
+70123 0x0000ede000742941
 
 80131 0x0000274f00762941
-60131 0x00003f3b00762941
-70131 0x00005add00752941
+60133 0x00003f3b00762941
+70133 0x00005add00752941
 
 80141
 
-80151 0x0000fe5c001f2941
-60151 0x00009b7400202941
-70151 0x0000f5a1001f2941
+80015 0x0000fe5c001f2941
+60015 0x00009b7400202941
+70015 0x0000f5a1001f2941
 
 @ GU
 80161 0x000084d200202941 
-60161 0x00004f3800202941
-70161 0x0000e820001f2941
-
-
-
+60163 0x00004f3800202941
+70163 0x0000e820001f2941
 
 
+long mbo first 4 prototypes
 
+0905 0x000066e000822941
+0900 0x0000b8a400822941
+0901 0x0000c9bc00822941
+0902 0x00003cb800822941
 
+0915 0x0000620e00822941
+0910 0x0000194a00822941
+0911 0x00002a0200822941
+0912 0x000080c900822941
 

diff --git a/settings_power/settings_voltage.db b/settings_power/settings_voltage.db
index b20b2724c8ee98dda9a65527f387a1b907809ccd..f01e19615030fe17d87bf280e14463e37573d954 100644 (file)
--- a/settings_power/settings_voltage.db
+++ b/settings_power/settings_voltage.db
@@ -6,20 +6,20 @@
 
 #  Address   #  Voltage 1  #  Voltage 2
 ########################################
-  0x8e00          7              2
-  0x8e01          7              2
-  0x8e02          2              2
+  0x8e00          5              4
+  0x8e01          7              7
+  0x8e02          3              4
   0x8e03          2              2
   0x8e04          2              2
   0x8e05          2              2
-  0x8e06          2              2
+  0x8e06          7              7
   0x8e07          2              2
-  0x8e08          2              2
-  0x8e09          2              2
+  0x8e08          4              3
+  0x8e09          1              2
   0x8e0a          2              2
   0x8e0b          2              2
   0x8e0c          2              2
-  0x8e0d          2              2
+  0x8e0d          5              7
   0x8e10          2              2
   0x8e11          2              2
   0x8e12          2              2