update registers & GUI for TRB3 trigger generation settings

diff --git a/web/htdocs/network/trigger.pl b/web/htdocs/network/trigger.pl
index 994620dbfe16b62f8e5c93087e371404b53ef929..a2fd5628a238498952123dd6a00e604124b39db4 100755 (executable)
--- a/web/htdocs/network/trigger.pl
+++ b/web/htdocs/network/trigger.pl
@@ -175,6 +175,7 @@ sub makemasterbits {
     $o .= "<font style=\"color:red\" title=\"for output 1\">".(($d->{0} & (1<<($i*4+$s)))?'&#x278a':'&#x25fb')."</font> ";
     $o .= "<font style=\"color:blue\" title=\"for output 2\">".(($d->{4} & (1<<($i*4+$s)))?'&#x278b':'&#x25fb')."</font><br>";
     $o .= "<font style=\"color:orange\" title=\"for output 3\">".(($d->{8} & (1<<($i*4+$s)))?'&#x278c':'&#x25fb')."</font> ";
+    $o .= "<font style=\"color:purple\" title=\"for output 4\">".(($d->{12} & (1<<($i*4+$s)))?'&#x278d':'&#x25fb')."</font> ";
     $o .= "<font style=\"color:#0a0\" title=\"for mult\">".(($d->{0x33} & (1<<($i*4+$s)))?'&#x25fc':'&#x25fb')."</font><br>";
   }
   return $o;
@@ -278,15 +279,19 @@ sub gettable {
     $out .= sprintf("<tr class=\"master\"><td>0x%4x<td colspan=\"2\"><td colspan=\"2\"><td colspan=\"2\"><td colspan=\"2\"><td>",$b);
     if ($data->{$boards->[0]}{0x33} != 0) {
       $out .= "mult >=".(($data->{$boards->[0]}{0x32} >> 16)&0xFF)." ";
-      $out .= "<font style=\"color:red\" title=\"for output 1\">".(($data->{$b}{0x34} & (1 << 8))?'&#x25fc':'&#x25fb')."</font> ";
-      $out .= "<font style=\"color:blue\" title=\"for output 2\">".(($data->{$b}{0x34} & (9 << 9))?'&#x25fc':'&#x25fb')."</font> ";
-#           $out .= sprintf("on outputs %04b",($data->{$b}{0x34} >> 8));
+      $out .= "<font style=\"color:red\" title=\"for output 1\">".(($data->{$b}{0x34} & (1 << 8))?'&#x278a':'&#x25fb')."</font> ";
+      $out .= "<font style=\"color:blue\" title=\"for output 2\">".(($data->{$b}{0x34} & (1 << 9))?'&#x278b':'&#x25fb')."</font> ";
+      $out .= "<font style=\"color:orange\" title=\"for output 3\">".(($data->{$b}{0x34} & (1 << 10))?'&#x278c':'&#x25fb')."</font> ";
+      $out .= "<font style=\"color:purple\" title=\"for output 4\">".(($data->{$b}{0x34} & (1 << 11))?'&#x278d':'&#x25fb')."</font> ";
+      #           $out .= sprintf("on outputs %04b",($data->{$b}{0x34} >> 8));
       }
      
     $out .= "</table>";  
-    $out .= qq#<table><tr><th>Red<td>selected in 'or' for output 1 on central FPGA (TRG3)
-                   <tr><th>Blue<td>selected in 'or' for output 2 on central FPGA (CLK3)
-                   <tr><th>Orange<td>selected in 'or' for output 3 central FPGA (CLK4)
+    $out .= qq#<table>
+                   <tr><th>Red<td>selected in 'or' for output 1 on central FPGA (TRG3)
+                   <tr><th>Blue<td>selected in 'or' for output 2 on central FPGA (TRG4)
+                   <tr><th>Orange<td>selected in 'or' for output 3 on central FPGA (CLK3)
+                   <tr><th>Purple<td>selected in 'or' for output 4 central FPGA (CLK4)
                    <tr><th>Green<td>selected for multiplicity logic
                    <tr><th>Black<td>Enabled in 'or'
                    <tr><th>Generic<td>The generic tab only works for TRB3 central and TRB3sc crate master FPGA!
@@ -361,7 +366,13 @@ else {
     $page->{getscript} = "trigger.pl";
     
     my @setup;
-    
+
+push(@setup,({name      => "Generic", 
+              cmd       => "getmap-0x8000",
+              period    => -1,
+              address   => 1,
+              norate    => 1,
+              nocache   => 1,}));       
 push(@setup,({name      => "EC0", 
               cmd       => "getmap-0x8a00",
               period    => -1,
@@ -404,12 +415,7 @@ push(@setup,({name      => "Start",
               noaddress => 1,
               norate    => 1,
               nocache   => 1,}));       
-push(@setup,({name      => "Generic", 
-              cmd       => "getmap-0x8000",
-              period    => -1,
-              address   => 1,
-              norate    => 1,
-              nocache   => 1,}));   
+
     xmlpage::initPage(\@setup,$page);
     }
 

diff --git a/xml-db/database/InputMonitorTrb3sc.xml b/xml-db/database/InputMonitorTrb3sc.xml
index d1ad12bff63b274158f8e269bbc46eb80ca9ceec..b773793a1476b23926b9369bfb15ceb1da1a92e8 100644 (file)
--- a/xml-db/database/InputMonitorTrb3sc.xml
+++ b/xml-db/database/InputMonitorTrb3sc.xml
@@ -180,7 +180,10 @@ output #slice</description>
       <description>Select inputs 63-32 for multiplicity logic</description>
       <field  name="MultiplicityEnable2" 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>
+      <field  name="TriggerStretchSet" start="0"   bits="6" format="unsigned" unit="ns" scale="10" noflag="true"/>
+    </register>     
     <register name="Coincidence" address="0040" mode="rw" repeat="16">
       <description>Coincidence Logic</description>
       <field  name="Enable" start="31"   bits="1" format="bitmask" />