Added new TRB3 boards

diff --git a/.gitignore b/.gitignore
index 829891ff13091129ee453a1502633d77d713fb3f..dc267f6ff1ba57f4dfe2bedc4e51dfcef93e35e5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,10 @@ hmon/vertex
 *~
 *.bak
 *.log
+rich/peds
+bitfiles
+*.kate-swp
+*.save
+nohup.out
+delme
+*.back

diff --git a/hub/addresses_hub.db b/hub/addresses_hub.db
index 3af6c554a7f3bdce04592bccb0e2096962c917c8..785daa6a71388d46d8a77fbf57a2a9c5cfbc348e 100644 (file)
--- a/hub/addresses_hub.db
+++ b/hub/addresses_hub.db
@@ -37,7 +37,7 @@
 
 #Wall
 0x8701        007         1          2        121  #exchanged 004 on 16.03.11
-0x8700        007         2          4        121
+0x8700        007         2          4        121  # wall hub
 
 #Start/Veto/CTS
 0x8801        015         1          3        107
@@ -49,3 +49,4 @@
 
 #StartTRB3
 0x8880        0745        5          0        074
+0x8890        1065        5          0        106

diff --git a/hub/register_configgbe_ip_eb5master.db b/hub/register_configgbe_ip_eb5master.db
index 8ae690008a017df02b61aa3eacfd4da74c30a303..4528aaa591cbc5d5a8a3a754984a9a8dbe55c3e8 100644 (file)
--- a/hub/register_configgbe_ip_eb5master.db
+++ b/hub/register_configgbe_ip_eb5master.db
@@ -110,7 +110,9 @@
   0x8700      0        0xc35A     0xdead8700   0xc0a8648A     0xc35A     0xc0a8640f
   0x8800      0        0xc350     0xdead8800   0xc0a8648B     0xc350     0xc0a8640f
   0x8900      0        0xc35C     0xdead8900   0xc0a8648C     0xc35C     0xc0a8640f
-  0x8880      0        0xc35D     0xdead8A00   0xc0a8648D     0xc35D     0xc0a8640f
+  0x8880      0        0xc35D     0xdead8880   0xc0a8648D     0xc35D     0xc0a8640f
+  0x8890      0        0xc35F     0xdead8890   0xc0a8648F     0xc35F     0xc0a8640f
+  0x8910      0        0xc35E     0xdead8910   0xc0a8648E     0xc35E     0xc0a8640f
   0x1000      0        0xc360     0xdead1000   0xc0a86490     0xc360     0xc0a8640f
   0x1010      0        0xc361     0xdead1010   0xc0a86491     0xc361     0xc0a8640f
   0x1020      0        0xc362     0xdead1020   0xc0a86492     0xc362     0xc0a8640f
@@ -148,6 +150,8 @@
   0x8800      1        0xc350     0xdead8800   0xc0a8648B     0xc350     0xc0a8640C
   0x8900      1        0xc35C     0xdead8900   0xc0a8648C     0xc35C     0xc0a8640C
   0x8880      1        0xc35D     0xdead8A00   0xc0a8648D     0xc35D     0xc0a8640C
+  0x8890      1        0xc35F     0xdead8890   0xc0a8648F     0xc35F     0xc0a8640C
+  0x8910      1        0xc35E     0xdead8910   0xc0a8648E     0xc35E     0xc0a8640C
   0x1000      1        0xc360     0xdead1000   0xc0a86490     0xc360     0xc0a8640C
   0x1010      1        0xc361     0xdead1010   0xc0a86491     0xc361     0xc0a8640C
   0x1020      1        0xc362     0xdead1020   0xc0a86492     0xc362     0xc0a8640C
@@ -183,6 +187,8 @@
   0x8800      2        0xc350     0xdead8800   0xc0a8648B     0xc350     0xc0a8640D
   0x8900      2        0xc35C     0xdead8900   0xc0a8648C     0xc35C     0xc0a8640D
   0x8880      2        0xc35D     0xdead8A00   0xc0a8648D     0xc35D     0xc0a8640D
+  0x8890      2        0xc35F     0xdead8890   0xc0a8648F     0xc35F     0xc0a8640D
+  0x8910      2        0xc35E     0xdead8910   0xc0a8648E     0xc35E     0xc0a8640D
   0x1000      2        0xc360     0xdead1000   0xc0a86490     0xc360     0xc0a8640D
   0x1010      2        0xc361     0xdead1010   0xc0a86491     0xc361     0xc0a8640D
   0x1020      2        0xc362     0xdead1020   0xc0a86492     0xc362     0xc0a8640D
