update xml pages

diff --git a/web/htdocs/network/hub.pl b/web/htdocs/network/hub.pl
index 88f04a753d9c22ffdabf4e77796c3bad48731ff3..2f1f18adff9528212382a57ffe6b3dd0bc46cb9c 100755 (executable)
--- a/web/htdocs/network/hub.pl
+++ b/web/htdocs/network/hub.pl
@@ -39,6 +39,11 @@ $setup[2]->{cmd}     = "Hub-0xfffe-Control";
 $setup[2]->{period}  = -1;
 $setup[2]->{address} = 1;
 
+$setup[3]->{name}    = "Accel";
+$setup[3]->{cmd}     = "Hub-0xff7f-Accel";
+$setup[3]->{period}  = -1;
+$setup[3]->{address} = 1;
+
 xmlpage::initPage(\@setup,$page);
  
 

diff --git a/xml-db/database/TriggerBox.xml b/xml-db/database/TriggerBox.xml
index 8d61e2549a24e3265410d906f87c64c6cfcc53aa..ba0e01c4f8d2dba7d40e8a61d4535bc06b732539 100644 (file)
--- a/xml-db/database/TriggerBox.xml
+++ b/xml-db/database/TriggerBox.xml
@@ -77,6 +77,10 @@
       <sliceName value="25">Secondary 1          </sliceName>
       <sliceName value="26">Secondary 2          </sliceName>
       <sliceName value="27">Secondary 3          </sliceName>      
+      <sliceName value="28">J 0          </sliceName>      
+      <sliceName value="29">J 1          </sliceName>      
+      <sliceName value="30">J 2          </sliceName>      
+      <sliceName value="31">J 3          </sliceName>      
       <sliceName value="32">TOF S0               </sliceName>
       <sliceName value="33">TOF S1               </sliceName>
       <sliceName value="34">TOF S2               </sliceName>
@@ -200,38 +204,38 @@
       <enumItem value="2b">RPC S3               </enumItem>
       <enumItem value="2d">RPC S4               </enumItem>
       <enumItem value="2e">RPC S5               </enumItem>        
-      <enumItem value="30">fRPC1                </enumItem>
-      <enumItem value="31">fRPC2                </enumItem>
+      <enumItem value="30">RJ-A1                </enumItem>
+      <enumItem value="31">RJ-A2                </enumItem>
       <enumItem value="32">RJ-A3                </enumItem>
       <enumItem value="33">RJ-A4                </enumItem>
-      <enumItem value="34">STS1-0            </enumItem>
-      <enumItem value="35">STS1-1            </enumItem>
-      <enumItem value="36">STS1-2            </enumItem>
-      <enumItem value="37">STS1-3            </enumItem>
+      <enumItem value="34">B 0            </enumItem>
+      <enumItem value="35">B 1            </enumItem>
+      <enumItem value="36">B 2            </enumItem>
+      <enumItem value="37">B 3            </enumItem>
       <enumItem value="38">Start 0-0            </enumItem>
       <enumItem value="39">Start 0-1            </enumItem>
       <enumItem value="3a">Start 0-2            </enumItem>
-      <enumItem value="3b">Start 0              </enumItem>
+      <enumItem value="3b">Start 0-3            </enumItem>
       <enumItem value="3c">Start 1-0            </enumItem>
       <enumItem value="3d">Start 1-1            </enumItem>
       <enumItem value="3e">Start 1-2            </enumItem>
-      <enumItem value="3f">Start 1              </enumItem>
+      <enumItem value="3f">Start 1-3            </enumItem>
       <enumItem value="40">RJ-B1                </enumItem>
       <enumItem value="41">RJ-B2                </enumItem>
       <enumItem value="42">RJ-B3                </enumItem>
       <enumItem value="43">RJ-B4                </enumItem>
-      <enumItem value="44">H 0                </enumItem>
-      <enumItem value="45">H 1                </enumItem>
-      <enumItem value="46">H 2                </enumItem>
-      <enumItem value="47">H 3                </enumItem>
+      <enumItem value="44">Wall 0                </enumItem>
+      <enumItem value="45">Wall 1                </enumItem>
+      <enumItem value="46">Wall 2                </enumItem>
+      <enumItem value="47">Wall 3                </enumItem>
       <enumItem value="48">Start 2-0            </enumItem>
       <enumItem value="49">Start 2-1            </enumItem>
       <enumItem value="4a">Start 2-2            </enumItem>
