Update frankfurt_test scripts

diff --git a/users/frankfurt_test/mdcstartup.sh b/users/frankfurt_test/mdcstartup.sh
new file mode 100755 (executable)
index 0000000..13e5328
--- /dev/null
+++ b/users/frankfurt_test/mdcstartup.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+echo "reset"
+ssh hadaq@jspc29 killall -USR1 trbnetd_longreset
+TRB3_SERVER=192.168.0.232 /d/jspc22/trb/git/trbnettools/binlocal/trbcmd reset
+sleep 6
+ssh hadaq@jspc29 killall -USR2 trbnetd_longreset
+
+
+echo "addresses"
+trbcmd s 0x0d00000941179228  0x01 0x8167
+
+trbcmd s 0x3700000270e0be28  0x05 0x80eb
+trbcmd s 0x3700000270e0be28  0x00 0x80e1
+trbcmd s 0x3700000270e0be28  0x01 0x80e2
+trbcmd s 0x3700000270e0be28  0x02 0x80e3
+trbcmd s 0x3700000270e0be28  0x03 0x80e4
+
+trbcmd s 0x1600000270e01228  0x05 0x80eb
+trbcmd s 0x1600000270e01228  0x00 0x80e1
+trbcmd s 0x1600000270e01228  0x01 0x80e2
+trbcmd s 0x1600000270e01228  0x02 0x80e3
+trbcmd s 0x1600000270e01228  0x03 0x80e4
+
+
+
+echo "Hubs"
+trbcmd w 0xfffe 0xc5 0x50ff
+
+../../tools/loadregisterdb.pl register_configgbe.db
+../../tools/loadregisterdb.pl register_configgbe_ip.db
+
+  trbcmd w 0xfe11 0x8000 0x8000
+  trbcmd w 0xfe11 0x8000 0x0000
+  trbcmd w 0xfe11 0xc5 0x1000
+  trbcmd loadbit 0xfe11 0xc5 0xffff0000 0x80300000  #with new hub (with auto-switch-off)
+  trbcmd loadbit 0xfe15 0xc5 0xffff0000 0x00080000  #MDC hubs
+
+
+echo "cts"
+trbcmd w 0x8167 0xa146  1000000
+
+

diff --git a/users/frankfurt_test/register_configgbe.db b/users/frankfurt_test/register_configgbe.db
index af1cc99feb9f07fe6dd26e303c4959f78da26ca2..b2681700c05aa3d15dc864cbb7ee7d4dfb52ad45 100755 (executable)
--- a/users/frankfurt_test/register_configgbe.db
+++ b/users/frankfurt_test/register_configgbe.db
@@ -6,6 +6,7 @@
 ################################################################################################### 
      0     0x8300   0x8305   0x8307   0x8308   0x830b   
      1     0x8301   0x8302   0x8304   0x8309   0x830c   0x830e   0x830f   0x8310
+    100    0x8301   0x8302   0x8303   0x8304   0x8306   0x8308    0x830b  0x830d
 
 
 !Value table
@@ -21,10 +22,13 @@
   0xc001      0       0xc001        1            1        0xffffff         1
   0xc002      0       0xc002        1            0        0xffffff         1
   0xc148      0       0xc148        1            0        0xffffff         1
-  0x83cc      0       0x83cc        1            0        0xffffff         1
+  0x83cc      0       0x83cc        1            1        0xffffff         1
   0x8150      0       0x8150        1            0        0xffffff         1
   0xc088      0       0xc088        1            0        0xffffff         1
   0xf3c0      0       0xc088        1            0        0xffffff         1
+  0x8245      0       0x8245        1            1        0xffffff         1
+  0x80eb      0       0x80eb        1            0        0xffffff         0
+  0x8167      0       0x8167        1            1        0xffffff         1
   
 
 #These values to not need to be written - for completeness only  
@@ -32,3 +36,6 @@
 # Hub    #  Type  #     C0     #     C1     #     C2    #     C3     #     C4     #     C5     #     C6     #     C7     #
 ##########################################################################################################################
 # 0xff7f      1      0x00020001   0x00030062     0x578         1         59800         200        32000         60000
+
+
+  0x80eb    100     0x00020001   0x00030062     0xea60       0x578          0        0xffffff      0x7          0x0

diff --git a/users/frankfurt_test/register_configgbe_ip.db b/users/frankfurt_test/register_configgbe_ip.db
index 8f68119ed7042ef2cfc16741cccb0cb4cf0b89ad..8559af04080a60396fa7ff014e23c19ffc0287ad 100755 (executable)
--- a/users/frankfurt_test/register_configgbe_ip.db
+++ b/users/frankfurt_test/register_configgbe_ip.db
@@ -23,6 +23,9 @@
     14     0x81E0   0x81E1   0x81E2   0x81E3   0x81E7
     15     0x81F0   0x81F1   0x81F2   0x81F3   0x81F7
 
+    1100     0x8105   0x8108  0x8104   0x8106
+
+    
 !Value table
 #                    Dest MAC    Dest MAC       Dest IP     Dest Port    Src Port   
 # Hub    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4     #
@@ -34,7 +37,6 @@
  0x8820        0    0x546C5E8B     0x0008      0xc0a800fe      0xc354     0xc350
  0xf3ce        0    0x546C5E8B     0x0008      0xc0a800fe      0xc354     0xc350
  0xc000        0    0xf4c85d53     0xbc5f      0xc0a80067      0xc351     0xc350
- 0xc001        0    0xf4c85d53     0xbc5f      0xc0a80067      0xc351     0xc350
 # 0xc002        0    0x546C5E8B     0x0008      0xc0a800fe      0xc362     0xc350
  0xc148        0    0x546C5E8B     0x0008      0xc0a800fe      50148      0xc350
  0x8150        0    0xf4c85d53     0xbc5f      0xc0a80067      50150      0xc350
