switchwed MBOs

diff --git a/installation/mbo_positions.db b/installation/mbo_positions.db
index 4d64e65df585a7759ea93edfa963dc6cb085f387..d072272c83cf6cd155b17a7f43366f4cb32a4c24 100644 (file)
--- a/installation/mbo_positions.db
+++ b/installation/mbo_positions.db
@@ -1,19 +1,19 @@
 #Plane   Sector   MBO     Long     Serial
 ##########################################
-0        0        0        0        007
-0        0        1        1        093
-0        0        2        1        096
-0        0        3        0        0
-0        0        4        0        0
-0        0        5        0        006
-0        0        6        1        095
-0        0        7        1        094
-0        0        8        0        0
-0        0        9        0        0
-0        0        10       1        0
-0        0        11       0        002
-0        0        12       1        0
-0        0        13       0        0
+0        0        0        0        001
+0        0        1        1        002
+0        0        2        1        011
+0        0        3        0        007
+0        0        4        0        093
+0        0        5        0        000
+0        0        6        1        090
+0        0        7        1        090
+0        0        8        0        000
+0        0        9        0        000
+0        0        10       1        091
+0        0        11       0        000
+0        0        12       1        000
+0        0        13       0        000
 
 0        1        0        0        0
 0        1        1        1        0

diff --git a/installation/power_outputs.db b/installation/power_outputs.db
index b67e0851379a522ed1219b5082c9472b6255ca89..1f663a19aa8fcc8af23b00bcc9a637516e7b0ba4 100644 (file)
--- a/installation/power_outputs.db
+++ b/installation/power_outputs.db
@@ -13,7 +13,7 @@
 0        0        10       2        2
 0        0        11       2        3
 0        0        12       3        0
-0        0        13       3        2
+0        0        13       3        1
 
 0        1        0        0        0
 0        1        1        0        1

diff --git a/pasttrec/pasttrec_baseline.db b/pasttrec/pasttrec_baseline.db
index cc37eb8b0ec5bd55dbb1254a3841db73c0e3d478..fa47c7027ee8aeea46021b1a82bf64e5a1bd6549 100644 (file)
--- a/pasttrec/pasttrec_baseline.db
+++ b/pasttrec/pasttrec_baseline.db
@@ -21,15 +21,36 @@
    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
+   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
 
-   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
+   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
+ 
+   60063        0       19      25      25      19      77      23      21      19
+   60063        1       20      24      18      19      27      21      27      27
+   60063        2       28      21      26      26      25      20      26      23
+   60063        3       18      24      21      28      13      24      20      26
+
+   70063        0       23      26      26      77      77      77      14      77
+   70063        1       23      27      24      18      23      18      15      24
+   70063        2       20      18      26      17      15      15      18      17
+   70063        3       16      23      16      19      20      20      18      10
+
+ 
+   60073        0       26      77      17      77      77      77      77      77
+   60073        1       27      24      24      19      24      24      77      23
+   60073        2       22      20      18      26      22      17      21      19
+   60073        3       18      22      23      19      18      26      25      24
+
+   70073        0       77      77      29      77      13      19      19      16
+   70073        1       21      24      17      25      18      30      24      20
+   70073        2       23      21      29      27      29      24      24      24
+   70073        3       18      23      18      16      22      17      17      20
 
    60083       0       23      22      10      26      18      24      21      14
    60083       1       20      24      16      22      21      21      22      23
@@ -40,26 +61,28 @@
    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
+   
+   60093       0       21      21      14      19      20      21      20      18
+   60093       1       20      26      23      20      18      29      24      29
+   60093       2       21      20      19      18      17      24      21      16
+   60093       3       19      28      15      24      20      17      17      21
 
-   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
+   70093       0       22      23      14      21      21      18      23      13
+   70093       1       25      20      14      18      14      19      22      15
+   70093       2       18      21      18      24      25      20      22      25
+   70093       3       25      22      24      24      23      19      20      22
 
-   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
+   
+ 
+   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
 
-   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
+   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
 
    60113       0       28      18      21      26      23      25      27      22
    60113       1       25      19      27      25      18      26      25      16
@@ -71,15 +94,26 @@
    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
+   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
+
+   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
 
    60153       0       20      17      19      19      16      21      18      19
    60153       1       20      15      18      23      26      13      25      23
@@ -115,7 +149,7 @@
    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
+   0912        3       29  21  23  25  23  23  23  25
  
    0900        0       28      30      22      19      77      25      21      19
    0900        1       77      77      77      77      77      77      77      77