@@ -220,6 +226,8 @@
   0x8800      3        0xc350     0xdead8800   0xc0a8648B     0xc350     0xc0a8640E
   0x8900      3        0xc35C     0xdead8900   0xc0a8648C     0xc35C     0xc0a8640E
   0x8880      3        0xc35D     0xdead8A00   0xc0a8648D     0xc35D     0xc0a8640E
+  0x8890      3        0xc35F     0xdead8890   0xc0a8648F     0xc35F     0xc0a8640E
+  0x8910      3        0xc35E     0xdead8910   0xc0a8648E     0xc35E     0xc0a8640E
   0x1000      3        0xc360     0xdead1000   0xc0a86490     0xc360     0xc0a8640E
   0x1010      3        0xc361     0xdead1010   0xc0a86491     0xc361     0xc0a8640E
   0x1020      3        0xc362     0xdead1020   0xc0a86492     0xc362     0xc0a8640E
@@ -257,7 +265,9 @@
   0x8700      4        0xc45A     0xdead8700   0xc0a8648A     0xc45A        0xc0a8640f
   0x8800      4        0xc450     0xdead8800   0xc0a8648B     0xc450        0xc0a8640f
   0x8900      4        0xc45C     0xdead8900   0xc0a8648C     0xc45C        0xc0a8640f
-  0x8880      4        0xc45D     0xdead8A00   0xc0a8648D     0xc45D       0xc0a8640f
+  0x8880      4        0xc45D     0xdead8A00   0xc0a8648D     0xc45D        0xc0a8640f
+  0x8890      4        0xc45F     0xdead8890   0xc0a8648F     0xc45F        0xc0a8640f
+  0x8910      4        0xc45E     0xdead8910   0xc0a8648E     0xc45E        0xc0a8640f
   0x1000      4        0xc460     0xdead1000   0xc0a86490     0xc460        0xc0a8640f
   0x1010      4        0xc461     0xdead1010   0xc0a86491     0xc461        0xc0a8640f
   0x1020      4        0xc462     0xdead1020   0xc0a86492     0xc462        0xc0a8640f
@@ -292,7 +302,9 @@
   0x8600      5        0xc459     0xdead8600   0xc0a86489     0xc459        0xc0a8640C
   0x8700      5        0xc45A     0xdead8700   0xc0a8648A     0xc45A        0xc0a8640C
   0x8800      5        0xc450     0xdead8800   0xc0a8648B     0xc450        0xc0a8640C
+  0x8890      5        0xc45F     0xdead8890   0xc0a8648F     0xc45F        0xc0a8640C
   0x8900      5        0xc45C     0xdead8900   0xc0a8648C     0xc45C        0xc0a8640C
+  0x8910      5        0xc45E     0xdead8910   0xc0a8648E     0xc45E        0xc0a8640C
   0x8880      5        0xc45D     0xdead8A00   0xc0a8648D     0xc45D        0xc0a8640C
   0x1000      5        0xc460     0xdead1000   0xc0a86490     0xc460        0xc0a8640C
   0x1010      5        0xc461     0xdead1010   0xc0a86491     0xc461        0xc0a8640C
@@ -329,6 +341,8 @@
   0x8800      6        0xc450     0xdead8800   0xc0a8648B     0xc450        0xc0a8640D
   0x8900      6        0xc45C     0xdead8900   0xc0a8648C     0xc45C        0xc0a8640D
   0x8880      6        0xc45D     0xdead8A00   0xc0a8648D     0xc45D        0xc0a8640D
+  0x8890      6        0xc45F     0xdead8890   0xc0a8648F     0xc45F        0xc0a8640D
+  0x8910      6        0xc45E     0xdead8910   0xc0a8648E     0xc45E        0xc0a8640D
   0x1000      6        0xc460     0xdead1000   0xc0a86490     0xc460        0xc0a8640D
   0x1010      6        0xc461     0xdead1010   0xc0a86491     0xc461        0xc0a8640D
   0x1020      6        0xc462     0xdead1020   0xc0a86492     0xc462        0xc0a8640D
@@ -362,7 +376,9 @@
   0x8600      7        0xc459     0xdead8600   0xc0a86489     0xc459        0xc0a8640E
   0x8700      7        0xc45A     0xdead8700   0xc0a8648A     0xc45A        0xc0a8640E
   0x8800      7        0xc450     0xdead8800   0xc0a8648B     0xc450        0xc0a8640E