@@ -42,5 +44,14 @@
  0xc002        0    0xf4c85d53     0xbc5f      0xc0a80067      50018      0xc350
  0xc088        0    0xf4c85d53     0xbc5f      0xc0a80067      50088      0xc350
  0xf3c0        0    0xf4c85d53     0xbc5f      0xc0a80067      52000      0xc350
- 0x83cc        0    0xf4c85d53     0xbc5f      0xc0a80067      50030      0xc350
 
+#jspc37
+ 0xc001        0    0xbacdb959     0x90e2      0xc0a80025      0xc351     0xc350
+ 0x8245        0    0xbacdb959     0x90e2      0xc0a80025      50245      0xc350
+ 0x83cc        0    0xbacdb959     0x90e2      0xc0a80025      50030      0xc350
+
+
+ 0x80eb        0    0xbacdb959     0x90e2      0xc0a80025      51000      0xc350
+ 0x8167        0    0xbacdb959     0x90e2      0xc0a80025      51001      0xc350
+
+ 0x80eb       1100   0x0230        0x0578   0xdead80eb   0xc0a80080

diff --git a/users/frankfurt_test/startup.sh b/users/frankfurt_test/startup.sh
index 7e28c6c9a7ed5103816450d9232436f495a13936..c95d2345b9f51e158b9876156780ca824f782a25 100755 (executable)
--- a/users/frankfurt_test/startup.sh
+++ b/users/frankfurt_test/startup.sh
@@ -45,11 +45,20 @@ trbcmd s 0x51000002e2e22828  0x01 0x0201
 trbcmd s 0x72000002e2eb4628  0x02 0x0202
 trbcmd s 0xb0000002e311b928  0x03 0x0203
 
+#245
+trbcmd s 0x1200000942c48628  0x05 0x8245
+trbcmd s 0xf0000009427a7a28  0x00 0x0450
+trbcmd s 0x5900000943b1bf28  0x01 0x0451
+trbcmd s 0xaa00000942a0a628  0x02 0x0452
+trbcmd s 0xa9000009427a7928  0x03 0x0453
+
 
 #Trb3sc
 trbcmd s 0x5100000a628eb428  1 0x0302
 #trbcmd s 0x0d00000941179228  1 0x0167
 trbcmd s 0x1e00000a6244da28  1 0x0303
+trbcmd s 0x3c00000a63104328 1 0x0300
+trbcmd s 0x1600000940a63f28 1 0x8143
 
 
 ##Dirich
@@ -84,9 +93,9 @@ trbcmd s 0x820000050dec0a28 0x01 0x83cc
 trbcmd s 0x0000719900202941 0x01 0x0550
 
 trbcmd s 0x1e00000a6244da28 0x01 0x0303
-trbcmd s 0x5100000a628eb428 0x01 0x0304
+#trbcmd s 0x5100000a628eb428 0x01 0x0304
 trbcmd s 0x00000c8300202941 0x01 0x0507
-
+trbcmd s 0x00004aa700202941 1    0x0508
 
 echo "Hubs"
 trbcmd w 0xfffe 0xc5 0x50ff
@@ -99,6 +108,9 @@ trbcmd w 0xc001 0xc3 0x0ffb
 ../../tools/loadregisterdb.pl register_configgbe.db
 ../../tools/loadregisterdb.pl register_configgbe_ip.db
 
+trbcmd w 0x8143 0xc0 0xffbf   #last SFP = pulser AddOn
+trbcmd w 0x8143 0xc1 0xffbf
+
 
 echo "cts"
 trbcmd w 0xc002 0xa156  100000
@@ -111,15 +123,28 @@ echo "tdc"
 trbcmd w 0xfe48 0xc801 0x000f0000
 trbcmd w 0xfe4e 0xc801 0x000f0000
 trbcmd w 0xfe71 0xc801 0x000f0000
+trbcmd w 0xfe73 0xc801 0x000f0000
+trbcmd w 0xfe4c 0xc801 0x80140064
+
 
 trbcmd w 0xfe71 0xc802 0x000f0000
 trbcmd w 0xfe71 0xc802 0x000f0000
+trbcmd w 0xfe73 0xc802 0xffffffff
+trbcmd w 0xfe4c 0xc802 0x0000ffff
+
+trbcmd w 0xfe73 0xc803 0xffffffff
 
 
 trbcmd w 0xfe48 0xc804 0x00000040
+trbcmd w 0xfe4c 0xc804 0x00000040
 trbcmd w 0xfe4e 0xc804 0x00000040
 trbcmd w 0xfe71 0xc804 0x00000010
+trbcmd w 0xfe73 0xc804 0x00000010
+
 
+trbcmd w 0x0300 0xc802 0xffffffff
+trbcmd w 0x0300 0xc803 0xffffffff
+trbcmd w 0x0300 0xc804 0x00000010
 
 trbcmd w 0x0303 0xc802 0xffffffff
 trbcmd w 0x0303 0xc803 0xffffffff
@@ -129,10 +154,9 @@ trbcmd w 0x0304 0xc802 0xffffffff
 trbcmd w 0x0304 0xc803 0xffffffff
 trbcmd w 0x0304 0xc804 0x00000010
 
-trbcmd w 0x0507 0xc802 0xffffffff
-trbcmd w 0x0507 0xc803 0xffffffff
-trbcmd w 0x0507 0xc804 0x00000010
-
+trbcmd w 0xfe81 0xc802 0xffffffff
+trbcmd w 0xfe81 0xc803 0xffffffff
+trbcmd w 0xfe81 0xc804 0x00000010
 
 
 trbcmd clearbit 0x83cc 0xc0 0x80