added addresses of new MBOs

diff --git a/installation/mbo_positions.db b/installation/mbo_positions.db
index 188e16fe4acbaedca19926cd38e0e858c4c7d2aa..00bd8a2bb6bd914415f149c70e862f8d0270995d 100644 (file)
--- a/installation/mbo_positions.db
+++ b/installation/mbo_positions.db
@@ -1,8 +1,8 @@
 #Plane   Sector   Board    Long     Serial
 ##########################################
-0        0        0        0        0
-0        0        1        1        0
-0        0        2        1        0
+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        5        0        0
@@ -10,10 +10,10 @@
 0        0        7        1        0
 0        0        8        0        0
 0        0        9        0        0
-0        0        10       1        0
-0        0        11       0        0
-0        0        12       1        0
-0        0        13       0        0
+0        0        10       1        012
+0        0        11       0        002
+0        0        12       1        011
+0        0        13       0        010
 
 0        1        0        0        0
 0        1        1        1        0

diff --git a/pasttrec/pasttrec_baseline.db b/pasttrec/pasttrec_baseline.db
index 284777e474f10f1ad9da6b2a4f2efd77edade0d7..c4865782404e1dc5d075b2ad34ae8cd9ae67cba9 100644 (file)
--- a/pasttrec/pasttrec_baseline.db
+++ b/pasttrec/pasttrec_baseline.db
@@ -79,13 +79,22 @@
    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
    
    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

diff --git a/scripts/MDC.pm b/scripts/MDC.pm
index f65bcea660d63db5978decffd6862c2e013dd1ae..04800c418fbf0404cb7aa7a8798cdc8284ee0cc5 100644 (file)
--- a/scripts/MDC.pm
+++ b/scripts/MDC.pm
@@ -90,8 +90,8 @@ sub get_power_output {
       }
     }
   close FILE;  
-  
-  my $hostname = sprintf("mdcpd%03x",$id);
+
+  my $hostname = sprintf("mdcpd%03i",$id);
   return(-1,0,0) if $id==-1;
      
   open FILE, "../installation/power_outputs.db" or die $!."\npower_outputs.db not found.";

diff --git a/scripts/mdc_voltage.pl b/scripts/mdc_voltage.pl
index 674d7345373321b92c547d741dc4bbca073a4ede..4faad22653a0d25ecee0b94080e7b2b4fd33ab98 100755 (executable)
--- a/scripts/mdc_voltage.pl
+++ b/scripts/mdc_voltage.pl
@@ -121,7 +121,7 @@ elsif  (defined $board && defined $relative  && defined $channel) {
   if($newset>7) { $newset = 7; print "Out of range.\n";}
   if($newset<0) { $newset = 0; print "Out of range.\n";}  
   print("Change Settings\n");
-  my $ret = MDCPower::set_voltage($board,$channel,$setting,0);
+  my $ret = MDCPower::set_voltage($board,$channel,$newset,0);
   die "Invalid Settings\n" if $ret == -1;
   die "Power Output not found\n" if $ret == -2;
   

diff --git a/serials/serials_mdcmbo.db b/serials/serials_mdcmbo.db
index 3ecaba487e2371f941b95b6c6a7100cb825c013e..6f6f3fc3c5a1a8fa6d49ef1413e51cef2cb79033 100644 (file)
--- a/serials/serials_mdcmbo.db
+++ b/serials/serials_mdcmbo.db
@@ -5,7 +5,7 @@
 #first version misses endpoint IDs, prefix with 8 (oep) and 6/7 (near and far tdc)
 80011 0x0000e4b3001f2941
 60011 0x0000f34c001f2941
-70011
+70011 0x00009c7d00202941
 
 80021 0x0000e6cf001f2941  
 60021 0x0000f069001f2941  
@@ -49,7 +49,10 @@
 
 80141
 
-80151
+80151 0x0000fe5c001f2941
+60151 0x00009b7400202941
+70151 0x0000f5a1001f2941
+
 @ GU
 80161 0x000084d200202941 
 60161 0x00004f3800202941

diff --git a/settings_power/settings_voltage.db b/settings_power/settings_voltage.db
index 649d87d2bfdce4d9b3d174f59a6cfdcf7c431caf..b20b2724c8ee98dda9a65527f387a1b907809ccd 100644 (file)
--- a/settings_power/settings_voltage.db
+++ b/settings_power/settings_voltage.db
@@ -6,8 +6,8 @@
 
 #  Address   #  Voltage 1  #  Voltage 2
 ########################################
-  0x8e00          2              2
-  0x8e01          2              2
+  0x8e00          7              2
+  0x8e01          7              2
   0x8e02          2              2
   0x8e03          2              2
   0x8e04          2              2