+  0x8890      7        0xc45F     0xdead8890   0xc0a8648F     0xc45F        0xc0a8640E
   0x8900      7        0xc45C     0xdead8900   0xc0a8648C     0xc45C        0xc0a8640E
+  0x8910      7        0xc45E     0xdead8910   0xc0a8648E     0xc45E        0xc0a8640E
   0x8880      7        0xc45D     0xdead8A00   0xc0a8648D     0xc45D        0xc0a8640E
   0x1000      7        0xc460     0xdead1000   0xc0a86490     0xc460        0xc0a8640E
   0x1010      7        0xc461     0xdead1010   0xc0a86491     0xc461        0xc0a8640E
@@ -402,6 +418,8 @@
   0x8800      8        0xc550     0xdead8800   0xc0a8648B      0xc550       0xc0a8640f
   0x8900      8        0xc55C     0xdead8900   0xc0a8648C      0xc55C       0xc0a8640f
   0x8880      8        0xc55D     0xdead8A00   0xc0a8648D      0xc55D       0xc0a8640f
+  0x8890      8        0xc55F     0xdead8890   0xc0a8648F      0xc55F       0xc0a8640f
+  0x8910      8        0xc55E     0xdead8910   0xc0a8648E      0xc55E       0xc0a8640f
   0x1000      8        0xc560     0xdead1000   0xc0a86490      0xc560       0xc0a8640f
   0x1010      8        0xc561     0xdead1010   0xc0a86491      0xc561       0xc0a8640f
   0x1020      8        0xc562     0xdead1020   0xc0a86492      0xc562       0xc0a8640f
@@ -438,6 +456,8 @@
   0x8800      9        0xc550     0xdead8800   0xc0a8648B     0xc550        0xc0a8640C
   0x8900      9        0xc55C     0xdead8900   0xc0a8648C     0xc55C        0xc0a8640C
   0x8880      9        0xc55D     0xdead8A00   0xc0a8648D     0xc55D        0xc0a8640C
+  0x8890      9        0xc55F     0xdead8890   0xc0a8648F     0xc55F        0xc0a8640C
+  0x8910      9        0xc55E     0xdead8910   0xc0a8648E     0xc55E        0xc0a8640C
   0x1000      9        0xc560     0xdead1000   0xc0a86490     0xc560        0xc0a8640C
   0x1010      9        0xc561     0xdead1010   0xc0a86491     0xc561        0xc0a8640C
   0x1020      9        0xc562     0xdead1020   0xc0a86492     0xc562        0xc0a8640C
@@ -473,6 +493,8 @@
   0x8800     10        0xc550     0xdead8800   0xc0a8648B     0xc550        0xc0a8640D
   0x8900     10        0xc55C     0xdead8900   0xc0a8648C     0xc55C        0xc0a8640D
   0x8880     10        0xc55D     0xdead8A00   0xc0a8648D     0xc55D        0xc0a8640D
+  0x8890     10        0xc55F     0xdead8890   0xc0a8648F     0xc55F        0xc0a8640D
+  0x8910     10        0xc55E     0xdead8910   0xc0a8648E     0xc55E        0xc0a8640D
   0x1000     10        0xc560     0xdead1000   0xc0a86490     0xc560        0xc0a8640D
   0x1010     10        0xc561     0xdead1010   0xc0a86491     0xc561        0xc0a8640D
   0x1020     10        0xc562     0xdead1020   0xc0a86492     0xc562        0xc0a8640D
@@ -508,6 +530,8 @@
   0x8800     11        0xc550     0xdead8800   0xc0a8648B     0xc550        0xc0a8640E
   0x8900     11        0xc55C     0xdead8900   0xc0a8648C     0xc55C        0xc0a8640E
   0x8880     11        0xc55D     0xdead8A00   0xc0a8648D     0xc55D        0xc0a8640E
+  0x8890     11        0xc55F     0xdead8890   0xc0a8648F     0xc55F        0xc0a8640E
+  0x8910     11        0xc55E     0xdead8910   0xc0a8648E     0xc55E        0xc0a8640E
   0x1000     11        0xc560     0xdead1000   0xc0a86490     0xc560        0xc0a8640E
   0x1010     11        0xc561     0xdead1010   0xc0a86491     0xc561        0xc0a8640E
   0x1020     11        0xc562     0xdead1020   0xc0a86492     0xc562        0xc0a8640E
