update xmldb files

diff --git a/xml-db/database/ShutDownMonitoring.xml b/xml-db/database/ShutDownMonitoring.xml
index 1d8d8dbfedab14d760e017f83c50d17e059a1f4e..2ef8c963f5730c3ef5f8e97da9185f333d5b7468 100644 (file)
--- a/xml-db/database/ShutDownMonitoring.xml
+++ b/xml-db/database/ShutDownMonitoring.xml
@@ -61,13 +61,13 @@
     </register>
     <register name="Channel_Disable" address="0300">
       <description>Option to disable single channels</description>
-        <field name="Diabled_Channels" start="0" bits="24" format="bitmask"  >
+        <field name="Channel_Disable" start="0" bits="32" format="bitmask"  >
           <description>Option to disable single channels</description>
         </field>
     </register>    
     <register name="Individual_alerts" address="0500" mode="r">
       <description> Single alert bits </description>
-        <field name="Individual_alerts" start="0" bits="24" format="bitmask"  >
+        <field name="Individual_alerts" start="0" bits="32" format="bitmask"  >
         <description> Single alert bits </description>
       </field>
     </register>

diff --git a/xml-db/database/ShutdownLogic.xml b/xml-db/database/ShutdownLogic.xml
index d35995bbe9bd80223512760f505ca457867a0029..1b48ca61ba086ae12892e17e39d639383d3a6cfe 100644 (file)
--- a/xml-db/database/ShutdownLogic.xml
+++ b/xml-db/database/ShutdownLogic.xml
@@ -64,7 +64,7 @@
     </register>
     <register name="Channel_Disable" address="0300">
       <description>Option to disable single channels</description>
-        <field name="Channel_Disable" start="0" bits="24" format="bitmask"  >
+        <field name="Channel_Disable" start="0" bits="32" format="bitmask"  >
           <description>Option to disable single channels</description>
         </field>
     </register>    

diff --git a/xml-db/database/Spillmonitor.xml b/xml-db/database/Spillmonitor.xml
index 3e63bac9a0bd7d4fe8452f9b1b5a9a002a6bef79..16d45c4dd76982d88c62bd18a0b89708a6bfdb0f 100644 (file)
--- a/xml-db/database/Spillmonitor.xml
+++ b/xml-db/database/Spillmonitor.xml
@@ -7,7 +7,7 @@
   <description>Registers for the HADES Spill Monitor</description>
 
 
-  <group name="SpillMonRegisters" address="0000"  size="5"  purpose="config" mode="r" continuous="true">
+  <group name="SpillMonRegisters" address="0000"  size="8"  purpose="config" mode="r" continuous="true">
     <register name="Timer" address="0000"  mode="rw" >
       <description>Settings form binning and integration time</description>
       <field name="BinWidth" start="0" bits="16" format="unsigned"  noflag="true" rate="false" >
@@ -76,9 +76,9 @@
     
   </group>
     
-  <group name="SpillMonCounts" address="0000"  size="5"  purpose="config" mode="r" continuous="true">
+  <group name="SpillMonCounts" address="0020"  size="16"  purpose="config" mode="r" continuous="true">
     
-    <register name="BinCounts" address="0020"  mode="r" repeat="16">
+    <register name="BinCounts" address="0000"  mode="r" repeat="16">
       <description>Count number on the 16 inputs (last bin)</description>
       <field name="BinCounts" start="0" bits="28" format="unsigned">
       </field>  

diff --git a/xml-db/database/TriggerBox.xml b/xml-db/database/TriggerBox.xml
index 26e0a2691679c54b2c4c0aa285296d7fb520ae1d..9aef62983d5eed35d2bb9d7c2ed1ca324fbe1b7c 100644 (file)
--- a/xml-db/database/TriggerBox.xml
+++ b/xml-db/database/TriggerBox.xml
@@ -213,14 +213,14 @@
       <enumItem value="35">B 1            </enumItem>
       <enumItem value="36">B 2            </enumItem>
       <enumItem value="37">B 3            </enumItem>
-      <enumItem value="38">Start X12            </enumItem>
-      <enumItem value="39">Start X8            </enumItem>
-      <enumItem value="3a">Start X15            </enumItem>
-      <enumItem value="3b">Start X16            </enumItem>
-      <enumItem value="3c">Start X2            </enumItem>
-      <enumItem value="3d">Start X10            </enumItem>
-      <enumItem value="3e">Start X6            </enumItem>
-      <enumItem value="3f">Start X3            </enumItem>
+      <enumItem value="38">Start X1            </enumItem>
+      <enumItem value="39">Start X2           </enumItem>
+      <enumItem value="3a">Start X3            </enumItem>
+      <enumItem value="3b">Start X4            </enumItem>
+      <enumItem value="3c">Start X5           </enumItem>
+      <enumItem value="3d">Start X6            </enumItem>
+      <enumItem value="3e">Start X7           </enumItem>
+      <enumItem value="3f">Start X8           </enumItem>
       <enumItem value="40">RJ-B1                </enumItem>
       <enumItem value="41">RJ-B2                </enumItem>
       <enumItem value="42">RJ-B3                </enumItem>
@@ -229,14 +229,14 @@
       <enumItem value="45">Wall 1                </enumItem>
       <enumItem value="46">Wall 2                </enumItem>
       <enumItem value="47">Wall 3                </enumItem>
