Commit latest changes to settings

diff --git a/control/gui/monitor/40_BNET b/control/gui/monitor/40_BNET
index 579fc2b237fc8f6b04b9591816b6353df5e365b9..1a03ab6849ca28b9ecdaee7d8b3dd627025344f2 100755 (executable)
--- a/control/gui/monitor/40_BNET
+++ b/control/gui/monitor/40_BNET
@@ -1,3 +1,3 @@
 #!/bin/bash
-MOZ_NO_REMOTE=1 firefox -P Eventbuilding  http://lxhadeb03:8090
+MOZ_NO_REMOTE=1 firefox -P Eventbuilding  http://hades33/eb
 

diff --git a/ecal/register_tdc_ecal.db b/ecal/register_tdc_ecal.db
index e15bfccadb7a2df5137b992ad3e50c75d4aed8c8..2c9814a857e6e2df4596e7fbf7a131da00207ba6 100644 (file)
--- a/ecal/register_tdc_ecal.db
+++ b/ecal/register_tdc_ecal.db
@@ -10,6 +10,6 @@
 # TDC    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4    #     C5     #             
 #################################################################################################            
                                                                                                              
-0xfe71          0   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000 # trb3sc1 TDC
-0xfe71          0   0x50003000   0x81900190   0xFFFFFFFF   0x0000FFFF   0x00000078   0x00000000 # trb3sc1 TDC
+#0xfe71          0   0x50003000   0x802800c8   0xFFFFFFFF   0x0000FFFF   0x00000010   0x00000000 # trb3sc1 TDC
                                                                                                            
+0xfe71          0   0x50003000   0x802800c8   0xffffffff   0x0000ffff   0x00000010   0x00000000 # trb3sc1 TDC

diff --git a/hub/register_configgbe_2018.db b/hub/register_configgbe_2018.db
index f46a9cfb636e7e32c688185af8facd843f8db329..d57bbbe82e70093afbd09abe9093fb75bc989a5b 100644 (file)
--- a/hub/register_configgbe_2018.db
+++ b/hub/register_configgbe_2018.db
@@ -6,44 +6,6 @@
 # #old register set
 # #    17     0xc100   0xc101   0xc102   0xc103   0xc104   0xc105   0xc106   0xc107   0xc108
 # 
-# 
-# !Value table
-# #                    SubEvtId     SubEvtDec     QueDec      PackSize     FrameSize    UseGbE       UseTrbNet   MultiQueue   Trig. Num.   MinEvtSize  Frame Delay
-# # Hub    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4     #     C5     #     C6     #     C7     #    C8     #    C9     #    C9     #  
-# ###############################################################################################################################################################
-#   0x8000      0       0x8000     0x00020001   0x00030062     0xea60       0x578          0            0            0        0xffffff      0x7          0x0
-#   0x8100      0       0x8100     0x00020001   0x00030062     0xea60       0x578          0            0            0        0xffffff      0x7          0x0 
-#   0x8110      0       0x8110     0x00020001   0x00030062     0xea60       0x578          0            0            0        0xffffff      0x7          0x0
-#   0x8300      0       0x8300     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x8310      0       0x8310     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0 
-#   0x8320      0       0x8320     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x8400      0       0x8400     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x8410      0       0x8410     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x8420      0       0x8420     0x00020001   0x00030062     0xea60       0x578          0            0            0        0xffffff      0x7          0x0
-#   0x8600      0       0x8600     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x8700      0       0x8700     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x8800      0       0x8800     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1000      0       0x1000     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1010      0       0x1010     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1020      0       0x1020     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1030      0       0x1030     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1040      0       0x1040     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1050      0       0x1050     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1100      0       0x1100     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1110      0       0x1110     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1120      0       0x1120     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1130      0       0x1130     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1140      0       0x1140     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1150      0       0x1150     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x1160      0       0x1160     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x3200      0       0x3200     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x3210      0       0x3210     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x3220      0       0x3220     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x3230      0       0x3230     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x3240      0       0x3240     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-#   0x3250      0       0x3250     0x00020001   0x00030062     0xea60       0x578          1            0            0        0xffffff      0x7          0x0
-# 
-
 
 
 
@@ -69,6 +31,7 @@
   0x8000      1       0x8000         0            0        
   0x8100      1       0x8100         0            0
   0x8110      1       0x8110         0            0
+  
   0x83c0      1       0x83c0         1            1
   0x83c1      1       0x83c1         1            1
   0x83c2      1       0x83c2         1            1 
@@ -81,22 +44,25 @@
   0x83c9      1       0x83c9         1            1  
   0x83ca      1       0x83ca         1            1   
   0x83cb      1       0x83cb         1            1   
-  0x8400      1       0x8400         1            1
-  0x8410      1       0x8410         1            1
-  0x8420      1       0x8420         1            1
-  0x8600      1       0x8600         1            1
-  0x8700      1       0x8700         1            1
+ 
+  0x8400      1       0x8400         1            0
+  0x8410      1       0x8410         1            0
+# 0x8420      1       0x8420         1            0
+  0x8600      1       0x8600         1            0
+  0x8700      1       0x8700         1            0
   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    
+  0x8880      1       0x8880         1            0
+# 0x8890      1       0x8890         1            0
+# 0x8900      1       0x8900         1            0    
+# 0x8910      1       0x8910         1            0    
+  
   0x8a00      1              0x8a00         1            1     
   0x8a01      1       0x8a01         1            1
   0x8a02      1       0x8a02         1            1
   0x8a03      1       0x8a03         1            1
   0x8a04      1       0x8a04         1            1
   0x8a05      1       0x8a05         1            1
+
   0x1000      1       0x1000         1            0
   0x1010      1       0x1010         1            0
   0x1020      1       0x1020         1            0
@@ -110,9 +76,4 @@
   0x1140      1       0x1140         1            0
   0x1150      1       0x1150         1            0
   0x1160      1       0x1160         1            0
-  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/register_configgbe_ip.db b/hub/register_configgbe_ip.db
index 702bcb99295016aa11ba0f70d7e47374c0855280..936bccddd13495f89ccb5907569e13e343a5a5b8 100644 (file)
--- a/hub/register_configgbe_ip.db
+++ b/hub/register_configgbe_ip.db
@@ -171,9 +171,9 @@
   0x8700     0        0xc65A     0xdead8700   0xc0a8648A     0xc65A     0xc0a8640f 0  # fw  lxhadeb05
   0x8800     0        0xc650     0xdead8800   0xc0a8648B     0xc650     0xc0a8640f 0  # central-cts lxhadeb05  
   0x8880     0        0xc65D     0xdead8A00   0xc0a8648D     0xc65D     0xc0a86409 1  # start   - lxhadeb09
-  0x8890     0        0xc65F     0xdead8890   0xc0a8648F     0xc65F     0xc0a86409 1  # veto      lxhadeb09
-  0x8900     0        0xc65C     0xdead8900   0xc0a8648C     0xc65C     0xc0a86409 1  #  pion1     lxhadeb09
-  0x8910     0        0xc65E     0xdead8910   0xc0a8648E     0xc65E     0xc0a86409 1  #  pion2     lxhadeb09
+  0x8890     0        0xc65F     0xdead8890   0xc0a8648F     0xc65F     0xc0a86409 0  # veto      lxhadeb09
+  0x8900     0        0xc65C     0xdead8900   0xc0a8648C     0xc65C     0xc0a86409 0  #  pion1     lxhadeb09
+  0x8910     0        0xc65E     0xdead8910   0xc0a8648E     0xc65E     0xc0a86409 0  #  pion2     lxhadeb09
   0x1000     0        0xc660     0xdead1000   0xc0a86490     0xc660     0xc0a86408 0  # mdc - lxhadeb08 
   0x1010     0        0xc661     0xdead1010   0xc0a86491     0xc661     0xc0a86408 0  # mdc - lxhadeb08 
   0x1020     0        0xc662     0xdead1020   0xc0a86492     0xc662     0xc0a86408 0  # mdc - lxhadeb08 
@@ -193,18 +193,18 @@
   0x8a03     0        0xc679     0xdead8a03   0xc0a864A9     0xc679     0xc0a86409 1  # ecal- all to lxhadeb09
   0x8a04     0        0xc67a     0xdead8a04   0xc0a864AA     0xc67A     0xc0a86409 1  # ecal- all to lxhadeb09
   0x8a05     0        0xc67b     0xdead8a05   0xc0a864AB     0xc67B     0xc0a86409 1  # ecal- all to lxhadeb09   
-  0x83c0     0        0xc67c     0xdead83c0   0xc0a864AC     0xc67C     0xc0a8640a 1  # rich - all to lxhadeb10
-  0x83c1     0        0xc67d     0xdead83c1   0xc0a864AD     0xc67D     0xc0a8640a 1  # rich - all to lxhadeb10
-  0x83c2     0        0xc67e     0xdead83c2   0xc0a864AE     0xc67E     0xc0a8640a 1  # rich - all to lxhadeb10
+  0x83c0     0        0xc67c     0xdead83c0   0xc0a864AC     0xc67C     0xc0a86409 1  # rich - to lxhadeb09
+  0x83c1     0        0xc67d     0xdead83c1   0xc0a864AD     0xc67D     0xc0a86409 1  # rich - to lxhadeb09
+  0x83c2     0        0xc67e     0xdead83c2   0xc0a864AE     0xc67E     0xc0a86409 1  # rich - to lxhadeb09
   0x83c3     0        0xc67f     0xdead83c3   0xc0a864AF     0xc67F     0xc0a8640a 1  # rich - all to lxhadeb10
   0x83c4     0        0xc680     0xdead83c4   0xc0a864B0     0xc680     0xc0a8640a 1  # rich - all to lxhadeb10
   0x83c5     0        0xc681     0xdead83c5   0xc0a864B1     0xc681     0xc0a8640a 1  # rich - all to lxhadeb10