@@ -543,6 +567,8 @@
   0x8800     12        0xc650     0xdead8800   0xc0a8648B     0xc650        0xc0a8640f
   0x8900     12        0xc65C     0xdead8900   0xc0a8648C     0xc65C        0xc0a8640f
   0x8880     12        0xc65D     0xdead8A00   0xc0a8648D     0xc65D        0xc0a8640f
+  0x8890     12        0xc65F     0xdead8890   0xc0a8648F     0xc65F        0xc0a8640f
+  0x8910     12        0xc65E     0xdead8910   0xc0a8648E     0xc65E        0xc0a8640f
   0x1000     12        0xc660     0xdead1000   0xc0a86490     0xc660        0xc0a8640f
   0x1010     12        0xc661     0xdead1010   0xc0a86491     0xc661        0xc0a8640f
   0x1020     12        0xc662     0xdead1020   0xc0a86492     0xc662        0xc0a8640f
@@ -579,6 +605,8 @@
   0x8800     13        0xc650     0xdead8800   0xc0a8648B     0xc650        0xc0a8640C
   0x8900     13        0xc65C     0xdead8900   0xc0a8648C     0xc65C        0xc0a8640C
   0x8880     13        0xc65D     0xdead8A00   0xc0a8648D     0xc65D        0xc0a8640C
+  0x8890     13        0xc65F     0xdead8890   0xc0a8648F     0xc65F        0xc0a8640C
+  0x8910     13        0xc65E     0xdead8910   0xc0a8648E     0xc65E        0xc0a8640C
   0x1000     13        0xc660     0xdead1000   0xc0a86490     0xc660        0xc0a8640C
   0x1010     13        0xc661     0xdead1010   0xc0a86491     0xc661        0xc0a8640C
   0x1020     13        0xc662     0xdead1020   0xc0a86492     0xc662        0xc0a8640C
@@ -614,6 +642,8 @@
   0x8800     14        0xc650     0xdead8800   0xc0a8648B     0xc650        0xc0a8640D
   0x8900     14        0xc65C     0xdead8900   0xc0a8648C     0xc65C        0xc0a8640D
   0x8880     14        0xc65D     0xdead8A00   0xc0a8648D     0xc65D        0xc0a8640D
+  0x8890     14        0xc65F     0xdead8890   0xc0a8648F     0xc65F        0xc0a8640D
+  0x8910     14        0xc65E     0xdead8910   0xc0a8648E     0xc65E        0xc0a8640D
   0x1000     14        0xc660     0xdead1000   0xc0a86490     0xc660        0xc0a8640D
   0x1010     14        0xc661     0xdead1010   0xc0a86491     0xc661        0xc0a8640D
   0x1020     14        0xc662     0xdead1020   0xc0a86492     0xc662        0xc0a8640D
@@ -653,6 +683,8 @@
   0x8800     15        0xc650     0xdead8800   0xc0a8648B     0xc650        0xc0a8640E
   0x8900     15        0xc65C     0xdead8900   0xc0a8648C     0xc65C        0xc0a8640E
   0x8880     15        0xc65D     0xdead8A00   0xc0a8648D     0xc65D        0xc0a8640E
+  0x8890     15        0xc65F     0xdead8890   0xc0a8648F     0xc65F        0xc0a8640E
+  0x8910     15        0xc65E     0xdead8910   0xc0a8648E     0xc65E        0xc0a8640E
   0x1000     15        0xc660     0xdead1000   0xc0a86490     0xc660        0xc0a8640E
   0x1010     15        0xc661     0xdead1010   0xc0a86491     0xc661        0xc0a8640E
   0x1020     15        0xc662     0xdead1020   0xc0a86492     0xc662        0xc0a8640E

diff --git a/hub/register_configgbe_multiQueueOn.db b/hub/register_configgbe_multiQueueOn.db
index 843c9f52881114f59a67a9207922166bdd917d61..3cf4c52b9f466ded55d93016339f9ac8a2117329 100644 (file)
--- a/hub/register_configgbe_multiQueueOn.db
+++ b/hub/register_configgbe_multiQueueOn.db
@@ -76,9 +76,11 @@
   0x8420      1       0x8420         1            1
   0x8600      1       0x8600         1            1
   0x8700      1       0x8700         1            1
-  0x8800      1       0x8800         1            1
-  0x8900      1       0x8900         1            1    
+  0x8800      1       0x8800         1            0
   0x8880      1       0x8880         1            1