@@ -157,3 +191,147 @@
    0932  2     28      26      20      16      19      18      17      23
    0932  3     20      23      16      20      24      12      23      17
 
+
+   0940  0       77      77      77      77      16      16      77      77
+   0940  1       16      20      18      19      23      19      16      23
+   0940  2       24      21      22      27      25      18      23      27
+   0940  3       19      30      24      26      19      24      20      20
+
+   0941  0       19      26      17      24      20      18      24      20
+   0941  1       24      20      22      22      20      17      12      29
+   0941  2       16      19      27      22      20      23      21      26
+   0941  3       15      23      24      28      30      20      24      30
+
+   0942  0       19      19      16      24      17      17      26      20
+   0942  1       24      24      18      23      21      18      20      19
+   0942  2       21      20      18      21      25      25      17      18
+   0942  3       23      25      19      18      18      21      25      16
+
+
+   0950  0       30      27      26      24      18      19      77      20
+   0950  1       18      26      18      20      21      27      15      22
+   0950  2       24      22      21      22      21      24      20      27
+   0950  3       26      23      26      19      23      22      26      18
+
+   0951  0       23      24      17      77      22      77      77      77
+   0951  1       31      19      20      19      21      26      28      17
+   0951  2       20      21      20      20      23      22      19      19
+   0951  3       19      22      23      24      17      24      24      20
+
+   0952  0       19      17      20      21      77      17      77      23
+   0952  1       24      20      17      29      20      16      23      22
+   0952  2       22      19      19      15      17      13      24      22
+   0952  3       19      18      21      19      23      19      14      17
+
+
+   0960  0       26      21      24      26      19      22      26      14
+   0960  1       16      18      21      25      16      14      22      17
+   0960  2       25      22      22      25      26      20      22      19
+   0960  3       20      22      20      23      24      19      20      20
+
+   0961  0       19      26      25      23      22      21      25      24
+   0961  1       27      23      26      27      22      23      24      26
+   0961  2       28      22      30      23      26      26      26      14
+   0961  3       26      21      26      26      17      26      21      22
+
+   0962  0       21      20      18      11      23      10      20      27
+   0962  1       16      17      18      20      23      14      24      26
+   0962  2       24      14      16      20      25      27      21      24
+   0962  3       23      23      15      23      19      18      24      14
+
+   
+   910  0       19      19      27      21      17      22      19      22
+   910  1       19      23      23      13      15      09      20      26
+   910  2       77      11      11      11      11      11      11      11
+   910  3       21      21      21      21      21      21      21      21
+
+   911  0       21      16      16      22      16      21      23      13
+   911  1       22      20      21      20      28      28      26      14
+   911  2       23      22      17      20      20      22      22      26
+   911  3       77      77      77      77      77      77      77      77
+
+   912  0       20      22      10      20      02      12      18      17
+   912  1       11      06      11      04      11      07      06      11
+   912  2       77      77      77      77      77      77      77      77
+   912  3       29      21      23      25      23      23      23      25
+
+   60013        0       21      16      16      17      18      22      15      21
+   60013        1       18      18      17      16      18      13      14      22
+   60013        2       17      18      19      15      14      18      19      22
+   60013        3       17      20      19      14      21      23      21      23
+
+   60043        0       77      77      77      77      25      77      77      77
+   60043        1       77      20      77      77      25      77      15      28
+   60043        2       77      19      29      77      21      77      77      77
+   60043        3       15      77      77      15      77      77      27      77
+
+   60063        0       19      25      25      19      27      23      21      19
+   60063        1       20      23      18      19      27      21      27      27
+   60063        2       28      21      26      26      25      20      26      23
+   60063        3       18      24      21      28      12      24      20      26
+
+   60073        0       26      18      17      24      20      22      16      23
+   60073        1       27      24      24      19      24      24      11      24
+   60073        2       22      20      18      26      22      17      21      19
+   60073        3       18      22      23      19      18      26      24      24
+
+   70013        0       19      23      21      19      23      20      23      19
+   70013        1       19      16      23      18      23      19      24      16
+   70013        2       14      19      24      19      13      17      21      21
+   70013        3       14      20      14      17      23      19      22      10
+
+   70043        0       27      22      77      77      21      21      19      18
+   70043        1       24      22      20      18      25      77      77      77
+   70043        2       18      23      77      20      20      19      25      23
+   70043        3       18      17      77      20      14      18      21      16
+
+   70063        0       23      26      26      27      19      22      14      24
+   70063        1       23      27      24      18      23      18      16      24
+   70063        2       20      18      26      18      15      15      18      17
+   70063        3       16      23      16      19      20      19      18      10
+
+   70073        0       21      24      29      16      13      19      19      16
+   70073        1       21      24      17      25      18      30      24      20
+   70073        2       23      21      29      27      29      24      24      24
+   70073        3       18      23      18      16      22      17      17      20
+
+
+  60013        0       21      16      16      18      19      23      16      21
+   60013       1       18      18      17      16      18      14      14      22
+   60013       2       21      22      21      15      15      19      19      23
+   60013       3       17      20      19      14      21      23      21      23
+
+   60023       0       25      23      28      21      21      26      24      24
+   60023       1       25      17      15      22      25      18      22      21
+   60023       2       16      13      15      13      19      23      24      20
+   60023       3       19      19      19      13      18      21      19      15
+
+   60043       0       25      14      18      18      25      18      12      20
+   60043       1       20      20      18      18      25      13      15      28
+   60043       2       14      19      29      19      21      25      19      15
+   60043       3       15      19      11      15      20      17      27      22
+
+   60073       0       26      18      17      24      20      22      16      23
+   60073       1       27      24      24      19      24      24      77      24
+   60073       2       22      20      18      26      22      17      21      19
+   60073       3       18      22      23      19      18      26      24      24
+
+   70013       0       19      23      21      19      23      20      23      19
+   70013       1       19      16      23      18      23      19      24      16
+   70013       2       14      19      24      19      14      17      21      21
+   70013       3       14      20      15      17      23      19      22      10
+
+   70023       0       19      28      17      28      20      29      15      20
+   70023       1       16      17      19      17      15      19      18      18
+   70023       2       20      18      24      16      18      18      17      14
+   70023       3       14      24      19      23      18      19      25      16
+
+   70043       0       27      22      23      27      21      21      19      18
+   70043       1       24      22      20      18      25      23      19      24
+   70043       2       18      23      20      20      20      19      25      23
+   70043       3       18      17      23      21      14      18      21      16
+
+   70073       0       21      24      29      16      13      19      19      16
+   70073       1       21      24      17      25      18      30      24      20
+   70073       2       23      21      29      27      29      24      24      24
+   70073       3       18      23      18      16      22      17      17      20