-      <enumItem value="4b">Start 2              </enumItem>
+      <enumItem value="4b">Start 2-3            </enumItem>
       <enumItem value="4c">Start 3-0            </enumItem>
       <enumItem value="4d">Start 3-1            </enumItem>
       <enumItem value="4e">Start 3-2            </enumItem>  
-      <enumItem value="4f">Start 3              </enumItem>  
+      <enumItem value="4f">Start 3-3            </enumItem>  
       <enumItem value="50">BLR Mult1            </enumItem>  
       <enumItem value="51">BLR Mult2            </enumItem>  
       <enumItem value="52">BLR Mult3            </enumItem>
@@ -293,16 +297,16 @@
         <field name="g_P35" start="3 " bits="1" format="bitmask"  ><description>TOF S3                       </description></field>
         <field name="g_P36" start="4 " bits="1" format="bitmask"  ><description>TOF S4                       </description></field>
         <field name="g_P37" start="5 " bits="1" format="bitmask"  ><description>TOF S5                       </description></field>
-        <field name="g_P38" start="6 " bits="1" format="bitmask"  ><description>Input 38                       </description></field>
-        <field name="g_P39" start="7 " bits="1" format="bitmask"  ><description>Input 39                       </description></field>
+        <field name="g_P38" start="6 " bits="1" format="bitmask"  ><description>---                       </description></field>
+        <field name="g_P39" start="7 " bits="1" format="bitmask"  ><description>---                       </description></field>
         <field name="g_P40" start="8 " bits="1" format="bitmask"  ><description>RPC S0                       </description></field>
         <field name="g_P41" start="9 " bits="1" format="bitmask"  ><description>RPC S1                       </description></field>
         <field name="g_P42" start="10" bits="1" format="bitmask"  ><description>RPC S2                       </description></field>
         <field name="g_P43" start="11" bits="1" format="bitmask"  ><description>RPC S3                       </description></field>
-        <field name="g_P44" start="12" bits="1" format="bitmask"  ><description>Input 44                       </description></field>
+        <field name="g_P44" start="12" bits="1" format="bitmask"  ><description>---                       </description></field>
         <field name="g_P45" start="13" bits="1" format="bitmask"  ><description>RPC S4                       </description></field>
         <field name="g_P46" start="14" bits="1" format="bitmask"  ><description>RPC S5                       </description></field>
-        <field name="g_P47" start="15" bits="1" format="bitmask"  ><description>Input 47                       </description></field>
+        <field name="g_P47" start="15" bits="1" format="bitmask"  ><description>---                       </description></field>
         <field name="g_V0"  start="16" bits="1" format="bitmask"  ><description>Virtual 0                      </description></field>
         <field name="g_V1"  start="17" bits="1" format="bitmask"  ><description>Virtual 1                      </description></field>
         <field name="g_V2"  start="18" bits="1" format="bitmask"  ><description>Virtual 2                      </description></field>
@@ -727,38 +731,38 @@
       <enumItem value="2b">raw RPC S3               </enumItem>
       <enumItem value="2d">raw RPC S4               </enumItem>
       <enumItem value="2e">raw RPC S5               </enumItem>        
-      <enumItem value="30">raw fRPC1                </enumItem>
-      <enumItem value="31">raw fRPC2                </enumItem>
+      <enumItem value="30">raw RJ-A1                </enumItem>
+      <enumItem value="31">raw RJ-A2                </enumItem>
       <enumItem value="32">raw RJ-A3                </enumItem>
       <enumItem value="33">raw RJ-A4                </enumItem>