+  0x8890      1       0x8890         1            1
+  0x8900      1       0x8900         1            1    
+  0x8910      1       0x8910         1            1    
   0x1000      1       0x1000         1            1
   0x1010      1       0x1010         1            1
   0x1020      1       0x1020         1            1
@@ -92,9 +94,9 @@
   0x1140      1       0x1140         1            1
   0x1150      1       0x1150         1            1
   0x1160      1       0x1160         0            1
-  0x3200      1       0x3200         1            1
-  0x3210      1       0x3210         1            1
-  0x3220      1       0x3220         1            1
-  0x3230      1       0x3230         1            1
-  0x3240      1       0x3240         1            1
-  0x3250      1       0x3250         1            1
+  0x3200      1       0x3200         1            0
+  0x3210      1       0x3210         1            0
+  0x3220      1       0x3220         1            0
+  0x3230      1       0x3230         1            0
+  0x3240      1       0x3240         1            0
+  0x3250      1       0x3250         1            0

diff --git a/hub/serials_hub.db b/hub/serials_hub.db
index fbdec2dd6649de9e58f39925a0e6a8fc159d8076..b2b17437c1017d28c571b98247f142c6c73d3822 100644 (file)
--- a/hub/serials_hub.db
+++ b/hub/serials_hub.db
@@ -26,4 +26,5 @@
  0802 0x9300000313496028
  0803 0xcb0000031349e628
  0805 0x330000031349ed28
-
+ 0815 0x6b0000031319f428
+ 1065 0x4b000004f9decd28

diff --git a/hub/startup.script b/hub/startup.script
index deb651b9592fa4a90ed48064a1674aa64d68f5b9..f6a98a49dad54a288f31fbf6a248ca09539fe64d 100644 (file)
--- a/hub/startup.script
+++ b/hub/startup.script
@@ -11,7 +11,6 @@ wait
 
 #Switch off unused parts of the network
 
-#For old hub only
 exec_script{pexor}  ../hub/configure_ports.script
 
 
@@ -26,12 +25,12 @@ wait
 !endif
 
 #Remove TRB3 from this
-  trbcmd clearbit 0x8801 0xc3 0x10
-  trbcmd clearbit 0x8003 0xc3 0x04
+  trbcmd clearbit 0x8003 0xc3 0x01e
+  trbcmd clearbit 0x8701 0xc3 0x020
   trbcmd w 0xff7f 0x8000 0x8000
   trbcmd w 0xff7f 0x8000 0x0000
-  trbcmd setbit 0x8801 0xc3 0x10
-  trbcmd setbit 0x8003 0xc3 0x04
+  trbcmd setbit 0x8003 0xc3 0x01e
+  trbcmd setbit 0x8701 0xc3 0x020
 
 
 # Timeout setting for all hubs
@@ -39,13 +38,14 @@ wait
   trbcmd w 0xfe11 0xc5 0x1000
   trbcmd w 0xfc00 0xc5 0xffff
   trbcmd w 0x8000 0xc5 0x5000
-  
+  trbcmd w 0x8001 0xc5 0x5000
   
 #Load hub level setting for time-out for each hub in the system  
   trbcmd loadbit 0xfe11 0xc5 0xffff0000 0x80300000  #with new hub (with auto-switch-off)
   
   trbcmd loadbit 0xfe15 0xc5 0xffff0000 0x00080000
   trbcmd loadbit 0xfe23 0xc5 0xffff0000 0x00080000
+  trbcmd loadbit 0x8890 0xc5 0xffff0000 0x00080000
   
   trbcmd loadbit 0x8101 0xc5 0xffff0000 0x00060000
   trbcmd loadbit 0x8111 0xc5 0xffff0000 0x00060000
@@ -75,6 +75,7 @@ wait
   trbcmd loadbit 0x8800 0xc5 0xffff0000 0x00040000
   trbcmd loadbit 0x8880 0xc5 0xffff0000 0x00040000
   trbcmd loadbit 0x8900 0xc5 0xffff0000 0x00040000
+  trbcmd loadbit 0x8910 0xc5 0xffff0000 0x00040000
   
   trbcmd loadbit 0x8001 0xc5 0xffff0000 0x00020000
   trbcmd loadbit 0x8002 0xc5 0xffff0000 0x00020000

diff --git a/main/address_range.db b/main/address_range.db
index ba5e4a5b245d494e6e2bb04f6e7259fb73293023..276cb6febc0e29032418f6374f9226b6f387fc93 100644 (file)
--- a/main/address_range.db
+++ b/main/address_range.db
@@ -1,7 +1,6 @@
-#System      Min       Max        Type
+#System      Min       Max        HardwareType
 