-  0x83c6     0        0xc682     0xdead83c6   0xc0a864b2     0xc682     0xc0a8640a 1  # rich - all to lxhadeb10
-  0x83c7     0        0xc683     0xdead83c7   0xc0a864b3     0xc683     0xc0a8640a 1  # rich - all to lxhadeb10
-  0x83c8     0        0xc684     0xdead83c8   0xc0a864b4     0xc684     0xc0a8640a 1  # rich - all to lxhadeb10
-  0x83c9     0        0xc685     0xdead83c9   0xc0a864b5     0xc685     0xc0a8640a 1  # rich - all to lxhadeb10
-  0x83ca     0        0xc686     0xdead83ca   0xc0a864b6     0xc686     0xc0a8640a 1  # rich - all to lxhadeb10 
-  0x83cb     0        0xc687     0xdead83cb   0xc0a864b6     0xc687     0xc0a8640a 1  # rich - all to lxhadeb10 
+  0x83c6     0        0xc682     0xdead83c6   0xc0a864B2     0xc682     0xc0a8640a 1  # rich - all to lxhadeb10
+  0x83c7     0        0xc683     0xdead83c7   0xc0a864B3     0xc683     0xc0a8640a 1  # rich - all to lxhadeb10
+  0x83c8     0        0xc684     0xdead83c8   0xc0a864B4     0xc684     0xc0a86408 1  # rich - all to lxhadeb08
+  0x83c9     0        0xc685     0xdead83c9   0xc0a864B5     0xc685     0xc0a86408 1  # rich - all to lxhadeb08
+  0x83ca     0        0xc686     0xdead83ca   0xc0a864B6     0xc686     0xc0a8640f 1  # rich - all to lxhadeb05 
+  0x83cb     0        0xc687     0xdead83cb   0xc0a864B7     0xc687     0xc0a8640f 1  # rich - all to lxhadeb05 
   
 
 
@@ -992,18 +992,18 @@
   0x8a03     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- all to lxhadeb09
   0x8a04     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- all to lxhadeb09
   0x8a05     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- all to lxhadeb09  
-  0x83c0     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c1     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c2     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
+  0x83c0     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  rich - all to lxhadeb09
+  0x83c1     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  rich - all to lxhadeb09
+  0x83c2     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  rich - all to lxhadeb09
   0x83c3     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
   0x83c4     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
   0x83c5     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
   0x83c6     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
   0x83c7     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c8     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c9     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83ca     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10  
-  0x83cb     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10                                                                                    
+  0x83c8     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #  rich - all to lxhadeb08
+  0x83c9     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #  rich - all to lxhadeb08
+  0x83ca     100    0x2157b095     0x001b    0xc0a8640f     0x0230        0x0578 #  rich - all to lxhadeb05  
+  0x83cb     100    0x2157b095     0x001b    0xc0a8640f     0x0230        0x0578 #  rich - all to lxhadeb05                                                                                    
                                                                      
  
  
@@ -1064,18 +1064,18 @@
   0x8a03     115    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- all to lxhadeb09
   0x8a04     115    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- all to lxhadeb09
   0x8a05     115    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  ecal- all to lxhadeb09  
-  0x83c0     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c1     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c2     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c3     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c4     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c5     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c6     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c7     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c8     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83c9     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10
-  0x83ca     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10  
-  0x83cb     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rich - all to lxhadeb10                                                                                    
+  0x83c0     115    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 # rich - to lxhadeb09
+  0x83c1     115    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 # rich - to lxhadeb09
+  0x83c2     115    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 # rich - to lxhadeb09
+  0x83c3     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 # rich - to lxhadeb10
+  0x83c4     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 # rich - to lxhadeb10
+  0x83c5     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 # rich - to lxhadeb10
+  0x83c6     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 # rich - to lxhadeb10
+  0x83c7     115    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 # rich - to lxhadeb10
+  0x83c8     115    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 # rich - to lxhadeb08
+  0x83c9     115    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 # rich - to lxhadeb08 
+  0x83ca     115    0x2157b095     0x001B    0xc0a8640f     0x0230        0x0578 # rich - to lxhadeb05 
+  0x83cb     115    0x2157b095     0x001B    0xc0a8640f     0x0230        0x0578 # rich - to lxhadeb05                                                                                    
                                                                                     
                                                                                     
                                                                                     

diff --git a/main/data_sources.db b/main/data_sources.db
index 7f7567299c3409edf0b8d93e3311ab175ffb8868..d79321229eef3469cb623483a7d4f8d787eaf230 100644 (file)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -7,8 +7,8 @@
 0x8410      1         RPC456             mid
 0x8600      1         TOF               low
 0x8700      1         FW                low
-0x8880      1         StartTRB3         low
-0x8890      0         VetoTRB3          low
+0x8880      0         StartTRB3         low
+0x8890      0         VetoTRB3          low5t
 0x8900      0         Pion1             mid
 0x8910      0         Pion2             mid
 0x1000      1         MDC12sec1         high
@@ -28,16 +28,16 @@
 0x8a02      1         ECal2             mid
 0x8a03      1         ECal3             mid
 0x8a04      1         ECal4             mid
-0x8a05      1        ECal5             mid
-0x83c0      0         RICH0             mid
-0x83c1      0         RICH1             mid
-0x83c2      0         RICH2             mid
-0x83c3      0         RICH3             mid
-0x83c4      0         RICH4             mid
-0x83c5      0         RICH5             mid
-0x83c6      0         RICH6             mid
-0x83c7      0         RICH7             mid
-0x83c8      0         RICH8             mid
-0x83c9      0         RICH9             mid
-0x83ca      0         RICHa             mid
-0x83cb      0         RICHb             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
+0x83cb      1         RICHb             mid

diff --git a/main/serials_trb.db b/main/serials_trb.db
index ca1494689a5548f1a7455a0c106d6748018de350..5cb9370dc8f57a6b8bb1da6fe6b99bcc180a21d1 100644 (file)
--- a/main/serials_trb.db
+++ b/main/serials_trb.db
@@ -1,6 +1,7 @@
 023 400000012410f728
 031 0a0000012410fa28
-034 d7000001241ee528
+#034 d7000001241ee528
+050 e500000123f24b28
 040 9500000123f4fe28
 051 6200000123f25f28
 052 7700000123f26428

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index 8d4e172ddce7ac4143f28d8185573a30e7ad9533..a58d1b21e2f5896423b5b6776b81d61d60af85a3 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -51,7 +51,7 @@ switchport.pl 0x1113 6 off #221a 20180606
 #Main Start-up
   echo "  <Startup>  Running Startup script"
   time ./startup.pl -f main_hades.script -eb off -o file \
-      -m TOF -m RPC -m WALL -m RICH  -m WALL -m NOPION -m ECAL \
+      -m TOF -m RPC -m WALL -m RICH  -m NOPION -m ECAL \
       -m STARTCTS -m NORESET -m CONFIGONLY  -m MON_CTS \
       -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv
 
@@ -67,7 +67,7 @@ switchport.pl 0x1113 6 off #221a 20180606
 #trbcmd w 0x0003 0xa0f3 0xff1
 
 # turn off multi event queue, as these garble the data from the TRB2s
-stoptrigger.sh; trbcmd w 0xff7f 0x8307 0 ; starttrigger.sh
+# stoptrigger.sh; trbcmd w 0xff7f 0x8307 0 ; starttrigger.sh
 
 
 scp /home/hadaq/oper/daq2ora/daq2ora_current.txt hadesp33:/home/hadaq/trbsoft/hadesdaq/hmon/files/ 1>/dev/null &