-      <enumItem value="34">raw STS1-0            </enumItem>
-      <enumItem value="35">raw STS1-1            </enumItem>
-      <enumItem value="36">raw STS1-2            </enumItem>
-      <enumItem value="37">raw STS1-3            </enumItem>
+      <enumItem value="34">raw B 0            </enumItem>
+      <enumItem value="35">raw B 1            </enumItem>
+      <enumItem value="36">raw B 2            </enumItem>
+      <enumItem value="37">raw B 3            </enumItem>
       <enumItem value="38">raw Start 0-0            </enumItem>
       <enumItem value="39">raw Start 0-1            </enumItem>
       <enumItem value="3a">raw Start 0-2            </enumItem>
-      <enumItem value="3b">raw Start 0              </enumItem>
+      <enumItem value="3b">raw Start 0-3            </enumItem>
       <enumItem value="3c">raw Start 1-0            </enumItem>
       <enumItem value="3d">raw Start 1-1            </enumItem>
       <enumItem value="3e">raw Start 1-2            </enumItem>
-      <enumItem value="3f">raw Start 1              </enumItem>
+      <enumItem value="3f">raw Start 1-3            </enumItem>
       <enumItem value="40">raw RJ-B1                </enumItem>
       <enumItem value="41">raw RJ-B2                </enumItem>
       <enumItem value="42">raw RJ-B3                </enumItem>
       <enumItem value="43">raw RJ-B4                </enumItem>
-      <enumItem value="44">raw H 0                </enumItem>
-      <enumItem value="45">raw H 1                </enumItem>
-      <enumItem value="46">raw H 2                </enumItem>
-      <enumItem value="47">raw H 3                </enumItem>
+      <enumItem value="44">raw Wall 0                </enumItem>
+      <enumItem value="45">raw Wall 1                </enumItem>
+      <enumItem value="46">raw Wall 2                </enumItem>
+      <enumItem value="47">raw Wall 3                </enumItem>
       <enumItem value="48">raw Start 2-0            </enumItem>
       <enumItem value="49">raw Start 2-1            </enumItem>
       <enumItem value="4a">raw Start 2-2            </enumItem>
-      <enumItem value="4b">raw Start 2              </enumItem>
+      <enumItem value="4b">raw Start 2-3            </enumItem>
       <enumItem value="4c">raw Start 3-0            </enumItem>
       <enumItem value="4d">raw Start 3-1            </enumItem>
       <enumItem value="4e">raw Start 3-2            </enumItem>  
-      <enumItem value="4f">raw Start 3              </enumItem>  
+      <enumItem value="4f">raw Start 3-3            </enumItem>  
       <enumItem value="50">raw BLR Mult1            </enumItem>
       <enumItem value="51">raw BLR Mult2            </enumItem>
       <enumItem value="52">raw BLR Mult3            </enumItem>
@@ -1069,10 +1073,10 @@
         <field name="a_P25"  start="25" bits="1" format="bitmask"  ><description>Secondary 1                       </description></field>
         <field name="a_P26"  start="26" bits="1" format="bitmask"  ><description>Secondary 2                       </description></field>
         <field name="a_P27"  start="27" bits="1" format="bitmask"  ><description>Secondary 3                       </description></field>
-        <field name="a_P28"  start="28" bits="1" format="bitmask"  ><description> 28                               </description></field>
-        <field name="a_P29"  start="29" bits="1" format="bitmask"  ><description> 29                               </description></field>
-        <field name="a_P30"  start="30" bits="1" format="bitmask"  ><description> 30                               </description></field>
-        <field name="a_P31"  start="31" bits="1" format="bitmask"  ><description> 31                               </description></field>
+        <field name="a_P28"  start="28" bits="1" format="bitmask"  ><description>J 0                               </description></field>
+        <field name="a_P29"  start="29" bits="1" format="bitmask"  ><description>J 1                               </description></field>
+        <field name="a_P30"  start="30" bits="1" format="bitmask"  ><description>J 2                               </description></field>
+        <field name="a_P31"  start="31" bits="1" format="bitmask"  ><description>J 3                               </description></field>
         </register>
       </group>
       <group name="Output0B_group" address="0300" size="8" repeat="8" stepsize="8" continuous="false" >
@@ -1205,7 +1209,7 @@
         <field name="a_V18"  start="2" bits="1" format="bitmask"   ><description>Virtual 18                        </description></field>
         <field name="a_V19"  start="3" bits="1" format="bitmask"   ><description>Virtual 19                        </description></field>
         <field name="a_V20"  start="4" bits="1" format="bitmask"   ><description>Virtual 20                        </description></field>