-CTS          0x0001    0x00FF     TRB
-SCS          0x0100    0x01FF     TRB
+CTS          0x0001    0x00FF     CTS
 MDC-AddOn    0x1000    0x17FF     MDC-AddOn
 MDC-OEP      0x2000    0x2FFF     MDC-OEP
 RICH-ADCM    0x3000    0x31FF     RICH-ADCM
@@ -11,7 +10,8 @@ StartVeto    0x4000    0x40FF     TRB
 Wall         0x4400    0x47FF     TRB
 RPC          0x4800    0x4BFF     TRB
 TOF          0x4C00    0x4FFF     TRB
-SEB          0x5555    0x5555     TRB
+StartTrb3    0x5000    0x50FF     TRB3
+SEB          0x5555    0x5555     TRBnet
 Central-Hub  0x8000    0x80FF     Hub2
 MDC-Hub      0x8100    0x81FF     Hub2
 RICH-Hub     0x8300    0x83FF     Hub2
@@ -19,9 +19,10 @@ RPC-Hub      0x8400    0x84FF     Hub2
 Shw-Hub      0x8500    0x85FF     Hub2
 TOF-Hub      0x8600    0x86FF     Hub2
 Wall-Hub     0x8700    0x87FF     Hub2
-CTS-Hub      0x8800    0x88FF     Hub2
+CTS-Hub      0x8800    0x887F     Hub2
+StartTrb3Hub 0x8880    0x88FF     TRB3
 Pion-Hub     0x8900    0x89FF     TRB3
 TestSetup    0xF000    0xFEFF     Test
 Broadcast    0xFF00    0xFFFF     Broadcast
-Hub-All      0x8000    0x8FFF     Hub2
+Hub-All      0x8000    0x8FFF     Hub
 

diff --git a/main/data_sources.db b/main/data_sources.db
index 986ee3f616ab667525468e8044b2610faf3a4c31..bd34ba8c1a7b1535ab75ed44c49c1028c32f6e3e 120000 (symlink)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -1 +1 @@
-data_sources_shower.db
\ No newline at end of file
+data_sources_notrb3.db
\ No newline at end of file

diff --git a/main/data_sources_notrb3.db b/main/data_sources_notrb3.db
new file mode 100644 (file)
index 0000000..c0c2fcc
--- /dev/null
+++ b/main/data_sources_notrb3.db
@@ -0,0 +1,39 @@
+# Table with active data sources
+
+# Addr     On/Off     Name              DataSize
+#Start must be the first for EvtId
+0x8800      1         StartVetoCTS      low
+0x8000      0         Central           low  #off
+0x8100      0         innerMDC          low  #off
+0x8110      0         outerMDC          low  #off
+0x8300      1         RICH12            mid
+0x8310      1         RICH34            mid
+0x8320      1         RICH56            mid
+0x8400      1         RPC12             mid
+0x8410      1         RPC34             mid
+0x8420      1         RPC56             mid
+0x8600      1         TOF               low
+0x8700      1         FW                low
+0x8880      0        StartTRB3         low
+0x8890      0         VetoTRB3          low
+0x8900      0         Pion1             mid
+0x8910      0         Pion2             mid
+0x1000      1         MDC12sec1         high
+0x1010      1         MDC12sec2         high
+0x1020      1         MDC12sec3         mid
+0x1030      1         MDC12sec4         mid
+0x1040      1         MDC12sec5         high
+0x1050      1         MDC12sec6         high
+0x1100      1         MDC34sec1         high
+0x1110      1         MDC34sec2         mid
+0x1120      1         MDC34sec3         high
+0x1130      1         MDC34sec4         mid
+0x1140      1         MDC34sec5         high
+0x1150      1         MDC34sec6         high
+0x1160      0         MDCspecial        mid   #off
+0x3200      1         Shower1           mid
+0x3210      1         Shower2           mid
+0x3220      1         Shower3           mid
+0x3230      1         Shower4           mid
+0x3240      1         Shower5           mid
+0x3250      1         Shower6           mid

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index 6bdc1607dee79ab33ef04bbe43a517112b5cbbfa..5e070dda8a5e05f92420f9959cf7fa8d10ec143e 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -77,6 +77,7 @@ switchport.pl 0x1003 5 off
 
 #All calib to EB1
 trbcmd w 0x0003 0xa0f3 0xff1
