added serials and addresses for PANDA TRB3, mt

diff --git a/base/addresses_trb3.db b/base/addresses_trb3.db
index 0827e6e9ca31ac6bbbd0e57f47c7a2a2a40d8146..ab71cf3a451ed7a1fde30ac349ac8513a63988c7 100644 (file)
--- a/base/addresses_trb3.db
+++ b/base/addresses_trb3.db
@@ -213,11 +213,12 @@
 0x0313             46     3
 0x8000      46            5
 
-0x0310             47     0
-0x0801             47     1
-0x0312             47     2
-0x0313             47     3
-0x8000      47            5
+#MCP 11
+0x1110             47     0
+0x1111             47     1
+0x1112             47     2
+0x1113             47     3
+0x8011      47            5
 
 0x0310             48     0
 0x0801             48     1
@@ -266,30 +267,32 @@
 0x0312             55     2
 0x0313             55     3
 0x8000      55            5
-
-0x0310             56     0
-0x0311             56     1
-0x0312             56     2
-0x0313             56     3
-0x8000      56            5
-
-0x0310             57     0
-0x0311             57     1
-0x0312             57     2
-0x0313             57     3
-0x8000      57            5
-
-0x0310             58     0
-0x0311             58     1
-0x0312             58     2
-0x0313             58     3
-0x8000      58            5
-
-0x0310             59     0
-0x0311             59     1
-0x0312             59     2
-0x0313             59     3
-0x8000      59            5
+#CTS
+0x8100             56     0
+0x8101             56     1
+0x8102             56     2
+0x8103             56     3
+0x7999      56            5
+
+#MCP 2
+0x0210             57     0
+0x0211             57     1
+0x0212             57     2
+0x0213             57     3
+0x8002      57            5
+
+0x1710             58     0
+0x1711             58     1
+0x1712             58     2
+0x1713             58     3
+0x8017      58            5
+
+#MCP 12
+0x1210             59     0
+0x1211             59     1
+0x1212             59     2
+0x1213             59     3
+0x8012      59            5
 
 0xc000             60     0
 0xc001             60     1
@@ -315,11 +318,11 @@
 0xc00f             63     3
 0x8003      63            5
 
-0x0310             64     0
-0x0311             64     1
-0x0312             64     2
-0x0313             64     3
-0x8000      64            5
+0x1810             64     0
+0x1811             64     1
+0x1812             64     2
+0x1813             64     3
+0x8018      64            5
 
 0x0310             65     0
 0x0311             65     1
@@ -363,23 +366,26 @@
 0xc003             71     3
 0x8000      71            5
 
-0xc000             72     0
-0xc001             72     1
-0xc002             72     2
-0xc003             72     3
-0x8000      72            5
-
-0xc000             73     0
-0xc001             73     1
-0xc002             73     2
-0xc003             73     3
-0x8000      73            5
-
-0xc000             74     0
-0xc001             74     1
-0xc002             74     2
-0xc003             74     3
-0x8000      74            5
+#MCP 10
+0x1010             72     0
+0x1011             72     1
+0x1012             72     2
+0x1013             72     3
+0x8010      72            5
+
+#MCP 4
+0x0410             73     0
+0x0411             73     1
+0x0412             73     2
+0x0413             73     3
+0x8004      73            5
+
+#MCP TOF rear
+0x1610      74      0
+0x1611      74      1
+0x1612      74      2
+0x1613      74      3
+0x8016      74      5
 
 0xc000             75     0
 0xc001             75     1
@@ -398,12 +404,13 @@
 0xc002             77     2
 0xc003             77     3
 0x8000      77            5
-      
-0xc000             78     0
-0xc001             78     1
-0xc002             78     2
-0xc003             78     3
-0x8000      78            5
+    
+#MCP 7  
+0x0710             78     0
+0x0711             78     1
+0x0712             78     2
+0x0713             78     3
+0x8007      78            5
 
 0xc000             79     0
 0xc001             79     1
@@ -429,17 +436,19 @@
 0xc003             82     3
 0x8000      82            5
 
-0xc000             83     0
-0xc001             83     1
-0xc002             83     2
-0xc003             83     3
-0x8000      83            5
+#MCP 6
+0x0610             83     0
+0x0611             83     1
+0x0612             83     2
+0x0613             83     3
+0x8006      83            5
 
-0xc000             84     0
-0xc001             84     1
-0xc002             84     2
-0xc003             84     3
-0x8000      84            5
+#MCP 13
+0x1310             84     0
+0x1311             84     1
+0x1312             84     2
+0x1313             84     3
+0x8013      84            5
 
 0xc000             85     0
 0xc001             85     1
@@ -447,11 +456,11 @@
 0xc003             85     3
 0x8000      85            5
       
-0xc000             86     0
-0xc001             86     1
-0xc002             86     2
-0xc003             86     3
-0x8000      86            5
+0x1910             86     0
+0x1911             86     1
+0x1912             86     2
+0x1913             86     3
+0x8019      86            5
       
 0xc000             87     0
 0xc001             87     1
@@ -465,11 +474,12 @@
 0xc003             88     3
 0x8000      88            5
 
-0xc000             89     0
-0xc001             89     1
-0xc002             89     2
-0xc003             89     3
-0x8000      89     5
+#MCP 1
+0x0110             89     0
+0x0111             89     1
+0x0112             89     2
+0x0113             89     3
+0x8001      89     5
 
 0xc000             90      0
 0xc001             90      1
