]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
trigger GUI: Include KEL connector for TRB3sc master
authorJan Michel <j.michel@gsi.de>
Fri, 26 Apr 2019 12:14:28 +0000 (14:14 +0200)
committerJan Michel <j.michel@gsi.de>
Fri, 26 Apr 2019 12:14:28 +0000 (14:14 +0200)
web/htdocs/network/trigger.pl

index 800ace4df6789e4d2ae518c1dbf00031abf705b5..e18e69b83ed2f684a3f7f20a8773d70919f007de 100755 (executable)
@@ -146,7 +146,21 @@ sub makeinputbitsslice {
   return $o;  
   }
   
+
+sub makemasterkel {
+  my ($data,$outp) = @_;
+  my $o = "";
   
+  my $val = ($data->{$outp*4}>>22) | ($data->{$outp*4+1} << 10);
+  
+  my $tmp = sprintf("%016b",$val & 0xFFFF);
+     $tmp = convbox($tmp,0);
+  $o .= $tmp."<br>";
+     $tmp = sprintf("%016b",$val>>16 & 0xFFFF);
+     $tmp = convbox($tmp,0);
+  $o .= $tmp;
+
+  }
   
 sub makemasterbits {
   my ($d,$i,$s,$t) = @_;  #data,slot,output,type
@@ -179,8 +193,12 @@ sub gettable {
       my $b = $boards->[0];
       
       if($i==4) {
-        $out .= sprintf("<tr class=\"master\"><td>0x%4x<td colspan=\"2\"><td colspan=\"2\"><td>",$b);
-        if ($data->{$boards->[0]}{0x33} != 0) {
+        $out .= sprintf("<tr class=\"master\"><td>0x%4x",$b);
+        $out .= "<td colspan=\"2\">".makemasterkel($data->{$b},0);
+        $out .= "<td colspan=\"2\">".makemasterkel($data->{$b},1);
+
+        $out .= "<td >";
+        if ($data->{$b}{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 21\">".(($data->{$b}{0x34} & (9 << 9))?'&#x25fc':'&#x25fb')."</font> ";