+
   
 /home/hadaq/trbsoft/hadesdaq/utils/move_doublecpu_irq.sh &
 scp /home/hadaq/oper/daq2ora/daq2ora_current.txt hades33:/home/hadaq/trbsoft/hadesdaq/hmon/files/ &

diff --git a/main/subevtids.db b/main/subevtids.db
index 93150049544b5a7bd2cedeacf7a9579aaf5c7b18..aed53b4f3348a5c5aa24b7bbdccbac9ca8edb717 100644 (file)
--- a/main/subevtids.db
+++ b/main/subevtids.db
@@ -32,5 +32,6 @@
 0x8700          #Hub2
 0x8800          #Hub2
 0x8880          #StartTRB3
+0x8890          #VetoTRB3
 0x8900         #Pion1
 0x8910          #Pion2

diff --git a/pion/addresses_pion.db b/pion/addresses_pion.db
index 387edcb8fcfd8bed2a0fd42d77d849777d1f8a7b..effe8e4293707caa02946e9ab8c05f173952c699 100644 (file)
--- a/pion/addresses_pion.db
+++ b/pion/addresses_pion.db
@@ -1,11 +1,12 @@
 #Address  #   S/N   #   FPGA  #   Design  #  TRB  #
 ###################################################
-0x3800        0750        0          0        033
-0x3820        0751        1          0        033
-0x3821        0752        2          0        033
-0x3801        0753        3          0        033
+0x3800        0750        0          0        075
+0x3820        0751        1          0        075
+0x3821        0752        2          0        075
+0x3801        0753        3          0        075
+
+0x3810        0810        0          0        081
+0x3811        0811        1          0        081
+0x3832        0812        2          0        081
+0x3833        0813        3          0        081
 
-#0x3810        0750        0          0        075
-#0x3811        0751        1          0        075
-#0x3812        0752        2          0        075
-#0x3813        0753        3          0        075

diff --git a/pion/config/nxyter.sh b/pion/config/nxyter.sh
index 1321e2e539fb2b3d349dcd3e852ad3146b002dbf..734b830f3981a44fac3415ffb30f330e5f9ca1ed 100755 (executable)
--- a/pion/config/nxyter.sh
+++ b/pion/config/nxyter.sh
@@ -28,4 +28,8 @@ trbcmd w 0x8900 0xc0 0xfff9
 trbcmd w 0x8900 0xc1 0xfff9
 trbcmd w 0x8900 0xc3 0xfff9
 
+trbcmd w 0x8910 0xc0 0xfff3
+trbcmd w 0x8910 0xc1 0xfff3
+trbcmd w 0x8910 0xc3 0xfff3
+
 cd ..

diff --git a/pion/serials_pion.db b/pion/serials_pion.db
index 3d38d4128225e27a8bedcd3a53b9b51cb1a4a9dd..0805396aa0db58601b365058e1834163642f2f63 100644 (file)
--- a/pion/serials_pion.db
+++ b/pion/serials_pion.db
@@ -4,7 +4,13 @@
 0751        0xe5000003131f7f28
 0752        0x7c000003131f8a28
 0753        0xa2000003131f9d28
-0755        0xd4000003131c6028
+#0755        0xd4000003131c6028
+
+0810       0x9100000313131628 
+0811       0xb500000313131928 
+0812       0x4b000003133cab28 
+0813       0x2c000003133b2f28 
+#0815       0x6b0000031319f428
 
 0330        0x9e00000390195f28
 0331        0x5100000390195528

diff --git a/shower/configure_shower.script b/shower/configure_shower.script
index 07da048bf4949efe1d8befe25f4647acbcb25014..e86736362e3d85c98d76d527cfc91de66d33cdf8 100644 (file)
--- a/shower/configure_shower.script
+++ b/shower/configure_shower.script
@@ -5,6 +5,7 @@
 exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_ff.dat write #QUIET MODE
 #exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_00.dat write #no thresholds
 #exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerPed_1111_hv2300V.txt write
+#exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/test_pedestals_1703_new.txt write
 
 
 !ifdef SHOWERPEDDEFAULT

diff --git a/start/addresses_start.db b/start/addresses_start.db
index ec68213c4d85a8a9d57183ae7956a775d14cacf1..72301dbfb62180440cdc729411cc7558146b885a 100644 (file)
--- a/start/addresses_start.db
+++ b/start/addresses_start.db
@@ -4,7 +4,3 @@
 0x4010        107        1          21       107
 0x4001        076        1          21       076
 
-0x5000       0740        0           0       0
-0x5001       0741        1           0       0
-0x5002       0742        2           0       0
-0x5003       0743        3           0       0