diff --git a/nettools/nettrace.db b/nettools/nettrace.db
index cb5966e7f1e62967466eb3b02875c136a02d9656..fcccc4c0893cc13267238918e142d176e4ded2f4 100644 (file)
--- a/nettools/nettrace.db
+++ b/nettools/nettrace.db
@@ -1,756 +1,1643 @@
 %hublist = (
-             '4368' => {
-                         '1' => 4370,
-                         '3' => 4372,
-                         '2' => 4371,
-                         '0' => 4369
-                       },
-             '34304' => {
-                          '2' => 34305
+             '33345' => {
+                          '6' => 29328,
+                          '11' => 29073,
+                          '3' => 29313,
+                          '7' => 29040,
+                          '9' => 29057,
+                          '2' => 29297,
+                          '12' => 29072,
+                          '8' => 29041,
+                          '4' => 29312,
+                          '1' => 29296,
+                          '10' => 29056,
+                          '5' => 29329
                         },
-             '4144' => {
-                         '3' => 4148,
-                         '1' => 4146,
-                         '0' => 4145,
-                         '2' => 4147
-                       },
-             '33569' => {
-                          '3' => 12354,
-                          '10' => 12372,
-                          '5' => 12356,
-                          '7' => 12369,
-                          '6' => 12368,
-                          '9' => 12371,
-                          '8' => 12370,
-                          '1' => 12352,
-                          '4' => 12355,
-                          '2' => 12353
+             '33730' => {
+                          '0' => 33348,
+                          '3' => 33313
                         },
-             '4132' => {
-                         '2' => 8281,
-                         '6' => 8285,
-                         '4' => 8283,
-                         '1' => 8280,
-                         '5' => 8284,
-                         '3' => 8282
-                       },
-             '34305' => {
-                          '2' => 19472,
-                          '6' => 19536,
-                          '7' => 19505,
-                          '4' => 19504,
-                          '1' => 19456,
-                          '5' => 19520,
-                          '3' => 19488
+             '35329' => {
+                          '6' => 24596,
+                          '8' => 24598,
+                          '4' => 24595,
+                          '0' => 24608,
+                          '3' => 24610,
+                          '7' => 24597,
+                          '2' => 24609
                         },
-             '4372' => {
-                         '8' => 8720,
-                         '1' => 8727,
-                         '4' => 8724,
-                         '2' => 8726,
-                         '3' => 8725,
-                         '5' => 8723,
-                         '7' => 8721,
-                         '6' => 8722
+             '4369' => {
+                         '6' => 8986,
+                         '3' => 8989,
+                         '7' => 8985,
+                         '2' => 8990,
+                         '8' => 8984,
+                         '1' => 8991,
+                         '4' => 8988,
+                         '5' => 8987
                        },
-             '4434' => {
-                         '5' => 8796,
-                         '3' => 8794,
-                         '6' => 8797,
-                         '7' => 8798,
-                         '1' => 8792,
-                         '8' => 8799,
-                         '2' => 8793,
-                         '4' => 8795
-                       },
-             '32770' => {
-                          '2' => 34816,
-                          '3' => 34560,
-                          '1' => 34304
-                        },
-             '33568' => {
-                          '2' => 33569
-                        },
-             '35088' => {
-                          '1' => 14353,
-                          '2' => 14352,
-                          '0' => 14384
-                        },
-             '33553' => {
-                          '7' => 12337,
-                          '6' => 12336,
-                          '3' => 12322,
-                          '10' => 12340,
-                          '5' => 12324,
-                          '4' => 12323,
-                          '2' => 12321,
-                          '8' => 12338,
-                          '9' => 12339,
-                          '1' => 12320
-                        },
-             '32771' => {
-                          '2' => 35088,
-                          '3' => 34944,
-                          '1' => 35072
+             '33384' => {
+                          '6' => 29525,
+                          '11' => 29540,
+                          '3' => 29268,
+                          '7' => 29029,
+                          '9' => 29284,
+                          '12' => 29541,
+                          '2' => 29012,
+                          '8' => 29028,
+                          '1' => 29013,
+                          '4' => 29269,
+                          '10' => 29285,
+                          '5' => 29524
                         },
-             '4176' => {
-                         '3' => 4180,
-                         '1' => 4178,
-                         '0' => 4177,
-                         '2' => 4179
-                       },
-             '33040' => {
-                          '2' => 33041
-                        },
-             '32769' => {
-                          '5' => 33552,
-                          '1' => 33808,
-                          '3' => 33824,
-                          '6' => 33536,
-                          '2' => 33792,
-                          '4' => 33568
-                        },
-             '33041' => {
-                          '6' => 4432,
-                          '2' => 4368,
-                          '4' => 4400,
-                          '5' => 4416,
-                          '1' => 4352,
-                          '3' => 4384
+             '33428' => {
+                          '6' => 30999,
+                          '11' => 30982,
+                          '3' => 30742,
+                          '7' => 30471,
+                          '9' => 30726,
+                          '2' => 30486,
+                          '12' => 30983,
+                          '8' => 30470,
+                          '4' => 30743,
+                          '1' => 30487,
+                          '10' => 30727,
+                          '5' => 30998
                         },
-             '4370' => {
-                         '4' => 8981,
-                         '2' => 8982,
-                         '8' => 8976,
-                         '1' => 8983,
-                         '7' => 8977,
-                         '6' => 8978,
-                         '3' => 8980,
-                         '5' => 8979
-                       },
-             '4160' => {
-                         '3' => 4164,
-                         '1' => 4162,
-                         '0' => 4161,
-                         '2' => 4163
-                       },
-             '4432' => {
-                         '3' => 4436,
-                         '1' => 4434,
-                         '0' => 4433,
-                         '2' => 4435
-                       },
-             '4131' => {
-                         '6' => 8277,
-                         '7' => 8278,
-                         '5' => 8276,
-                         '3' => 8274,
-                         '2' => 8273,
-                         '4' => 8275,
-                         '1' => 8272,
-                         '8' => 8279
-                       },
-             '4355' => {
-                         '4' => 8963,
-                         '2' => 8961,
-                         '8' => 8967,
-                         '1' => 8960,
-                         '7' => 8966,
-                         '6' => 8965,
-                         '3' => 8962,
-                         '5' => 8964
+             '33382' => {
+                          '6' => 29461,
+                          '11' => 29476,
+                          '3' => 29204,
+                          '7' => 28965,
+                          '9' => 29220,
+                          '2' => 28948,
+                          '12' => 29477,
+                          '8' => 28964,
+                          '4' => 29205,
+                          '1' => 28949,
+                          '10' => 29221,
+                          '5' => 29460
+                        },
+             '33380' => {
+                          '6' => 29479,
+                          '11' => 29462,
+                          '3' => 29222,
+                          '7' => 28951,
+                          '9' => 29206,
+                          '2' => 28966,
+                          '12' => 29463,
+                          '8' => 28950,
+                          '1' => 28967,
+                          '4' => 29223,
+                          '10' => 29207,
+                          '5' => 29478
+                        },
+             '33809' => {
+                          '6' => 18450,
+                          '11' => 18433,
+                          '3' => 18465,
+                          '7' => 18449,
+                          '9' => 18435,
+                          '2' => 18466,
+                          '12' => 18432,
+                          '8' => 18448,
+                          '4' => 18464,
+                          '1' => 18467,
+                          '10' => 18434,
+                          '5' => 18451
+                        },
+             '4112' => {
+                         '1' => 4114,
+                         '0' => 4113,
+                         '3' => 4116,
+                         '2' => 4115
                        },
+             '33430' => {
+                          '6' => 31013,
+                          '11' => 31028,
+                          '3' => 30756,
+                          '7' => 30517,
+                          '9' => 30772,
+                          '2' => 30500,
+                          '12' => 31029,
+                          '8' => 30516,
+                          '1' => 30501,
+                          '4' => 30757,
+                          '10' => 30773,
+                          '5' => 31012
+                        },
              '4113' => {
-                         '5' => 8452,
-                         '3' => 8450,
                          '6' => 8453,
+                         '3' => 8450,
                          '7' => 8534,
-                         '1' => 8448,
-                         '8' => 8535,
                          '2' => 8449,
-                         '4' => 8451
+                         '8' => 8535,
+                         '1' => 8448,
+                         '4' => 8451,
+                         '5' => 8452
                        },
-             '4385' => {
-                         '8' => 9000,
-                         '1' => 9007,
-                         '4' => 9004,
-                         '2' => 9006,
-                         '3' => 9005,
-                         '5' => 9003,
-                         '7' => 9001,
-                         '6' => 9002
+             '33300' => {
+                          '6' => 30976,
+                          '11' => 30993,
+                          '3' => 30721,
+                          '7' => 30480,
+                          '9' => 30737,
+                          '12' => 30992,
+                          '2' => 30465,
+                          '8' => 30481,
+                          '1' => 30464,
+                          '4' => 30720,
+                          '10' => 30736,
+                          '5' => 30977
+                        },
+             '33415' => {
+                          '6' => 30261,
+                          '11' => 30276,
+                          '3' => 30004,
+                          '7' => 29765,
+                          '9' => 30020,
+                          '12' => 30277,
+                          '2' => 29748,
+                          '8' => 29764,
+                          '1' => 29749,
+                          '4' => 30005,
+                          '10' => 30021,
+                          '5' => 30260
+                        },
+             '4129' => {
+                         '6' => 8197,
+                         '8' => 8199,
+                         '1' => 8192,
+                         '4' => 8195,
+                         '3' => 8194,
+                         '2' => 8193,
+                         '5' => 8196
                        },
-             '4386' => {
-                         '2' => 8998,
-                         '4' => 8996,
-                         '1' => 8999,
-                         '8' => 8992,
-                         '6' => 8994,
-                         '7' => 8993,
-                         '5' => 8995,
-                         '3' => 8997
+             '4387' => {
+                         '6' => 8740,
+                         '3' => 8750,
+                         '7' => 8739,
+                         '2' => 8749,
+                         '8' => 8738,
+                         '1' => 8748,
+                         '4' => 8751,
+                         '5' => 8741
                        },
-             '32772' => {
-                          '2' => 12816,
-                          '6' => 12880,
-                          '4' => 12848,
-                          '5' => 12864,
-                          '1' => 12800,
-                          '3' => 12832
+             '33728' => {
+                          '4' => 33299,
+                          '1' => 33316,
+                          '0' => 33349,
+                          '3' => 33284,
+                          '2' => 33300
                         },
-             '4097' => {
-                         '3' => 8257,
-                         '5' => 8256,
-                         '7' => 8260,
-                         '6' => 8263,
-                         '8' => 8265,
-                         '1' => 8258,
-                         '4' => 8261,
-                         '2' => 8259
+             '4180' => {
+                         '6' => 8477,
+                         '8' => 8479,
+                         '4' => 8475,
+                         '3' => 8474,
+                         '7' => 8478,
+                         '2' => 8473,
+                         '5' => 8476
                        },
-             '33793' => {
-                          '3' => 18433,
-                          '5' => 18448,
-                          '7' => 18450,
-                          '6' => 18449,
-                          '8' => 18451,
-                          '1' => 18434,
-                          '4' => 18435,
-                          '2' => 18432
+             '33413' => {
+                          '6' => 30215,
+                          '11' => 30212,
+                          '3' => 29958,
+                          '7' => 29701,
+                          '9' => 29956,
+                          '2' => 29702,
+                          '12' => 30213,
+                          '8' => 29700,
+                          '4' => 29959,
+                          '1' => 29703,
+                          '10' => 29957,
+                          '5' => 30214
                         },
-             '33809' => {
-                          '3' => 18480,
-                          '5' => 18464,
-                          '7' => 18466,
-                          '6' => 18465,
-                          '8' => 18467,
-                          '1' => 18482,
-                          '4' => 18483,
-                          '2' => 18481
+             '33320' => {
+                          '6' => 30306,
+                          '11' => 30291,
+                          '3' => 30051,
+                          '7' => 29778,
+                          '9' => 30035,
+                          '12' => 30290,
+                          '2' => 29795,
+                          '8' => 29779,
+                          '4' => 30050,
+                          '1' => 29794,
+                          '10' => 30034,
+                          '5' => 30307
                         },
-             '4098' => {
-                         '2' => 8262,
-                         '6' => 8266,
-                         '4' => 8268,
-                         '5' => 8267,
-                         '1' => 8264,
-                         '3' => 8269
-                       },
-             '4400' => {
-                         '3' => 4404,
-                         '1' => 4402,
-                         '0' => 4401,
-                         '2' => 4403
+             '4384' => {
+                         '1' => 4386,
+                         '0' => 4385,
+                         '3' => 4388,
+                         '2' => 4387
                        },
-             '4145' => {
-                         '4' => 8210,
-                         '7' => 8213,
-                         '2' => 8208,
-                         '8' => 8214,
-                         '3' => 8209,
-                         '5' => 8211,
-                         '1' => 8212
+             '4418' => {
+                         '6' => 9037,
+                         '3' => 9034,
+                         '7' => 9038,
+                         '2' => 9033,
+                         '8' => 9039,
+                         '1' => 9032,
+                         '4' => 9035,
+                         '5' => 9036
                        },
-             '32768' => {
-                          '2' => 32771,
-                          '6' => 33024,
-                          '0' => 32769,
-                          '7' => 33040,
-                          '4' => 3,
-                          '1' => 32770,
-                          '3' => 32772
+             '33377' => {
+                          '6' => 29078,
+                          '11' => 29335,
+                          '3' => 29063,
+                          '7' => 29302,
+                          '9' => 29319,
+                          '2' => 29047,
+                          '12' => 29334,
+                          '8' => 29303,
+                          '4' => 29062,
+                          '1' => 29046,
+                          '10' => 29318,
+                          '5' => 29079
                         },
+             '4160' => {
+                         '1' => 4162,
+                         '0' => 4161,
+                         '3' => 4164,
+                         '2' => 4163
+                       },
              '4096' => {
-                         '3' => 4100,
                          '1' => 4098,
                          '0' => 4097,
+                         '3' => 4100,
                          '2' => 4099
                        },
-             '4116' => {
-                         '1' => 8456,
-                         '8' => 8463,
-                         '2' => 8457,
-                         '4' => 8459,
-                         '5' => 8460,
-                         '3' => 8458,
-                         '6' => 8461,
-                         '7' => 8462
-                       },
-             '4388' => {
-                         '4' => 8746,
-                         '2' => 8736,
-                         '8' => 8742,
-                         '1' => 8737,
-                         '7' => 8743,
-                         '6' => 8744,
-                         '3' => 8747,
-                         '5' => 8745
+             '33313' => {
+                          '6' => 30352,
+                          '11' => 30097,
+                          '3' => 30337,
+                          '7' => 30064,
+                          '9' => 30081,
+                          '2' => 30321,
+                          '12' => 30096,
+                          '8' => 30065,
+                          '4' => 30336,
+                          '1' => 30320,
+                          '10' => 30080,
+                          '5' => 30353
+                        },
+             '33738' => {
+                          '6' => 33352,
+                          '4' => 33351,
+                          '1' => 33319,
+                          '3' => 33320,
+                          '5' => 33350
+                        },
+             '33364' => {
+                          '6' => 28720,
+                          '11' => 28727,
+                          '3' => 28705,
+                          '7' => 28694,
+                          '9' => 28711,
+                          '2' => 28689,
+                          '12' => 28726,
+                          '8' => 28695,
+                          '4' => 28704,
+                          '1' => 28688,
+                          '10' => 28710,
+                          '5' => 28721
+                        },
+             '4401' => {
+                         '6' => 9018,
+                         '3' => 9021,
+                         '7' => 9017,
+                         '2' => 9022,
+                         '8' => 9016,
+                         '4' => 9020,
+                         '1' => 9023,
+                         '5' => 9019
                        },
-             '12880' => {
-                          '0' => 12881,
-                          '1' => 12882
+             '33299' => {
+                          '6' => 31008,
+                          '11' => 31025,
+                          '3' => 30753,
+                          '7' => 30512,
+                          '9' => 30769,
+                          '12' => 31024,
+                          '2' => 30497,
+                          '8' => 30513,
+                          '4' => 30752,
+                          '1' => 30496,
+                          '10' => 30768,
+                          '5' => 31009
                         },
-             '4436' => {
-                         '6' => 9053,
-                         '7' => 9054,
-                         '5' => 9052,
-                         '3' => 9050,
-                         '2' => 9049,
-                         '4' => 9051,
-                         '1' => 9048,
-                         '8' => 9055
+             '4434' => {
+                         '6' => 8797,
+                         '3' => 8799,
+                         '7' => 8798,
+                         '2' => 8793,
+                         '8' => 8794,
+                         '4' => 8795,
+                         '1' => 8792,
+                         '5' => 8796
                        },
-             '4112' => {
-                         '3' => 4116,
-                         '1' => 4114,
-                         '0' => 4113,
-                         '2' => 4115
+             '33417' => {
+                          '6' => 30357,
+                          '11' => 30100,
+                          '3' => 30340,
+                          '7' => 30069,
+                          '9' => 30085,
+                          '2' => 30324,
+                          '12' => 30101,
+                          '8' => 30068,
+                          '4' => 30341,
+                          '1' => 30325,
+                          '10' => 30084,
+                          '5' => 30356
+                        },
+             '33379' => {
+                          '6' => 29511,
+                          '11' => 29494,
+                          '3' => 29254,
+                          '7' => 28983,
+                          '9' => 29238,
+                          '12' => 29495,
+                          '2' => 28998,
+                          '8' => 28982,
+                          '1' => 28999,
+                          '4' => 29255,
+                          '10' => 29239,
+                          '5' => 29510
+                        },
+             '33317' => {
+                          '6' => 30210,
+                          '11' => 30209,
+                          '3' => 29955,
+                          '7' => 29696,
+                          '9' => 29953,
+                          '12' => 30208,
+                          '2' => 29699,
+                          '8' => 29697,
+                          '1' => 29698,
+                          '4' => 29954,
+                          '10' => 29952,
+                          '5' => 30211
+                        },
+             '33446' => {
+                          '8' => 31252,
+                          '1' => 31509,
+                          '11' => 31284,
+                          '7' => 31253,
+                          '10' => 31269,
+                          '9' => 31268,
+                          '12' => 31285
+                        },
+             '33426' => {
+                          '6' => 31063,
+                          '11' => 31046,
+                          '3' => 30806,
+                          '7' => 30535,
+                          '9' => 30790,
+                          '2' => 30550,
+                          '12' => 31047,
+                          '8' => 30534,
+                          '1' => 30551,
+                          '4' => 30807,
+                          '10' => 30791,
+                          '5' => 31062
+                        },
+             '4432' => {
+                         '1' => 4434,
+                         '0' => 4433,
+                         '3' => 4436,
+                         '2' => 4435
                        },
-             '12864' => {
-                          '1' => 12866,
-                          '0' => 12865
-                        },
-             '33537' => {
-                          '2' => 12289,
-                          '4' => 12291,
-                          '1' => 12288,
-                          '8' => 12306,
-                          '9' => 12307,
-                          '6' => 12304,
-                          '7' => 12305,
-                          '5' => 12292,
-                          '10' => 12308,
-                          '3' => 12290
+             '33366' => {
+                          '6' => 28725,
+                          '11' => 28722,
+                          '3' => 28708,
+                          '7' => 28691,
+                          '9' => 28706,
+                          '12' => 28723,
+                          '2' => 28692,
+                          '8' => 28690,
+                          '4' => 28709,
+                          '1' => 28693,
+                          '10' => 28707,
+                          '5' => 28724
                         },
-             '4420' => {
-                         '3' => 8778,
-                         '5' => 8780,
-                         '7' => 8782,
-                         '6' => 8781,
-                         '8' => 8783,
-                         '1' => 8776,
-                         '4' => 8779,
-                         '2' => 8777
+             '4416' => {
+                         '1' => 4418,
+                         '0' => 4417,
+                         '3' => 4420,
+                         '2' => 4419
                        },
-             '4129' => {
-                         '5' => 8196,
-                         '1' => 8192,
-                         '3' => 8194,
-                         '8' => 8199,
-                         '6' => 8197,
-                         '2' => 8193,
-                         '4' => 8195
-                       },
-             '4352' => {
-                         '3' => 4356,
-                         '1' => 4354,
-                         '0' => 4353,
-                         '2' => 4355
-                       },
-             '4164' => {
-                         '5' => 8508,
-                         '3' => 8506,
-                         '6' => 8509,
-                         '7' => 8510,
-                         '1' => 8504,
-                         '8' => 8511,
-                         '2' => 8505,
-                         '4' => 8507
-                       },
-             '33824' => {
-                          '2' => 33825
+             '33368' => {
+                          '6' => 28773,
+                          '11' => 28770,
+                          '3' => 28756,
+                          '7' => 28739,
+                          '9' => 28754,
+                          '12' => 28771,
+                          '2' => 28740,
+                          '8' => 28738,
+                          '4' => 28757,
+                          '1' => 28741,
+                          '10' => 28755,
+                          '5' => 28772
                         },
-             '4416' => {
-                         '3' => 4420,
-                         '1' => 4418,
-                         '0' => 4417,
-                         '2' => 4419
-                       },
-             '33536' => {
-                          '2' => 33537
+             '33315' => {
+                          '6' => 30256,
+                          '11' => 30273,
+                          '3' => 30001,
+                          '7' => 29760,
+                          '9' => 30017,
+                          '12' => 30272,
+                          '2' => 29745,
+                          '8' => 29761,
+                          '4' => 30000,
+                          '1' => 29744,
+                          '10' => 30016,
+                          '5' => 30257
                         },
-             '12848' => {
-                          '0' => 12849,
-                          '1' => 12850
+             '33316' => {
+                          '6' => 30224,
+                          '11' => 30241,
+                          '3' => 29969,
+                          '7' => 29728,
+                          '9' => 29985,
+                          '12' => 30240,
+                          '2' => 29713,
+                          '8' => 29729,
+                          '4' => 29968,
+                          '1' => 29712,
+                          '10' => 29984,
+                          '5' => 30225
                         },
-             '4401' => {
-                         '1' => 9023,
-                         '8' => 9016,
-                         '2' => 9022,
-                         '4' => 9020,
-                         '5' => 9019,
-                         '3' => 9021,
-                         '6' => 9018,
-                         '7' => 9017
-                       },
-             '4354' => {
-                         '1' => 8712,
-                         '8' => 8719,
-                         '2' => 8713,
-                         '4' => 8715,
-                         '5' => 8717,
-                         '3' => 8714,
-                         '6' => 8716,
-                         '7' => 8718
-                       },
-             '4115' => {
-                         '5' => 8468,
-                         '3' => 8466,
-                         '6' => 8469,
-                         '7' => 8454,
-                         '1' => 8464,
-                         '8' => 8455,
-                         '2' => 8465,
-                         '4' => 8467
-                       },
-             '4146' => {
-                         '4' => 8218,
-                         '7' => 8221,
-                         '6' => 8220,
-                         '2' => 8216,
-                         '3' => 8217,
-                         '5' => 8219,
-                         '1' => 8215
-                       },
-             '4353' => {
-                         '2' => 8705,
-                         '4' => 8707,
-                         '1' => 8704,
-                         '8' => 8711,
-                         '6' => 8709,
-                         '7' => 8710,
-                         '5' => 8708,
-                         '3' => 8706
-                       },
-             '4384' => {
-                         '2' => 4387,
-                         '0' => 4385,
-                         '1' => 4386,
-                         '3' => 4388
-                       },
-             '4433' => {
-                         '5' => 8788,
-                         '1' => 8784,
-                         '3' => 8786,
-                         '2' => 8785,
-                         '6' => 8789,
-                         '4' => 8787,
-                         '7' => 8790
+             '4402' => {
+                         '6' => 9010,
+                         '3' => 9013,
+                         '7' => 9009,
+                         '2' => 9014,
+                         '8' => 9008,
+                         '4' => 9012,
+                         '1' => 9015,
+                         '5' => 9011
                        },
-             '34560' => {
-                          '2' => 34561
+             '33301' => {
+                          '6' => 30994,
+                          '11' => 30979,
+                          '3' => 30739,
+                          '7' => 30466,
+                          '9' => 30723,
+                          '2' => 30483,
+                          '12' => 30978,
+                          '8' => 30467,
+                          '4' => 30738,
+                          '1' => 30482,
+                          '10' => 30722,
+                          '5' => 30995
                         },
-             '4404' => {
-                         '1' => 8759,
-                         '8' => 8753,
-                         '2' => 8758,
-                         '4' => 8756,
-                         '5' => 8755,
-                         '3' => 8757,
-                         '6' => 8754,
-                         '7' => 8752
-                       },
-             '4371' => {
-                         '4' => 8732,
-                         '2' => 8734,
-                         '8' => 8728,
-                         '1' => 8735,
-                         '7' => 8729,
-                         '6' => 8730,
-                         '3' => 8733,
-                         '5' => 8731
-                       },
-             '4180' => {
-                         '4' => 8475,
-                         '7' => 8478,
-                         '6' => 8477,
-                         '2' => 8473,
-                         '3' => 8474,
-                         '8' => 8479,
-                         '5' => 8476
-                       },
-             '34944' => {
-                          '2' => 20482,
-                          '0' => 20480,
-                          '1' => 20481,
-                          '3' => 20483
-                        },
-             '33825' => {
-                          '3' => 18514,
-                          '5' => 18496,
-                          '7' => 18498,
-                          '6' => 18497,
-                          '8' => 18499,
-                          '1' => 18512,
-                          '4' => 18515,
-                          '2' => 18513
-                        },
-             '33552' => {
-                          '2' => 33553
-                        },
-             '12832' => {
-                          '1' => 12834,
-                          '0' => 12833
-                        },
-             '33025' => {
-                          '3' => 4128,
-                          '5' => 4160,
-                          '1' => 4096,
-                          '4' => 4144,
-                          '2' => 4112,
-                          '6' => 4176
-                        },
-             '35072' => {
-                          '2' => 14337,
-                          '1' => 14336
-                        },
-             '34960' => {
-                          '1' => 20497,
-                          '3' => 20499,
-                          '2' => 20498,
-                          '0' => 20496
+             '34304' => {
+                          '2' => 34305
                         },
-             '4356' => {
-                         '1' => 8968,
-                         '8' => 8975,
-                         '2' => 8969,
-                         '4' => 8971,
-                         '5' => 8972,
-                         '3' => 8970,
-                         '6' => 8973,
-                         '7' => 8974
-                       },
-             '12816' => {
-                          '0' => 12817,
-                          '1' => 12818
+             '33351' => {
+                          '6' => 29506,
+                          '11' => 29491,
+                          '3' => 29251,
+                          '7' => 28978,
+                          '9' => 29235,
+                          '2' => 28995,
+                          '12' => 29490,
+                          '8' => 28979,
+                          '1' => 28994,
+                          '4' => 29250,
+                          '10' => 29234,
+                          '5' => 29507
                         },
-             '34561' => {
-                          '2' => 17424,
-                          '4' => 34960,
-                          '1' => 17408,
-                          '3' => 17440
+             '33352' => {
+                          '6' => 29538,
+                          '11' => 29523,
+                          '3' => 29283,
+                          '7' => 29010,
+                          '9' => 29267,
+                          '2' => 29027,
+                          '12' => 29522,
+                          '8' => 29011,
+                          '1' => 29026,
+                          '4' => 29282,
+                          '10' => 29266,
+                          '5' => 29539
                         },
-             '4161' => {
-                         '5' => 8244,
-                         '3' => 8242,
-                         '6' => 8245,
-                         '7' => 8246,
-                         '1' => 8240,
-                         '8' => 8247,
-                         '2' => 8241,
-                         '4' => 8243
-                       },
-             '4435' => {
-                         '3' => 9042,
-                         '5' => 9044,
-                         '7' => 9046,
-                         '6' => 9045,
-                         '8' => 9047,
-                         '1' => 9040,
-                         '4' => 9043,
-                         '2' => 9041
-                       },
-             '33024' => {
-                          '2' => 33025
+             '33378' => {
+                          '6' => 29543,
+                          '11' => 29526,
+                          '3' => 29286,
+                          '7' => 29015,
+                          '9' => 29270,
+                          '12' => 29527,
+                          '2' => 29030,
+                          '8' => 29014,
+                          '4' => 29287,
+                          '1' => 29031,
+                          '10' => 29271,
+                          '5' => 29542
+                        },
+             '35331' => {
+                          '1' => 24640,
+                          '3' => 24642,
+                          '2' => 24641
+                        },
+             '33808' => {
+                          '2' => 33809
+                        },
+             '35330' => {
+                          '8' => 24614,
+                          '6' => 24612,
+                          '7' => 24613,
+                          '5' => 24611
+                        },
+             '32787' => {
+                          '1' => 35329,
+                          '4' => 35332,
+                          '3' => 35331,
+                          '0' => 35328,
+                          '2' => 35330,
+                          '5' => 35333
                         },
-             '4369' => {
-                         '7' => 8985,
-                         '6' => 8986,
-                         '3' => 8989,
-                         '5' => 8987,
-                         '4' => 8988,
-                         '2' => 8990,
-                         '8' => 8984,
-                         '1' => 8991
-                       },
              '4162' => {
-                         '4' => 8251,
-                         '2' => 8249,
+                         '8' => 8472,
                          '6' => 8253,
+                         '4' => 8251,
+                         '1' => 8248,
                          '3' => 8250,
-                         '8' => 8472,
-                         '5' => 8252,
-                         '1' => 8248
-                       },
-             '4179' => {
-                         '4' => 8531,
-                         '2' => 8529,
-                         '8' => 8471,
-                         '1' => 8528,
-                         '7' => 8470,
-                         '6' => 8533,
-                         '3' => 8530,
-                         '5' => 8532
-                       },
-             '4178' => {
-                         '5' => 8524,
-                         '3' => 8522,
-                         '6' => 8525,
-                         '7' => 8526,
-                         '1' => 8520,
-                         '8' => 8527,
-                         '2' => 8521,
-                         '4' => 8523
+                         '2' => 8249,
+                         '5' => 8252
                        },
-             '33792' => {
-                          '2' => 33793
+             '33393' => {
+                          '6' => 29590,
+                          '11' => 29847,
+                          '3' => 29575,
+                          '7' => 29814,
+                          '9' => 29831,
+                          '2' => 29559,
+                          '12' => 29846,
+                          '8' => 29815,
+                          '1' => 29558,
+                          '4' => 29574,
+                          '10' => 29830,
+                          '5' => 29591
                         },
-             '4147' => {
-                         '7' => 8230,
-                         '4' => 8227,
-                         '6' => 8229,
-                         '2' => 8224,
-                         '3' => 8225,
-                         '8' => 8231,
-                         '5' => 8228
-                       },
-             '4128' => {
-                         '2' => 4131,
-                         '0' => 4129,
-                         '1' => 4130,
-                         '3' => 4132
-                       },
-             '34816' => {
-                          '2' => 34817
+             '33733' => {
+                          '4' => 33377,
+                          '1' => 33409,
+                          '0' => 33393
                         },
-             '4099' => {
-                         '5' => 8484,
-                         '3' => 8482,
-                         '6' => 8485,
-                         '7' => 8486,
-                         '1' => 8480,
-                         '8' => 8487,
-                         '2' => 8481,
-                         '4' => 8483
-                       },
-             '34817' => {
-                          '2' => 16384,
-                          '1' => 2
+             '32789' => {
+                          '1' => 4112,
+                          '4' => 4160,
+                          '3' => 4144,
+                          '0' => 4096,
+                          '2' => 4128,
+                          '5' => 4176
                         },
-             '33808' => {
-                          '2' => 33809
+             '33386' => {
+                          '6' => 29605,
+                          '11' => 29620,
+                          '3' => 29348,
+                          '7' => 29109,
+                          '9' => 29364,
+                          '12' => 29621,
+                          '2' => 29092,
+                          '8' => 29108,
+                          '4' => 29349,
+                          '1' => 29093,
+                          '10' => 29365,
+                          '5' => 29604
                         },
-             '4402' => {
-                         '5' => 9011,
-                         '3' => 9013,
-                         '6' => 9010,
-                         '7' => 9009,
-                         '1' => 9015,
-                         '8' => 9008,
-                         '2' => 9014,
-                         '4' => 9012
-                       },
-             '4130' => {
-                         '7' => 8198,
-                         '4' => 8203,
-                         '2' => 8201,
-                         '6' => 8205,
-                         '3' => 8202,
-                         '1' => 8200,
-                         '5' => 8204
-                       },
-             '4163' => {
-                         '8' => 8503,
-                         '1' => 8496,
-                         '4' => 8499,
-                         '2' => 8497,
-                         '3' => 8498,
-                         '5' => 8500,
-                         '7' => 8502,
-                         '6' => 8501
+             '4436' => {
+                         '6' => 9053,
+                         '3' => 9050,
+                         '7' => 9054,
+                         '2' => 9049,
+                         '8' => 9055,
+                         '4' => 9051,
+                         '1' => 9048,
+                         '5' => 9052
                        },
              '4403' => {
-                         '4' => 8764,
+                         '6' => 8762,
+                         '3' => 8765,
+                         '7' => 8761,
                          '2' => 8766,
                          '8' => 8760,
                          '1' => 8767,
-                         '7' => 8761,
-                         '6' => 8762,
-                         '3' => 8765,
+                         '4' => 8764,
                          '5' => 8763
                        },
-             '4419' => {
-                         '2' => 8769,
-                         '4' => 8771,
-                         '1' => 8768,
-                         '8' => 8775,
-                         '6' => 8773,
-                         '7' => 8774,
-                         '5' => 8772,
-                         '3' => 8770
-                       },
              '4177' => {
-                         '7' => 8518,
                          '6' => 8517,
                          '3' => 8514,
-                         '5' => 8516,
-                         '4' => 8515,
+                         '7' => 8518,
                          '2' => 8513,
                          '8' => 8519,
-                         '1' => 8512
-                       },
-             '4417' => {
-                         '2' => 9025,
-                         '4' => 9027,
-                         '1' => 9024,
-                         '8' => 9031,
-                         '6' => 9029,
-                         '7' => 9030,
-                         '5' => 9028,
-                         '3' => 9026
+                         '1' => 8512,
+                         '4' => 8515,
+                         '5' => 8516
+                       },
+             '32786' => {
+                          '1' => 34304,
+                          '0' => 34560,
+                          '3' => 33808,
+                          '2' => 33792
+                        },
+             '33736' => {
+                          '6' => 33417,
+                          '1' => 33384,
+                          '4' => 33416,
+                          '0' => 33385,
+                          '3' => 33368,
+                          '2' => 33386,
+                          '5' => 33401
+                        },
+             '33414' => {
+                          '6' => 30229,
+                          '11' => 30244,
+                          '3' => 29972,
+                          '7' => 29733,
+                          '9' => 29988,
+                          '12' => 30245,
+                          '2' => 29716,
+                          '8' => 29732,
+                          '4' => 29973,
+                          '1' => 29717,
+                          '10' => 29989,
+                          '5' => 30228
+                        },
+             '33383' => {
+                          '6' => 29493,
+                          '11' => 29508,
+                          '3' => 29236,
+                          '7' => 28997,
+                          '9' => 29252,
+                          '12' => 29509,
+                          '2' => 28980,
+                          '8' => 28996,
+                          '4' => 29237,
+                          '1' => 28981,
+                          '10' => 29253,
+                          '5' => 29492
+                        },
+             '33362' => {
+                          '6' => 28768,
+                          '11' => 28775,
+                          '3' => 28753,
+                          '7' => 28742,
+                          '9' => 28759,
+                          '2' => 28737,
+                          '12' => 28774,
+                          '8' => 28743,
+                          '4' => 28752,
+                          '1' => 28736,
+                          '10' => 28758,
+                          '5' => 28769
+                        },
+             '35333' => {
+                          '8' => 24662,
+                          '6' => 24660,
+                          '7' => 24661,
+                          '5' => 24659
+                        },
+             '33410' => {
+                          '6' => 30311,
+                          '11' => 30294,
+                          '3' => 30054,
+                          '7' => 29783,
+                          '9' => 30038,
+                          '12' => 30295,
+                          '2' => 29798,
+                          '8' => 29782,
+                          '1' => 29799,
+                          '4' => 30055,
+                          '10' => 30039,
+                          '5' => 30310
+                        },
+             '33337' => {
+                          '6' => 29587,
+                          '11' => 29842,
+                          '3' => 29570,
+                          '7' => 29811,
+                          '9' => 29826,
+                          '2' => 29554,
+                          '12' => 29843,
+                          '8' => 29810,
+                          '4' => 29571,
+                          '1' => 29555,
+                          '10' => 29827,
+                          '5' => 29586
+                        },
+             '4371' => {
+                         '8' => 8728,
+                         '4' => 8732,
+                         '1' => 8735,
+                         '3' => 8733,
+                         '7' => 8729,
+                         '2' => 8734,
+                         '5' => 8731
                        },
              '4100' => {
-                         '7' => 8494,
                          '6' => 8493,
                          '3' => 8490,
-                         '5' => 8492,
-                         '4' => 8491,
+                         '7' => 8494,
                          '2' => 8489,
                          '8' => 8495,
-                         '1' => 8488
+                         '1' => 8488,
+                         '4' => 8491,
+                         '5' => 8492
                        },
-             '4387' => {
-                         '7' => 8739,
-                         '6' => 8740,
-                         '3' => 8750,
-                         '5' => 8741,
-                         '4' => 8751,
-                         '2' => 8749,
-                         '8' => 8738,
-                         '1' => 8748
+             '32791' => {
+                          '6' => 272,
+                          '1' => 33728,
+                          '4' => 33736,
+                          '0' => 33738,
+                          '3' => 33730,
+                          '2' => 33729,
+                          '5' => 33737
+                        },
+             '33353' => {
+                          '6' => 29075,
+                          '11' => 29330,
+                          '3' => 29058,
+                          '7' => 29299,
+                          '9' => 29314,
+                          '2' => 29042,
+                          '12' => 29331,
+                          '8' => 29298,
+                          '4' => 29059,
+                          '1' => 29043,
+                          '10' => 29315,
+                          '5' => 29074
+                        },
+             '33735' => {
+                          '1' => 33286,
+                          '4' => 33317,
+                          '0' => 33301,
+                          '3' => 33318,
+                          '2' => 33303,
+                          '5' => 33302
+                        },
+             '4147' => {
+                         '6' => 8229,
+                         '3' => 8225,
+                         '7' => 8230,
+                         '2' => 8224,
+                         '8' => 8231,
+                         '1' => 8235,
+                         '4' => 8227,
+                         '5' => 8228
                        },
-             '4418' => {
-                         '1' => 9032,
-                         '8' => 9039,
-                         '2' => 9033,
-                         '4' => 9035,
-                         '5' => 9036,
-                         '3' => 9034,
-                         '6' => 9037,
-                         '7' => 9038
+             '33298' => {
+                          '6' => 31040,
+                          '11' => 31057,
+                          '3' => 30785,
+                          '7' => 30544,
+                          '9' => 30801,
+                          '12' => 31056,
+                          '2' => 30529,
+                          '8' => 30545,
+                          '4' => 30784,
+                          '1' => 30528,
+                          '10' => 30800,
+                          '5' => 31041
+                        },
+             '33412' => {
+                          '6' => 30247,
+                          '11' => 30230,
+                          '3' => 29990,
+                          '7' => 29719,
+                          '9' => 29974,
+                          '2' => 29734,
+                          '12' => 30231,
+                          '8' => 29718,
+                          '1' => 29735,
+                          '4' => 29991,
+                          '10' => 29975,
+                          '5' => 30246
+                        },
+             '4355' => {
+                         '6' => 8965,
+                         '3' => 8962,
+                         '7' => 8966,
+                         '2' => 8961,
+                         '8' => 8967,
+                         '1' => 8960,
+                         '4' => 8963,
+                         '5' => 8964
                        },
-             '12800' => {
-                          '0' => 12801,
-                          '1' => 12802
+             '33792' => {
+                          '2' => 33793
                         },
-             '4148' => {
-                         '2' => 8232,
-                         '6' => 8226,
-                         '7' => 8237,
-                         '4' => 8235,
-                         '5' => 8236,
-                         '8' => 8233,
-                         '3' => 8234
+             '4132' => {
+                         '6' => 8285,
+                         '4' => 8283,
+                         '1' => 8280,
+                         '3' => 8282,
+                         '2' => 8281,
+                         '5' => 8284
+                       },
+             '4145' => {
+                         '8' => 8214,
+                         '1' => 8212,
+                         '4' => 8210,
+                         '3' => 8209,
+                         '7' => 8213,
+                         '2' => 8208,
+                         '5' => 8211
+                       },
+             '4164' => {
+                         '6' => 8511,
+                         '3' => 8506,
+                         '7' => 8510,
+                         '2' => 8505,
+                         '8' => 8509,
+                         '1' => 8504,
+                         '4' => 8507,
+                         '5' => 8508
+                       },
+             '33314' => {
+                          '6' => 30288,
+                          '11' => 30305,
+                          '3' => 30033,
+                          '7' => 29792,
+                          '9' => 30049,
+                          '12' => 30304,
+                          '2' => 29777,
+                          '8' => 29793,
+                          '1' => 29776,
+                          '4' => 30032,
+                          '10' => 30048,
+                          '5' => 30289
+                        },
+             '33416' => {
+                          '6' => 30293,
+                          '11' => 30308,
+                          '3' => 30036,
+                          '7' => 29797,
+                          '9' => 30052,
+                          '12' => 30309,
+                          '2' => 29780,
+                          '8' => 29796,
+                          '4' => 30037,
+                          '1' => 29781,
+                          '10' => 30053,
+                          '5' => 30292
+                        },
+             '33321' => {
+                          '6' => 30099,
+                          '11' => 30354,
+                          '3' => 30082,
+                          '7' => 30323,
+                          '9' => 30338,
+                          '2' => 30066,
+                          '12' => 30355,
+                          '8' => 30322,
+                          '1' => 30067,
+                          '4' => 30083,
+                          '10' => 30339,
+                          '5' => 30098
+                        },
+             '32768' => {
+                          '6' => 32790,
+                          '3' => 32787,
+                          '7' => 32791,
+                          '2' => 32786,
+                          '8' => 32792,
+                          '1' => 34816,
+                          '0' => 256,
+                          '10' => 3,
+                          '5' => 32789
+                        },
+             '33346' => {
+                          '6' => 29520,
+                          '11' => 29537,
+                          '3' => 29265,
+                          '7' => 29024,
+                          '9' => 29281,
+                          '2' => 29009,
+                          '12' => 29536,
+                          '8' => 29025,
+                          '1' => 29008,
+                          '4' => 29264,
+                          '10' => 29280,
+                          '5' => 29521
+                        },
+             '33401' => {
+                          '6' => 29845,
+                          '11' => 29588,
+                          '3' => 29828,
+                          '7' => 29557,
+                          '9' => 29572,
+                          '12' => 29589,
+                          '2' => 29812,
+                          '8' => 29556,
+                          '4' => 29829,
+                          '1' => 29813,
+                          '10' => 29573,
+                          '5' => 29844
+                        },
+             '34816' => {
+                          '0' => 2
+                        },
+             '33348' => {
+                          '6' => 29456,
+                          '11' => 29473,
+                          '3' => 29201,
+                          '7' => 28960,
+                          '9' => 29217,
+                          '12' => 29472,
+                          '2' => 28945,
+                          '8' => 28961,
+                          '1' => 28944,
+                          '4' => 29200,
+                          '10' => 29216,
+                          '5' => 29457
+                        },
+             '4353' => {
+                         '6' => 8709,
+                         '3' => 8706,
+                         '7' => 8710,
+                         '2' => 8705,
+                         '8' => 8711,
+                         '1' => 8704,
+                         '4' => 8707,
+                         '5' => 8708
+                       },
+             '4097' => {
+                         '6' => 8263,
+                         '3' => 8257,
+                         '7' => 8260,
+                         '2' => 8259,
+                         '8' => 8265,
+                         '1' => 8258,
+                         '4' => 8261,
+                         '5' => 8256
+                       },
+             '35332' => {
+                          '8' => 24646,
+                          '6' => 24644,
+                          '1' => 24657,
+                          '0' => 24656,
+                          '7' => 24645,
+                          '2' => 24658,
+                          '5' => 24643
+                        },
+             '4179' => {
+                         '6' => 8533,
+                         '3' => 8530,
+                         '7' => 8470,
+                         '2' => 8529,
+                         '8' => 8471,
+                         '4' => 8531,
+                         '1' => 8528,
+                         '5' => 8532
+                       },
+             '4146' => {
+                         '6' => 8220,
+                         '4' => 8218,
+                         '1' => 8215,
+                         '3' => 8217,
+                         '7' => 8221,
+                         '2' => 8216,
+                         '5' => 8219
+                       },
+             '4368' => {
+                         '1' => 4370,
+                         '0' => 4369,
+                         '3' => 4372,
+                         '2' => 4371
                        },
              '4114' => {
+                         '6' => 8541,
+                         '3' => 8538,
+                         '7' => 8542,
+                         '2' => 8537,
                          '8' => 8543,
                          '1' => 8536,
                          '4' => 8539,
-                         '2' => 8537,
-                         '3' => 8538,
-                         '5' => 8540,
-                         '7' => 8542,
-                         '6' => 8541
-                       }
+                         '5' => 8540
+                       },
+             '33411' => {
+                          '6' => 30279,
+                          '11' => 30262,
+                          '3' => 30022,
+                          '7' => 29751,
+                          '9' => 30006,
+                          '12' => 30263,
+                          '2' => 29766,
+                          '8' => 29750,
+                          '4' => 30023,
+                          '1' => 29767,
+                          '10' => 30007,
+                          '5' => 30278
+                        },
+             '4386' => {
+                         '6' => 8994,
+                         '3' => 8997,
+                         '7' => 8993,
+                         '2' => 8998,
+                         '8' => 8992,
+                         '1' => 8999,
+                         '4' => 8996,
+                         '5' => 8995
+                       },
+             '33381' => {
+                          '6' => 29447,
+                          '11' => 29444,
+                          '3' => 29190,
+                          '7' => 28933,
+                          '9' => 29188,
+                          '12' => 29445,
+                          '2' => 28934,
+                          '8' => 28932,
+                          '4' => 29191,
+                          '1' => 28935,
+                          '10' => 29189,
+                          '5' => 29446
+                        },
+             '33793' => {
+                          '6' => 18498,
+                          '11' => 18481,
+                          '3' => 18513,
+                          '7' => 18497,
+                          '9' => 18483,
+                          '12' => 18480,
+                          '2' => 18514,
+                          '8' => 18496,
+                          '1' => 18515,
+                          '4' => 18512,
+                          '10' => 18482,
+                          '5' => 18499
+                        },
+             '4148' => {
+                         '8' => 8233,
+                         '6' => 8226,
+                         '3' => 8234,
+                         '7' => 8237,
+                         '2' => 8232,
+                         '5' => 8236
+                       },
+             '33731' => {
+                          '6' => 33381,
+                          '1' => 33413,
+                          '0' => 33430,
+                          '3' => 33380,
+                          '5' => 33446
+                        },
+             '33350' => {
+                          '6' => 29474,
+                          '11' => 29459,
+                          '3' => 29219,
+                          '7' => 28946,
+                          '9' => 29203,
+                          '12' => 29458,
+                          '2' => 28963,
+                          '8' => 28947,
+                          '4' => 29218,
+                          '1' => 28962,
+                          '10' => 29202,
+                          '5' => 29475
+                        },
+             '33729' => {
+                          '6' => 33345,
+                          '1' => 33347,
+                          '4' => 33315,
+                          '3' => 33298,
+                          '0' => 33329,
+                          '2' => 33346,
+                          '5' => 33314
+                        },
+             '33302' => {
+                          '6' => 31026,
+                          '11' => 31011,
+                          '3' => 30771,
+                          '7' => 30498,
+                          '9' => 30755,
+                          '12' => 31010,
+                          '2' => 30515,
+                          '8' => 30499,
+                          '1' => 30514,
+                          '4' => 30770,
+                          '10' => 30754,
+                          '5' => 31027
+                        },
+             '33319' => {
+                          '6' => 30274,
+                          '11' => 30259,
+                          '3' => 30019,
+                          '7' => 29746,
+                          '9' => 30003,
+                          '2' => 29763,
+                          '12' => 30258,
+                          '8' => 29747,
+                          '4' => 30018,
+                          '1' => 29762,
+                          '10' => 30002,
+                          '5' => 30275
+                        },
+             '33354' => {
+                          '6' => 29618,
+                          '11' => 29603,
+                          '3' => 29363,
+                          '7' => 29090,
+                          '9' => 29347,
+                          '12' => 29602,
+                          '2' => 29107,
+                          '8' => 29091,
+                          '1' => 29106,
+                          '4' => 29362,
+                          '10' => 29346,
+                          '5' => 29619
+                        },
+             '33739' => {
+                          '1' => 33337,
+                          '4' => 33321,
+                          '3' => 33366,
+                          '0' => 33369,
+                          '2' => 33353,
+                          '5' => 33354
+                        },
+             '4116' => {
+                         '6' => 8461,
+                         '3' => 8458,
+                         '7' => 8462,
+                         '2' => 8457,
+                         '8' => 8463,
+                         '1' => 8456,
+                         '4' => 8459,
+                         '5' => 8460
+                       },
+             '33284' => {
+                          '8' => 31249,
+                          '11' => 31281,
+                          '7' => 31248,
+                          '10' => 31264,
+                          '9' => 31265,
+                          '12' => 31280
+                        },
+             '33303' => {
+                          '6' => 31058,
+                          '11' => 31043,
+                          '3' => 30803,
+                          '7' => 30530,
+                          '9' => 30787,
+                          '12' => 31042,
+                          '2' => 30547,
+                          '8' => 30531,
+                          '1' => 30546,
+                          '4' => 30802,
+                          '10' => 30786,
+                          '5' => 31059
+                        },
+             '4099' => {
+                         '6' => 8485,
+                         '3' => 8482,
+                         '7' => 8486,
+                         '2' => 8481,
+                         '8' => 8487,
+                         '1' => 8480,
+                         '4' => 8483,
+                         '5' => 8484
+                       },
+             '4385' => {
+                         '6' => 9002,
+                         '3' => 9005,
+                         '7' => 9001,
+                         '2' => 9006,
+                         '8' => 9000,
+                         '1' => 9007,
+                         '4' => 9004,
+                         '5' => 9003
+                       },
+             '4404' => {
+                         '6' => 8754,
+                         '3' => 8757,
+                         '7' => 8752,
+                         '2' => 8758,
+                         '8' => 8753,
+                         '4' => 8756,
+                         '1' => 8759,
+                         '5' => 8755
+                       },
+             '4144' => {
+                         '1' => 4146,
+                         '0' => 4145,
+                         '3' => 4148,
+                         '2' => 4147
+                       },
+             '4420' => {
+                         '6' => 8781,
+                         '3' => 8778,
+                         '7' => 8782,
+                         '2' => 8777,
+                         '8' => 8783,
+                         '4' => 8779,
+                         '1' => 8776,
+                         '5' => 8780
+                       },
+             '4433' => {
+                         '6' => 8789,
+                         '3' => 8786,
+                         '7' => 8790,
+                         '2' => 8785,
+                         '8' => 8791,
+                         '4' => 8787,
+                         '1' => 8784,
+                         '5' => 8788
+                       },
+             '4128' => {
+                         '1' => 4130,
+                         '0' => 4129,
+                         '3' => 4132,
+                         '2' => 4131
+                       },
+             '4356' => {
+                         '6' => 8973,
+                         '3' => 8970,
+                         '7' => 8974,
+                         '2' => 8969,
+                         '8' => 8975,
+                         '1' => 8968,
+                         '4' => 8971,
+                         '5' => 8972
+                       },
+             '4417' => {
+                         '6' => 9029,
+                         '3' => 9026,
+                         '7' => 9030,
+                         '2' => 9025,
+                         '8' => 9031,
+                         '4' => 9027,
+                         '1' => 9024,
+                         '5' => 9028
+                       },
+             '33329' => {
+                          '6' => 29840,
+                          '11' => 29585,
+                          '3' => 29825,
+                          '7' => 29552,
+                          '9' => 29569,
+                          '2' => 29809,
+                          '12' => 29584,
+                          '8' => 29553,
+                          '4' => 29824,
+                          '1' => 29808,
+                          '10' => 29568,
+                          '5' => 29841
+                        },
+             '33385' => {
+                          '6' => 29333,
+                          '11' => 29076,
+                          '3' => 29316,
+                          '7' => 29045,
+                          '9' => 29060,
+                          '12' => 29077,
+                          '2' => 29300,
+                          '8' => 29044,
+                          '1' => 29301,
+                          '4' => 29317,
+                          '10' => 29061,
+                          '5' => 29332
+                        },
+             '34560' => {
+                          '2' => 34561
+                        },
+             '4388' => {
+                         '6' => 8744,
+                         '3' => 8747,
+                         '7' => 8743,
+                         '2' => 8736,
+                         '8' => 8742,
+                         '4' => 8746,
+                         '1' => 8737,
+                         '5' => 8745
+                       },
+             '34561' => {
+                          '1' => 17408,
+                          '3' => 17440,
+                          '2' => 17424
+                        },
+             '4400' => {
+                         '1' => 4402,
+                         '0' => 4401,
+                         '3' => 4404,
+                         '2' => 4403
+                       },
+             '33286' => {
+                          '6' => 31283,
+                          '1' => 31251,
+                          '4' => 31267,
+                          '3' => 31266,
+                          '2' => 31250,
+                          '5' => 31282
+                        },
+             '4352' => {
+                         '1' => 4354,
+                         '0' => 4353,
+                         '3' => 4356,
+                         '2' => 4355
+                       },
+             '4176' => {
+                         '1' => 4178,
+                         '0' => 4177,
+                         '3' => 4180,
+                         '2' => 4179
+                       },
+             '33349' => {
+                          '6' => 29442,
+                          '11' => 29441,
+                          '3' => 29187,
+                          '7' => 28928,
+                          '9' => 29185,
+                          '2' => 28931,
+                          '12' => 29440,
+                          '8' => 28929,
+                          '4' => 29186,
+                          '1' => 28930,
+                          '10' => 29184,
+                          '5' => 29443
+                        },
+             '33737' => {
+                          '6' => 33382,
+                          '4' => 33415,
+                          '0' => 33414,
+                          '3' => 33431,
+                          '2' => 33383
+                        },
+             '4419' => {
+                         '6' => 8773,
+                         '3' => 8770,
+                         '7' => 8774,
+                         '2' => 8769,
+                         '8' => 8775,
+                         '1' => 8768,
+                         '4' => 8771,
+                         '5' => 8772
+                       },
+             '4130' => {
+                         '6' => 8205,
+                         '4' => 8203,
+                         '1' => 8200,
+                         '3' => 8202,
+                         '7' => 8198,
+                         '2' => 8201,
+                         '5' => 8204
+                       },
+             '33429' => {
+                          '6' => 30981,
+                          '11' => 30996,
+                          '3' => 30724,
+                          '7' => 30485,
+                          '9' => 30740,
+                          '2' => 30468,
+                          '12' => 30997,
+                          '8' => 30484,
+                          '4' => 30725,
+                          '1' => 30469,
+                          '10' => 30741,
+                          '5' => 30980
+                        },
+             '4178' => {
+                         '6' => 8525,
+                         '3' => 8522,
+                         '7' => 8526,
+                         '2' => 8521,
+                         '8' => 8527,
+                         '4' => 8523,
+                         '1' => 8520,
+                         '5' => 8524
+                       },
+             '35328' => {
+                          '1' => 24593,
+                          '0' => 24592,
+                          '2' => 24594
+                        },
+             '4115' => {
+                         '6' => 8469,
+                         '3' => 8466,
+                         '7' => 8454,
+                         '2' => 8465,
+                         '8' => 8455,
+                         '1' => 8464,
+                         '4' => 8467,
+                         '5' => 8468
+                       },
+             '4161' => {
+                         '6' => 8245,
+                         '3' => 8242,
+                         '7' => 8246,
+                         '2' => 8241,
+                         '8' => 8247,
+                         '4' => 8243,
+                         '1' => 8240,
+                         '5' => 8244
+                       },
+             '4370' => {
+                         '6' => 8978,
+                         '3' => 8980,
+                         '7' => 8977,
+                         '2' => 8982,
+                         '8' => 8976,
+                         '4' => 8981,
+                         '1' => 8983,
+                         '5' => 8979
+                       },
+             '34305' => {
+                          '6' => 19536,
+                          '1' => 19456,
+                          '4' => 19504,
+                          '3' => 19488,
+                          '7' => 19505,
+                          '2' => 19472,
+                          '5' => 19520
+                        },
+             '33444' => {
+                          '6' => 31286,
+                          '1' => 31254,
+                          '4' => 31270,
+                          '3' => 31271,
+                          '2' => 31255,
+                          '5' => 31287
+                        },
+             '4354' => {
+                         '6' => 8716,
+                         '3' => 8714,
+                         '7' => 8718,
+                         '2' => 8713,
+                         '8' => 8719,
+                         '4' => 8715,
+                         '1' => 8712,
+                         '5' => 8717
+                       },
+             '33431' => {
+                          '6' => 31045,
+                          '11' => 31060,
+                          '3' => 30788,
+                          '7' => 30549,
+                          '9' => 30804,
+                          '12' => 31061,
+                          '2' => 30532,
+                          '8' => 30548,
+                          '1' => 30533,
+                          '4' => 30789,
+                          '10' => 30805,
+                          '5' => 31044
+                        },
+             '33427' => {
+                          '6' => 31031,
+                          '11' => 31014,
+                          '3' => 30774,
+                          '7' => 30503,
+                          '9' => 30758,
+                          '2' => 30518,
+                          '12' => 31015,
+                          '8' => 30502,
+                          '1' => 30519,
+                          '4' => 30775,
+                          '10' => 30759,
+                          '5' => 31030
+                        },
+             '33734' => {
+                          '6' => 33379,
+                          '1' => 33378,
+                          '3' => 33410,
+                          '0' => 33364,
+                          '2' => 33362,
+                          '5' => 33426
+                        },
+             '33732' => {
+                          '6' => 33411,
+                          '4' => 33429,
+                          '3' => 33412,
+                          '0' => 33428,
+                          '2' => 33444,
+                          '5' => 33427
+                        },
+             '33369' => {
+                          '6' => 28821,
+                          '11' => 28818,
+                          '3' => 28804,
+                          '7' => 28787,
+                          '9' => 28802,
+                          '2' => 28788,
+                          '12' => 28819,
+                          '8' => 28786,
+                          '1' => 28789,
+                          '4' => 28805,
+                          '10' => 28803,
+                          '5' => 28820
+                        },
+             '4131' => {
+                         '6' => 8277,
+                         '3' => 8274,
+                         '7' => 8278,
+                         '2' => 8273,
+                         '8' => 8279,
+                         '4' => 8275,
+                         '1' => 8272,
+                         '5' => 8276
+                       },
+             '4098' => {
+                         '6' => 8266,
+                         '4' => 8268,
+                         '1' => 8264,
+                         '3' => 8269,
+                         '2' => 8262,
+                         '5' => 8267
+                       },
+             '4435' => {
+                         '6' => 9045,
+                         '3' => 9042,
+                         '7' => 9046,
+                         '2' => 9041,
+                         '8' => 9047,
+                         '1' => 9040,
+                         '4' => 9043,
+                         '5' => 9044
+                       },
+             '32792' => {
+                          '4' => 33731,
+                          '1' => 33734,
+                          '3' => 33732,
+                          '0' => 33733,
+                          '2' => 33735,
+                          '5' => 33739
+                        },
+             '32790' => {
+                          '4' => 4416,
+                          '1' => 4368,
+                          '3' => 4400,
+                          '0' => 4352,
+                          '2' => 4384,
+                          '5' => 4432
+                        },
+             '33318' => {
+                          '6' => 30242,
+                          '11' => 30227,
+                          '3' => 29987,
+                          '7' => 29714,
+                          '9' => 29971,
+                          '2' => 29731,
+                          '12' => 30226,
+                          '8' => 29715,
+                          '4' => 29986,
+                          '1' => 29730,
+                          '10' => 29970,
+                          '5' => 30243
+                        },
+             '4372' => {
+                         '6' => 8722,
+                         '3' => 8725,
+                         '7' => 8721,
+                         '2' => 8726,
+                         '8' => 8720,
+                         '1' => 8727,
+                         '4' => 8724,
+                         '5' => 8723
+                       },
+             '4163' => {
+                         '6' => 8501,
+                         '3' => 8498,
+                         '7' => 8502,
+                         '2' => 8497,
+                         '8' => 8503,
+                         '1' => 8496,
+                         '4' => 8499,
+                         '5' => 8500
+                       },
+             '33409' => {
+                          '6' => 30102,
+                          '11' => 30359,
+                          '3' => 30087,
+                          '7' => 30326,
+                          '9' => 30343,
+                          '2' => 30071,
+                          '12' => 30358,
+                          '8' => 30327,
+                          '4' => 30086,
+                          '1' => 30070,
+                          '10' => 30342,
+                          '5' => 30103
+                        },
+             '33347' => {
+                          '6' => 29488,
+                          '11' => 29505,
+                          '3' => 29233,
+                          '7' => 28992,
+                          '9' => 29249,
+                          '12' => 29504,
+                          '2' => 28977,
+                          '8' => 28993,
+                          '1' => 28976,
+                          '4' => 29232,
+                          '10' => 29248,
+                          '5' => 29489
+                        }
            );
 

diff --git a/rpc/addresses_rpc.db b/rpc/addresses_rpc.db
index 96a327815b437e3487d46c76f9f18f10ce5bac66..1a00fee968b24c9a0d2d4bebe656bdcd0761d23a 100644 (file)
--- a/rpc/addresses_rpc.db
+++ b/rpc/addresses_rpc.db
@@ -23,6 +23,6 @@
 0x4850        091        1          7        091
 0x4851        080        1          7        080
 0x4852        078        1          7        078
-0x4853        034        1          7        034
+0x4853        050        1          7        050
 
 

diff --git a/rpc/serials_rpc.db b/rpc/serials_rpc.db
index bca2040cfcc26a300fbb2da50bb1a06a2d0bf420..fad384c47d92d10fe1be9703b82597047a7f6abc 100644 (file)
--- a/rpc/serials_rpc.db
+++ b/rpc/serials_rpc.db
@@ -24,4 +24,6 @@
   091    0x71000001fc2bd528
   080    0x22000001fc5e6028
   078    0x5c000001fc5dd128
-  034    0xd7000001241ee528
+#  034    0xd7000001241ee528
+  050    0xe500000123f24b28
+  

diff --git a/rpc/trb.db b/rpc/trb.db
index 7e7fe902a7fb8e3f8ff44e73bec730e1ebac56e2..caa6eb30bca2c023b9c3adeb1998a200c20a89d1 100644 (file)
--- a/rpc/trb.db
+++ b/rpc/trb.db
@@ -21,7 +21,7 @@ rpc etraxp051
 rpc etraxp091
 rpc etraxp080
 rpc etraxp078
-rpc etraxp034
+rpc etraxp050
 
 rpc_blr etraxp059
 rpc_blr etraxp055

diff --git a/utils/hldlast b/utils/hldlast
index dd5b9e36c6841c5a1b45dd153236e6ba103d874d..5378efd43f918594524e271e513ae503b9dc01a4 100755 (executable)
--- a/utils/hldlast
+++ b/utils/hldlast
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-STORAGE_LIST="lxhadeb02 lxhadeb03 lxhadeb04 lxhadeb05"
+STORAGE_LIST="lxhadeb08 lxhadeb09 lxhadeb10 lxhadeb05"
 
 if [ -z "$1" ] ; then
        num=1