-      <enumItem value="48">Start X5            </enumItem>
-      <enumItem value="49">Start X11            </enumItem>
-      <enumItem value="4a">Start X13            </enumItem>
-      <enumItem value="4b">Start X14            </enumItem>
-      <enumItem value="4c">Start X1            </enumItem>
-      <enumItem value="4d">Start X4            </enumItem>
-      <enumItem value="4e">Start X7            </enumItem>  
-      <enumItem value="4f">Start X9           </enumItem> 
+      <enumItem value="48">Start X9            </enumItem>
+      <enumItem value="49">Start X10            </enumItem>
+      <enumItem value="4a">Start X11            </enumItem>
+      <enumItem value="4b">Start X12            </enumItem>
+      <enumItem value="4c">Start X13           </enumItem>
+      <enumItem value="4d">Start X14           </enumItem>
+      <enumItem value="4e">Start X15           </enumItem>  
+      <enumItem value="4f">Start X16          </enumItem> 
       <enumItem value="50">BLR Mult1            </enumItem>  
       <enumItem value="51">BLR Mult2            </enumItem>  
       <enumItem value="52">BLR Mult3            </enumItem>
@@ -740,14 +740,14 @@
       <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 X12            </enumItem>
-      <enumItem value="39">raw Start X8             </enumItem>
-      <enumItem value="3a">raw Start X15            </enumItem>
-      <enumItem value="3b">raw Start X16            </enumItem>
-      <enumItem value="3c">raw Start X2             </enumItem>
-      <enumItem value="3d">raw Start X10            </enumItem>
-      <enumItem value="3e">raw Start X6             </enumItem>
-      <enumItem value="3f">raw Start X3             </enumItem>
+      <enumItem value="38">raw Start X1            </enumItem>
+      <enumItem value="39">raw Start X2            </enumItem>
+      <enumItem value="3a">raw Start X3            </enumItem>
+      <enumItem value="3b">raw Start X4            </enumItem>
+      <enumItem value="3c">raw Start X5            </enumItem>
+      <enumItem value="3d">raw Start X6            </enumItem>
+      <enumItem value="3e">raw Start X7            </enumItem>
+      <enumItem value="3f">raw Start X8            </enumItem>
       <enumItem value="40">raw RJ-B1                </enumItem>
       <enumItem value="41">raw RJ-B2                </enumItem>
       <enumItem value="42">raw RJ-B3                </enumItem>
@@ -756,14 +756,14 @@
       <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 X5             </enumItem>
-      <enumItem value="49">raw Start X11            </enumItem>
-      <enumItem value="4a">raw Start X13            </enumItem>
-      <enumItem value="4b">raw Start X14            </enumItem>
-      <enumItem value="4c">raw Start X1             </enumItem>
-      <enumItem value="4d">raw Start X4             </enumItem>
-      <enumItem value="4e">raw Start X7             </enumItem>  
-      <enumItem value="4f">raw Start X9             </enumItem>  
+      <enumItem value="48">raw Start X9             </enumItem>
+      <enumItem value="49">raw Start X10            </enumItem>
+      <enumItem value="4a">raw Start X11            </enumItem>
+      <enumItem value="4b">raw Start X12            </enumItem>
+      <enumItem value="4c">raw Start X13            </enumItem>
+      <enumItem value="4d">raw Start X14            </enumItem>
+      <enumItem value="4e">raw Start X15            </enumItem>  
+      <enumItem value="4f">raw Start X16            </enumItem>  
       <enumItem value="50">raw BLR Mult1            </enumItem>
       <enumItem value="51">raw BLR Mult2            </enumItem>
       <enumItem value="52">raw BLR Mult3            </enumItem>
@@ -1413,14 +1413,14 @@
       <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 X12          </sliceName>
-      <sliceName value="57">raw Start X8           </sliceName>
-      <sliceName value="58">raw Start X15          </sliceName>
-      <sliceName value="59">raw Start X16          </sliceName>
-      <sliceName value="60">raw Start X2           </sliceName>
-      <sliceName value="61">raw Start X10          </sliceName>
-      <sliceName value="62">raw Start X6           </sliceName>
-      <sliceName value="63">raw Start X3           </sliceName>
+      <sliceName value="56">raw Start X1          </sliceName>
+      <sliceName value="57">raw Start X2          </sliceName>
+      <sliceName value="58">raw Start X3          </sliceName>
+      <sliceName value="59">raw Start X4          </sliceName>
+      <sliceName value="60">raw Start X5          </sliceName>
+      <sliceName value="61">raw Start X6          </sliceName>
+      <sliceName value="62">raw Start X7          </sliceName>
+      <sliceName value="63">raw Start X8          </sliceName>
       <sliceName value="64">raw RJ-B1                </sliceName>
       <sliceName value="65">raw RJ-B2                </sliceName>
       <sliceName value="66">raw RJ-B3                </sliceName>
@@ -1429,14 +1429,14 @@
       <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 X5             </sliceName>
-      <sliceName value="73">raw Start X11            </sliceName>
-      <sliceName value="74">raw Start X13            </sliceName>
-      <sliceName value="75">raw Start X14            </sliceName>
-      <sliceName value="76">raw Start X1             </sliceName>
-      <sliceName value="77">raw Start X4             </sliceName>
-      <sliceName value="78">raw Start X7             </sliceName>
-      <sliceName value="79">raw Start X9             </sliceName>
+      <sliceName value="72">raw Start X9             </sliceName>
+      <sliceName value="73">raw Start X10            </sliceName>
+      <sliceName value="74">raw Start X11            </sliceName>
+      <sliceName value="75">raw Start X12            </sliceName>
+      <sliceName value="76">raw Start X13            </sliceName>
+      <sliceName value="77">raw Start X14            </sliceName>
+      <sliceName value="78">raw Start X15            </sliceName>
+      <sliceName value="79">raw Start X16            </sliceName>
       <sliceName value="80">raw BLR Mult1            </sliceName>
       <sliceName value="81">raw BLR Mult2            </sliceName>
       <sliceName value="82">raw BLR Mult3            </sliceName>