diff --git a/start/addresses_start_trb3.db b/start/addresses_start_trb3.db
index bfc74b47f5c35b4708c75f30beac3cda7e182ca3..cfd3589f37ba3a26b856c67f16469c3b35283936 100644 (file)
--- a/start/addresses_start_trb3.db
+++ b/start/addresses_start_trb3.db
@@ -4,3 +4,9 @@
 0x5001       0741        1           0       0
 0x5002       0742        2           0       0
 0x5003       0743        3           0       0
+
+0x5010       1060        0           0       0
+0x5011       1061        1           0       0
+0x5012       1062        2           0       0
+0x5013       1063        3           0       0
+

diff --git a/start/serials_start.db b/start/serials_start.db
index e7c65ad44b92787c20355280aace7b814595ebfd..471bec9fb422d6e75561259aae8d8678e693f7c9 100644 (file)
--- a/start/serials_start.db
+++ b/start/serials_start.db
@@ -5,8 +5,4 @@
   082  0xe2000001fc5dbd28
   107   0x59000001c1711828
   076   0x36000001fc5df528
- 0740   0x6800000313245528
- 0741   0x6e00000313246028
- 0742   0xa700000313245f28
- 0743   0x3100000313245628
 

diff --git a/start/serials_start_trb3.db b/start/serials_start_trb3.db
index cd0cdff3bcdf03ca0ff346a79fcf24c808324ffa..ac040dd0f62641fdde9281ba963cb3de5a0ab256 100644 (file)
--- a/start/serials_start_trb3.db
+++ b/start/serials_start_trb3.db
@@ -7,3 +7,8 @@
  0742   0xa700000313245f28
  0743   0x3100000313245628
 
+ 1060   0x68000004f9e34528
+ 1061   0x40000004f9e00b28
+ 1062   0xea000004fa000028
+ 1063   0xc7000004fa00c628
+

diff --git a/start/startup.script b/start/startup.script
index 6be18cb7d1193d6e00f1f90d5863b4635dd6f06b..82e14b31eba559c0050e51a953c7906d21d127f1 100644 (file)
--- a/start/startup.script
+++ b/start/startup.script
@@ -9,10 +9,47 @@
 
 
 #TRB3 settings
-trbcmd w 0x5000 0xc801 0x000f0000
-trbcmd w 0x5001 0xc801 0x000f0000
-trbcmd w 0x5002 0xc801 0x000f0000
-trbcmd w 0x5003 0xc801 0x000f0000
 
+#Triggered mode
+trbcmd clearbit 0xfe48 0xc800 0x00001000
+trbcmd clearbit 0xfe4e 0xc800 0x00001000
 
-trbcmd w 0xfe48 0xc801 0x000f0000
+#2us trigger window
+trbcmd w 0xfe48 0xc801 0x80f00000
+trbcmd w 0xfe4e 0xc801 0x80f00000
+
+#Data limit off
+trbcmd w 0xfe48 0xc804 0x00000080
+trbcmd w 0xfe4e 0xc804 0x00000080
+
+
+
+#Hodoscope inputs
+#trbcmd w 0x5010 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5010 0xc803 0x00000000 # disable channel 32-63
+ trbcmd w 0x5011 0xc802 0x00000000 # disable channel 0-31
+ trbcmd w 0x5011 0xc803 0x00000000 # disable channel 32-63
+ trbcmd w 0x5012 0xc802 0x00000000 # disable channel 0-31
+ trbcmd w 0x5012 0xc803 0x00000000 # disable channel 32-63
+#trbcmd w 0x5013 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5013 0xc803 0x00000000 # disable channel 32-63
+
+#Start inputs
+#trbcmd w 0x5000 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5000 0xc803 0x00000000 # disable channel 32-63
+#trbcmd w 0x5001 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5001 0xc803 0x00000000 # disable channel 32-63
+#trbcmd w 0x5002 0xc802 0xffffffff # disable channel 0-31
+ trbcmd w 0x5002 0xc803 0x00000000 # disable channel 32-63
+ trbcmd w 0x5003 0xc802 0x00000000 # disable channel 0-31
+ trbcmd w 0x5003 0xc803 0x00000000 # disable channel 32-63
+
+
+#Trigger Generator Settings
+
+
+#Input Monitor Settings
+
+
+
+exec_cmd{local} /home/hadaq/trbsoft/daqtools/tools/dac_program.pl ../start/ThreshPadiwaVeto.db