New trigger logic register

diff --git a/xml-db/database/InputMonitorTrb3sc.xml b/xml-db/database/InputMonitorTrb3sc.xml
index b773793a1476b23926b9369bfb15ceb1da1a92e8..ef2d587607c78564b9d1d0cd4bc261082e94722a 100644 (file)
--- a/xml-db/database/InputMonitorTrb3sc.xml
+++ b/xml-db/database/InputMonitorTrb3sc.xml
@@ -164,21 +164,27 @@ output #slice</description>
       </field>
     </register>
     <register name="Multiplicity" address="0032" mode="r" >
-      <description>Coincidence interval is fixed to 4 clock cycles</description>
-      <field  name="MultLimit" start="16" bits="8" format="unsigned" noflag="true" mode="rw">
+      <description>Coincidence interval is fixed to 4 clock cycles or configurable in TriggerStretchSet</description>
+      <field  name="MultLimit0" start="16" bits="8" format="unsigned" noflag="true" mode="rw">
          <description>Number of inputs firing at the same time required to cause a trigger</description>
       </field>
-      <field  name="MultActual" start="0" bits="8" format="unsigned" noflag="true">
+      <field  name="MultLimit1" start="8" bits="8" format="unsigned" noflag="true" mode="rw">
+         <description>Number of inputs firing at the same time required to cause a trigger</description>
+      </field>
+      <field  name="MultLimit2" start="24" bits="8" format="unsigned" noflag="true" mode="rw">
+         <description>Number of inputs firing at the same time required to cause a trigger</description>
+      </field>
+      <field  name="MultActual0" start="0" bits="8" format="unsigned" noflag="true">
          <description>Current number of active inputs.</description>
       </field>
     </register>    
-    <register name="MultiplicityEnable" address="0033" mode="rw" >
+    <register name="MultiplicityEnable0_0" address="0033" mode="rw" >
       <description>Select inputs 31-0 for multiplicity logic</description>
-      <field  name="MultiplicityEnable" start="0"   bits="32" format="bitmask" noflag="true"/>
+      <field  name="MultiplicityEnable0_0" start="0"   bits="32" format="bitmask" noflag="true"/>
     </register> 
-    <register name="MultiplicityEnable2" address="0035" mode="rw" >
+    <register name="MultiplicityEnable0_1" address="0035" mode="rw" >
       <description>Select inputs 63-32 for multiplicity logic</description>
-      <field  name="MultiplicityEnable2" start="0"   bits="32" format="bitmask" noflag="true"/>
+      <field  name="MultiplicityEnable0_1" start="0"   bits="32" format="bitmask" noflag="true"/>
     </register> 
     <register name="TriggerStretchSet" address="0036" mode="rw" >
       <description>If available, adds this amount of length to each input signal. Used for coincidence and multiplicity</description>
@@ -196,7 +202,7 @@ output #slice</description>
       <field  name="CoinOutput" start="16" bits="8" format="bitmask" noflag="true" mode="rw">
          <description>Outputs to add the coincidence signal to</description>
       </field>
-      <field  name="MultOutput" start="8" bits="8" format="bitmask" noflag="true" mode="rw">
+      <field  name="MultOutput0" start="8" bits="8" format="bitmask" noflag="true" mode="rw">
          <description>Outputs to add the multiplicity signal to</description>
       </field>
       <field  name="SimpleCoinOutput" start="0" bits="8" format="bitmask" noflag="true" mode="rw">
@@ -206,6 +212,32 @@ output #slice</description>
          <description>Use edge detect for all inputs associated with this output</description>
       </field>
       </register>          
+    <register name="OutputSelect2" address="0037" mode="r" >
+      <description>Select the outputs for special signals (coincidence and multiplicity)</description>
+      <field  name="MultOutput2" start="8" bits="8" format="bitmask" noflag="true" mode="rw">
+         <description>Outputs to add the multiplicity signal to</description>
+      </field>
+      <field  name="MultOutput1" start="0" bits="8" format="bitmask" noflag="true" mode="rw">
+         <description>Outputs to add the multiplicity signal to</description>
+      </field>
+    </register>  
+
+    <register name="MultiplicityEnable1_0" address="0038" mode="rw" >
+      <description>Select inputs 31-0 for multiplicity logic</description>
+      <field  name="MultiplicityEnable1_0" start="0"   bits="32" format="bitmask" noflag="true"/>
+    </register> 
+    <register name="MultiplicityEnable1_1" address="0039" mode="rw" >
+      <description>Select inputs 63-32 for multiplicity logic</description>
+      <field  name="MultiplicityEnable1_1" start="0"   bits="32" format="bitmask" noflag="true"/>
+    </register>     
+    <register name="MultiplicityEnable2_0" address="003a" mode="rw" >
+      <description>Select inputs 31-0 for multiplicity logic</description>
+      <field  name="MultiplicityEnable2_0" start="0"   bits="32" format="bitmask" noflag="true"/>
+    </register> 
+    <register name="MultiplicityEnable2_1" address="003b" mode="rw" >
+      <description>Select inputs 63-32 for multiplicity logic</description>
+      <field  name="MultiplicityEnable2_1" start="0"   bits="32" format="bitmask" noflag="true"/>
+    </register>     
    </group>  
   
 </TrbNetEntity>