update db files in main directory and hub addresses

diff --git a/hub/addresses_hub_trb3sc.db b/hub/addresses_hub_trb3sc.db
index 63b2831681c1c9bffc62a51af7edb2d824675db0..48b56d1d385efdf72f31b928b664e30791a5f031 100644 (file)
--- a/hub/addresses_hub_trb3sc.db
+++ b/hub/addresses_hub_trb3sc.db
@@ -2,11 +2,11 @@
 ###################################################
 #Central
 0x8000        161         1          0        0
-0x8010          0         1          0        0
-0x8011        142         1          0        0  #has GbE for CTS
+#0x8010          0         1          0        0 #not used slot
+0x8800        142         1          0        0  #has GbE for CTS
 0x8012        157         1          0        0
 0x8013        149         1          0        0
-0x8014          0         1          0        0
+#0x8014          0         1          0        0 #not used slot
 0x8015        155         1          0        0
 0x8016        160         1          0        0
 0x8017        156         1          0        0

diff --git a/hub/startup.script b/hub/startup.script
index e623e41ff685b05d0e65a9b4b2129581e9189a56..24698ae62908ad9810332627236171830151de84 100644 (file)
--- a/hub/startup.script
+++ b/hub/startup.script
@@ -1,8 +1,7 @@
 #Assign addresses
 !ifndef RESTART 
   set_addresses  serials_hub.db  addresses_hub.db     #addresses for hubs
-
-# MT+LM 20100804
+  set_addresses  ../../daqtools/base/serials_trb3sc.db  addresses_hub_trb3sc.db     #addresses for hubs
   set_addresses  serials_mdcaddon.db  addresses_mdcaddon.db     #addresses for addons  
 !endif
 wait
@@ -22,8 +21,8 @@ wait
   load_register  register_configgbe_ip.db
 !endif
 
-#Remove TRB3 from this
-  trbcmd clearbit 0x8003 0xc3 0x01e
+#Remove TRB3 from this   - TODO needs update
+  trbcmd clearbit 0x8003 0xc3 0x01e   
   trbcmd clearbit 0x8701 0xc3 0x020
   trbcmd w 0xff7f 0x8000 0x8000
   trbcmd w 0xff7f 0x8000 0x0000

diff --git a/main/address_range.db b/main/address_range.db
index 2e1842f441d4fc064cbb21c7092384d863d3cfcf..27e6022f6b2436cb0722df2836e9f08ef5944ee2 100644 (file)
--- a/main/address_range.db
+++ b/main/address_range.db
@@ -10,8 +10,8 @@ RPC          0x4800    0x4BFF     TRB
 TOF          0x4C00    0x4FFF     TRB
 StartTrb3    0x5000    0x50FF     TRB3
 SEB          0x5555    0x5555     TRBnet
-Central-Hub  0x8000    0x80FF     Hub2
-MDC-Hub      0x8100    0x81FF     Hub2
+ECal         0x6000    0x60FF     TRB3sc
+Central-Hub  0x8000    0x80FF     TRB3sc
 Rich-Comb    0x8200    0x82ff     DiRichConcentrator
 Rich-Hub     0x83c0    0x83df     TRB3sc
 RPC-Hub      0x8400    0x84FF     Hub2
@@ -30,3 +30,4 @@ Hub-All      0x8000    0x8FFF     Hub
 #RICH-Hub     0x8300    0x83FF     Hub2
 #Shw-Hub      0x8500    0x85FF     Hub2
 #CTS-Hub      0x8800    0x887F     Hub2
+#MDC-Hub      0x8100    0x81FF     Hub2

diff --git a/main/data_sources.db b/main/data_sources.db
index 802a50e950694789036339add53306d1f3bb7c5c..1b63cdb696da7abcef6d591dd98253a93f2e5726 100644 (file)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -2,15 +2,11 @@
 
 # Addr     On/Off     Name              DataSize
 #Start must be the first for EvtId
-0x8800      0         StartVetoCTS      low
-0x8000      0         Central           low  #off
-0x8100      0         innerMDC          low  #off
-0x8110      0         outerMDC          low  #off
-0x8400      0         RPC12             mid
-0x8410      0         RPC34             mid
-0x8420      0         RPC56             mid
+0x8800      1         Central CTS       low
+0x8400      1         RPC123             mid
+0x8410      1         RPC456             mid
 0x8600      1         TOF               low
-0x8700      0         FW                low
+0x8700      1         FW                low
 0x8880      0         StartTRB3         low
 0x8890      0         VetoTRB3          low
 0x8900      0         Pion1             mid
@@ -27,4 +23,20 @@
 0x1130      1         MDC34sec4         mid
 0x1140      1         MDC34sec5         high
 0x1150      1         MDC34sec6         high
-#0x1160      1         MDCspecial        mid   #off
+0x8a00      1         ECal0             mid
+0x8a01      1         ECal1             mid
+0x8a02      1         ECal2             mid
+0x8a03      1         ECal3             mid
+0x8a04      1         ECal4             mid
+0x8a05      1         ECal5             mid
+0x83c0      1         RICH0             mid
+0x83c1      1         RICH1             mid
+0x83c2      1         RICH2             mid
+0x83c3      1         RICH3             mid
+0x83c4      1         RICH4             mid
+0x83c5      1         RICH5             mid
+0x83c6      1         RICH6             mid
+0x83c7      1         RICH7             mid
+0x83c8      1         RICH8             mid
+0x83c9      1         RICH9             mid
+0x83ca      1         RICHa             mid

diff --git a/main/subevtids.db b/main/subevtids.db
index 2d72c9752956ef72b2fef9f02a4ea957ab7a889c..c8fef1f3fafcc1ca7979015c9ab3362678bf7197 100644 (file)
--- a/main/subevtids.db
+++ b/main/subevtids.db
@@ -16,12 +16,8 @@
 0x8000          #Hub2
 0x8100          #Hub2
 0x8110          #Hub2
-0x8300          #Hub2
-0x8310          #Hub2
-0x8320          #Hub2
 0x8400          #Hub2
 0x8410          #Hub2
-0x8500          #Hub2
 0x8600          #Hub2
 0x8700          #Hub2
 0x8800          #Hub2
@@ -29,3 +25,21 @@
 0x8890          #VetoTRB3
 0x8900         #Pion1
 0x8910          #Pion2
+0x83c0          #Rich0
+0x83c1          #Rich1
+0x83c2          #Rich2
+0x83c3          #Rich3
+0x83c4          #Rich4
+0x83c5          #Rich5
+0x83c6          #Rich6
+0x83c7          #Rich7
+0x83c8          #Rich8
+0x83c9          #Rich9
+0x83ca          #RichA
+0x8a00          #Ecal0
+0x8a01          #Ecal1
+0x8a02          #Ecal2
+0x8a03          #Ecal3
+0x8a04          #Ecal4
+0x8a05          #Ecal5
+