diff --git a/scripts/pasttrec_baseline_finder.pl b/scripts/pasttrec_baseline_finder.pl
index 61cefac15631d5169ce025b80b8498990883bd4a..f4ed393f95ebc133854944ee7d8726607aad9ae7 100755 (executable)
--- a/scripts/pasttrec_baseline_finder.pl
+++ b/scripts/pasttrec_baseline_finder.pl
@@ -154,7 +154,12 @@ foreach my $b (sort { $addresses->{$a} <=> $addresses->{$b} } keys %{$rates}) {
       $baselines->{$b}[$p*8+7]+0.5,
       );
     }
-  print("\n");  
+  print("\n");
+    foreach my $c (0..31) {
+     foreach my $i (0..31) {
+      #  printf("  %i\t %02i\n",  $i, $rates->{$b}[$c][$i] );
+        }
+    }
   }
 printf(" No baseline found for %i channels. \n", $numOfFailures);
   

diff --git a/scripts/testpb.pl b/scripts/testpb.pl
index 3017eb871e631684eba4f29d9d786192f3968c90..dbf9e26811e5690d261cd79d460f15d1fbcbfaee 100644 (file)
--- a/scripts/testpb.pl
+++ b/scripts/testpb.pl
@@ -10,7 +10,7 @@ use MDCPower;
 
 
 #   my($host,$board,$output,$channel,$command,$value)
-print(MDCPower::powerboard_command("192.168.0.12",-1,0,0,"temp")."\n");
-print(MDCPower::powerboard_command("192.168.0.12",0,0,0,"temp")."\n");
-print(MDCPower::powerboard_command("192.168.0.12",0,0,0,"curr")."\n");
-print(MDCPower::powerboard_command("192.168.0.12",0,0,0,"vin")."\n");
+print(MDCPower::powerboard_command("mdcpd052",-1,0,0,"temp")."\n");
+print(MDCPower::powerboard_command("mdcpd052",0,0,0,"temp")."\n");
+print(MDCPower::powerboard_command("mdcpd052",0,0,0,"curr")."\n");
+print(MDCPower::powerboard_command("mdcpd052",0,0,0,"vin")."\n");

