]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
extent trigger settings GUI to 64 input multiplicity
authorJan Michel <j.michel@gsi.de>
Tue, 11 Aug 2020 17:19:40 +0000 (19:19 +0200)
committerJan Michel <j.michel@gsi.de>
Tue, 11 Aug 2020 17:19:40 +0000 (19:19 +0200)
web/htdocs/network/trigger.pl

index a2fd5628a238498952123dd6a00e604124b39db4..c49b23d573e66f60030603d910955bfd6e194229 100755 (executable)
@@ -22,7 +22,7 @@ use Data::Dumper;
     trb_init_ports() or
       die("can not connect to trbnet-daemon on the $ENV{'DAQOPSERVER'}");
       
-my @regs = (0,1,2,4,5,6,8,9,10,12,13,14,0x31,0x32,0x33,0x34);
+my @regs = (0,1,2,4,5,6,8,9,10,12,13,14,0x31,0x32,0x33,0x34,0x35);
 
 
 my $setups = {
@@ -115,7 +115,9 @@ sub makeinputbits {
   $tmp = convbox($tmp,$multtmp);
   $o .= $tmp."<br>";
 
-  $multtmp = sprintf("%032b",0);
+  $multtmp = $d->{0x35};
+  $multtmp = 0 if (! ($d->{0x34} & (1 << (8+$s))));
+  $multtmp = sprintf("%032b", $multtmp);
   $tmp = sprintf("%032b",$d->{$s*4+1});
   $tmp = convbox($tmp,$multtmp);
   $o .= $tmp;