-        <field name="a_V21"  start="5" bits="1" format="bitmask"  ><description>PVirtual 21                       </description></field>
+        <field name="a_V21"  start="5" bits="1" format="bitmask"   ><description>Virtual 21                       </description></field>
         <field name="a_V22"  start="6" bits="1" format="bitmask"  > <description>Virtual 22                        </description></field>
         <field name="a_V23"  start="7" bits="1" format="bitmask"  > <description>Virtual 23                        </description></field>
         <field name="a_V24"  start="8" bits="1" format="bitmask"  > <description>Virtual 24                        </description></field>
@@ -1400,38 +1404,38 @@
       <sliceName value="45">raw RPC S4               </sliceName>
       <sliceName value="46">raw RPC S5               </sliceName>        
       <sliceName value="47">---               </sliceName>
-      <sliceName value="48">raw fRPC1                </sliceName>
-      <sliceName value="49">raw fRPC2                </sliceName>
+      <sliceName value="48">raw RJ-A1                </sliceName>
+      <sliceName value="49">raw RJ-A2                </sliceName>
       <sliceName value="50">raw RJ-A3                </sliceName>
       <sliceName value="51">raw RJ-A4                </sliceName>
-      <sliceName value="52">raw STS1-0            </sliceName>
-      <sliceName value="53">raw STS1-1            </sliceName>
-      <sliceName value="54">raw STS1-2            </sliceName>
-      <sliceName value="55">raw STS1-3            </sliceName>
+      <sliceName value="52">raw B 0            </sliceName>
+      <sliceName value="53">raw B 1            </sliceName>
+      <sliceName value="54">raw B 2            </sliceName>
+      <sliceName value="55">raw B 3            </sliceName>
       <sliceName value="56">raw Start 0-0           </sliceName>
       <sliceName value="57">raw Start 0-1           </sliceName>
       <sliceName value="58">raw Start 0-2           </sliceName>
-      <sliceName value="59">raw Start 0             </sliceName>
+      <sliceName value="59">raw Start 0-3           </sliceName>
       <sliceName value="60">raw Start 1-0           </sliceName>
       <sliceName value="61">raw Start 1-1           </sliceName>
       <sliceName value="62">raw Start 1-2           </sliceName>
-      <sliceName value="63">raw Start 1              </sliceName>
+      <sliceName value="63">raw Start 1-3           </sliceName>
       <sliceName value="64">raw RJ-B1                </sliceName>
       <sliceName value="65">raw RJ-B2                </sliceName>
       <sliceName value="66">raw RJ-B3                </sliceName>
       <sliceName value="67">raw RJ-B4                </sliceName>
-      <sliceName value="68">raw H 0                </sliceName>
-      <sliceName value="69">raw H 1                </sliceName>
-      <sliceName value="70">raw H 2                </sliceName>
-      <sliceName value="71">raw H 3                </sliceName>
+      <sliceName value="68">raw Wall 0                </sliceName>
+      <sliceName value="69">raw Wall 1                </sliceName>
+      <sliceName value="70">raw Wall 2                </sliceName>
+      <sliceName value="71">raw Wall 3                </sliceName>
       <sliceName value="72">raw Start 2-0            </sliceName>
       <sliceName value="73">raw Start 2-1            </sliceName>
       <sliceName value="74">raw Start 2-2            </sliceName>
-      <sliceName value="75">raw Start 2              </sliceName>
+      <sliceName value="75">raw Start 2-3            </sliceName>
       <sliceName value="76">raw Start 3-0            </sliceName>
       <sliceName value="77">raw Start 3-1            </sliceName>
       <sliceName value="78">raw Start 3-2            </sliceName>
-      <sliceName value="79">raw Start 3              </sliceName>
+      <sliceName value="79">raw Start 3-3            </sliceName>
       <sliceName value="80">raw BLR Mult1            </sliceName>
       <sliceName value="81">raw BLR Mult2            </sliceName>
       <sliceName value="82">raw BLR Mult3            </sliceName>