@@ -495,11 +505,11 @@
 0xc003      93      3
 0x8000      93      5
 
-0xc000      94      0
-0xc001      94      1
-0xc002      94      2
-0xc003      94      3
-0x8000      94      5
+0x2010      94      0
+0x2011      94      1
+0x2012      94      2
+0x2013      94      3
+0x8020      94      5
 
 0xc000      95      0
 0xc001      95      1
@@ -507,29 +517,31 @@
 0xc003      95      3
 0x8000      95      5
 
-0xc000      96      0
-0xc001      96      1
-0xc002      96      2
-0xc003      96      3
-0x8000      96      5
-
-0xc000      97      0
-0xc001      97      1
-0xc002      97      2
-0xc003      97      3
-0x8000      97      5
-
-0xc000      98      0
-0xc001      98      1
-0xc002      98      2
-0xc003      98      3
-0x8000      98      5
-
-0xc000      99      0
-0xc001      99      1
-0xc002      99      2
-0xc003      99      3
-0x8000      99      5
+0x1610      96      0
+0x1611      96      1
+0x1612      96      2
+0x1613      96      3
+0x8016      96      5
+
+#MCP 14
+0x1410      97      0
+0x1411      97      1
+0x1412      97      2
+0x1413      97      3
+0x8014      97      5
+
+0x1210      98      0
+0x1211      98      1
+0x1212      98      2
+0x1213      98      3
+0x8012      98      5
+
+#MCP 3
+0x0310      99      0
+0x0311      99      1
+0x0312      99      2
+0x0313      99      3
+0x8003      99      5
 
 0xc000     100      0
 0xc001     100      1
@@ -537,17 +549,19 @@
 0xc003     100      3
 0x8000     100      5
 
-0xc000     101      0
-0xc001     101      1
-0xc002     101      2
-0xc003     101      3
-0x8000     101      5
+#Beam counters
+0x1510     101      0
+0x1511     101      1
+0x1512     101      2
+0x1513     101      3
+0x8015     101      5
 
-0xc000     102      0
-0xc001     102      1
-0xc002     102      2
-0xc003     102      3
-0x8000     102      5
+#MCP 5
+0x0510     102      0
+0x0511     102      1
+0x0512     102      2
+0x0513     102      3
+0x8005     102      5
 
 0xc000     103      0
 0xc001     103      1
@@ -555,19 +569,20 @@
 0xc003     103      3
 0x8000     103      5
 
-0xc000     104      0
-0xc001     104      1
-0xc002     104      2
-0xc003     104      3
-0x8000     104      5
-
-0xc000     105      0
-0xc001     105      1
-0xc002     105      2
-0xc003     105      3
+#MCP 8
+0x0810     104      0
+0x0811     104      1
+0x0812     104      2
+0x0813     104      3
+0x8008     104      5
+
+#MCP 0
+0x0010     105      0
+0x0011     105      1
+0x0012     105      2
+0x0013     105      3
 0x8000     105      5
 
-
 0xc000     106      0
 0xc001     106      1
 0xc002     106      2
@@ -586,11 +601,12 @@
 0xc003     108      3
 0x8000     108      5
 
-0xc000     109      0
-0xc001     109      1
-0xc002     109      2
-0xc003     109      3
-0x8000     109      5
+#MCP 9
+0x0910     109      0
+0x0911     109      1
+0x0912     109      2
+0x0913     109      3
+0x8009     109      5
 
 0xc000     110      0
 0xc001     110      1

diff --git a/base/serials_trb3.db b/base/serials_trb3.db
index 1460ab4549c4c0658bd6fa6ca60d49d6a4d0b94d..b740440ee81af95f0406dd5b59036ba5a7e684b4 100644 (file)
--- a/base/serials_trb3.db
+++ b/base/serials_trb3.db
@@ -513,12 +513,13 @@
    0852       0xcd00000313256228 
    0853       0x9d0000031321cc28 
    0855       0xa9000003133e5528  
-               
-   0860        
-   0861        
-   0862        
-   0863        
-   0865        
+             
+ 
+   0860       0x52000003131fda28
+   0861       0xd500000313104928
+   0862       0xeb000003131c2d28
+   0863       0x00000003131c2828
+   0865       0xfb00000313133228
                
    0870        
    0871        
@@ -562,6 +563,12 @@
    0933        0xe3000004f9e01028
    0935        0x1d000004f9e44a28
 
+   0940        
+   0941        
+   0942        
+   0943        
+   0945        
+
    0950        0xbe000004f9f1a528
    0951        0x53000004f9e8cd28
    0952        0x83000004fa228b28

diff --git a/thresholds/dump_thresholds.pl b/thresholds/dump_thresholds.pl
index 0c2b4a6e7e39a51307068455d950c20571104349..26ca08fd8564ea12da898779d89b20d21dd65f16 100755 (executable)
--- a/thresholds/dump_thresholds.pl
+++ b/thresholds/dump_thresholds.pl
@@ -4,4 +4,4 @@ if($ARGV[0] eq "") {
   die "Requires four hex digit network address of board to dump";
        }
 
-system("../cts/htdocs/commands/getpadiwa.pl ".$ARGV[0]." threshdump")
+system("cd ../web/htdocs/commands/ ; ./getpadiwa.pl ".$ARGV[0]." threshdump")