diff --git a/serials/serials_mdcmbo.db b/serials/serials_mdcmbo.db
index e75de17212cbf56b0e19c7d2caabb1bb38d10c6a..c03fc19b49c171361cbb01af8b6a9a3a59f21127 100644 (file)
--- a/serials/serials_mdcmbo.db
+++ b/serials/serials_mdcmbo.db
@@ -19,7 +19,9 @@
 60043  0x0000618f00752941  
 70043  0x0000770800752941  
 
-#80051
+80055  0x00001eaa00752941  
+60053  0x0000243900752941  
+70053  0x0000606100752941  
 
 80065  0x0000039800752941  
 60063  0x0000238000752941  
@@ -56,9 +58,9 @@
 
 #80141
 
-80015 0x0000fe5c001f2941
-60013 0x00009b7400202941
-70013 0x0000f5a1001f2941
+80155 0x0000fe5c001f2941
+60153 0x00009b7400202941
+70153 0x0000f5a1001f2941
 
 80165 0x000084d200202941  #@GU
 60163 0x00004f3800202941
@@ -102,10 +104,33 @@
 
 0975  0x000060c200822941
 0970  0x0000b8a600822941
-#0971  ## faulty FPG crashed TRB3
+0971  0x0000443f00822941  ## FPGA neu gelötet, no longer faulty FPG crashed TRB3
 0972  0x0000b8e600822941
 
 #0975  
 #0970  
 #0971  
 #0972
+
+1005  0x00003cdc00822941  
+1000  0x000080b900822941  
+1001  0x0000464900822941  
+1002  0x00003b3000822941  
+
+1015  0x0000d0aa00822941  
+1010  0x00009cd700822941  
+1011  0x0000b89800822941  
+1012  0x00003c7200822941  
+
+#MBO #102: 3rd TDC not showing up in trbnet, but programming works
+1025  0x0000379700822941
+1020  0x0000622600822941
+1021  0x0000be4300822941
+1022
+
+1035  0x0000274500822941   
+1030  0x0000263400822941   
+1031  0x000062c000822941   
+1032  0x0000a31500822941   
+
+

diff --git a/settings_power/settings_voltage.db b/settings_power/settings_voltage.db
index 7991fc3e1c3be5cbe2087112a02f4e1e84415f9d..d99df1db2ba0c03795cc207772eecaab625ef9e9 100644 (file)
--- a/settings_power/settings_voltage.db
+++ b/settings_power/settings_voltage.db
@@ -7,22 +7,22 @@
 #  Address   #  Voltage 1  #  Voltage 2
 ########################################
   0x8e00          5              5
-  0x8e01          6              7
-  0x8e02          5              6
+  0x8e01          6              6
+  0x8e02          4              4
   0x8e03          5              5
-  0x8e04          5              5
-  0x8e05          4              4
-  0x8e06          5              7
+  0x8e04          6              7
+  0x8e05          6              6
+  0x8e06          6              6
   0x8e07          6              6
-  0x8e08          5              5
-  0x8e09          5              5
-  0x8e0a          5              5
-  0x8e0b          4              4
-  0x8e0c          5              5
-  0x8e0d          5              5
+  0x8e08          6              6
+  0x8e09          6              6
+  0x8e0a          6              6
+  0x8e0b          6              6
+  0x8e0c          6              6
+  0x8e0d          6              6
   
   
-  0x8e10          5              2
+  0x8e10          7              6
   0x8e11          5              2
   0x8e12          5              2
   0x8e13          5              2
@@ -92,22 +92,22 @@
   0x8e5b          2              2
   0x8e5c          2              2
   0x8e5d          2              2
-  0x8e60          2              2
-  0x8e61          2              2
-  0x8e62          2              2
-  0x8e63          2              2
-  0x8e64          2              2
-  0x8e65          2              2
-  0x8e66          2              2
-  0x8e67          2              2
-  0x8e68          2              2
-  0x8e69          2              2
-  0x8e6a          2              2
-  0x8e6b          2              2
-  0x8e6c          2              2
-  0x8e6d          2              2
-  0x8e6e          2              2
-  0x8e6f          2              2
+  0x8e60          6              6
+  0x8e61          6              6
+  0x8e62          6              6
+  0x8e63          6              6
+  0x8e64          6              6
+  0x8e65          6              6
+  0x8e66          6              6
+  0x8e67          6              6
+  0x8e68          6              6
+  0x8e69          6              6
+  0x8e6a          6              6
+  0x8e6b          6              6
+  0x8e6c          6              6
+  0x8e6d          6              6
+  0x8e6e          6              6
+  0x8e6f          6              6
   0x8e70          2              2
   0x8e71          2              2
   0x8e72          2              2