changed registers for trigger logic

diff --git a/users/frankfurt_test/startup.sh b/users/frankfurt_test/startup.sh
index bcd582eb63f63586654d1b6df2e637b56d800d00..601bf61995155e8ceb97c58916fa5fe62208113d 100755 (executable)
--- a/users/frankfurt_test/startup.sh
+++ b/users/frankfurt_test/startup.sh
@@ -18,10 +18,10 @@ trbcmd s  0xef000003133e3228  0x03 0xf103
 
 #90
 trbcmd s  0x2f0000046f397d28  0x05 0x8000
-trbcmd s  0x810000046f398928  0x01 0xf901
-trbcmd s  0xa50000046f398628  0x00 0xf900
-trbcmd s  0x220000046f399228  0x02 0xf902
-trbcmd s  0x290000046f075428  0x03 0xf903
+trbcmd s  0x810000046f398928  0x01 0x5001
+trbcmd s  0xa50000046f398628  0x00 0x5000
+trbcmd s  0x220000046f399228  0x02 0x5002
+trbcmd s  0x290000046f075428  0x03 0x5003
 
 
 echo "Hubs"

diff --git a/xml-db/database/InputMonitor.xml b/xml-db/database/InputMonitor.xml
index 5ee7a8432fcb5737d73774a5d363df0216ce32ba..90a41c959080c0da7789f816e8066776440c0086 100644 (file)
--- a/xml-db/database/InputMonitor.xml
+++ b/xml-db/database/InputMonitor.xml
@@ -73,7 +73,7 @@
     </register>    
   </group>
 
-  <group name="Trigger" purpose="config" address="0000" size="34" mode="rw" continuous="false">
+  <group name="Trigger" purpose="config" address="0000" size="37" mode="rw" continuous="false">
     <description>Registers of the trigger generation logic</description>  
     <group name="TriggerGeneration" purpose="config" address="0000" size="2" repeat="16" continuous="true">
       <register name="TriggerEnable" address="0000"  mode="rw" >
@@ -81,9 +81,9 @@
          <field  name="TriggerEnable" start="0" bits="32" format="bitmask" noflag="true">
          </field>
       </register>
-      <register name="TriggerInvert" address="0001" mode="rw" >
-         <description>Inverts individual inputs for trigger generation</description>
-         <field  name="TriggerInvert" start="0" bits="32" format="bitmask" noflag="true">
+      <register name="TriggerInvertOld" address="0001" mode="rw" >
+         <description>Inverts individual inputs for trigger generation. DOES NOT EXIST IN NEW DESIGNS</description>
+         <field  name="TriggerInvertOld" start="0" bits="32" format="bitmask" noflag="true">
          </field>
       </register>
     </group>
@@ -95,8 +95,15 @@
       <description>Current status of all inputs</description>
       <field  name="TriggerOutput" start="0"   bits="32" format="bitmask" />
     </register>         
-    
-  </group>  
+    <register name="TriggerStretch" address="0022" mode="rw" >
+      <description>Enable stretching of individual input channels by adding 10 to 20 ns to the signal length</description>
+      <field  name="TriggerStretch" start="0"   bits="32" format="bitmask" />
+    </register>             
+    <register name="TriggerInvert" address="0024" mode="rw" >
+      <description>Inverts individual inputs for trigger generation.</description>
+      <field  name="TriggerInvert" start="0"   bits="32" format="bitmask" />
+    </register>     
+   </group>  
   
 </TrbNetEntity>