added TDC version to network map

diff --git a/web/htdocs/commands/xmlpage.pm b/web/htdocs/commands/xmlpage.pm
index f6e08ed6d564b3bfdcd7072186d411f5abfb0985..bb09b228960d1cd55f425c66cd1fc67df9a68902 100644 (file)
--- a/web/htdocs/commands/xmlpage.pm
+++ b/web/htdocs/commands/xmlpage.pm
@@ -74,11 +74,11 @@ if(!$setup[$active]->{generic}) {
   }  
   
 print qq|
-<div class="checkbox"><input type="text" id="period" title="Refresh interval in ms. Set to -1 to disable automatic refresh" 
+<div class="checkbox"|.($setup[$active]->{norefresh}?'style="display:none"':"").qq|><input type="text" id="period" title="Refresh interval in ms. Set to -1 to disable automatic refresh" 
        value="$period" onChange="setperiod()" onLoad="setperiod()"></div>
-<div class="checkbox"><input type="checkbox" onChange="settarget()" value="1" id="rate" title="Convert register counter to rates where possible" $israte>
+<div class="checkbox"|.($setup[$active]->{norate}?'style="display:none"':"").qq|><input type="checkbox" onChange="settarget()" value="1" id="rate" title="Convert register counter to rates where possible" $israte>
     <label for="rate">Rates</label></div>
-<div class="checkbox"><input type="checkbox" onChange="settarget()" value="1" id="cache" title="Use caching of data to reduce load on DAQ network" $iscache>
+<div class="checkbox"|.($setup[$active]->{nocache}?'style="display:none"':"").qq|><input type="checkbox" onChange="settarget()" value="1" id="cache" title="Use caching of data to reduce load on DAQ network" $iscache>
     <label for="cache">Use Cache</label></div>
 <div class="checkbox"><input type="button" class="stdbutton" onClick="refresh(-1);" value="Refresh"></div>
 </div>

diff --git a/web/htdocs/network/map.pl b/web/htdocs/network/map.pl
index 6ddfee049954bb44da0cf57be132992e4c1e96c1..4f2ce8f9f979998fd76a0e7a4c288d41411763b1 100755 (executable)
--- a/web/htdocs/network/map.pl
+++ b/web/htdocs/network/map.pl
@@ -131,6 +131,7 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) {
           $feat .="\nTDC:";
           my $d = trb_register_read($addr,0xc100);
           $feat .= " ".($d->{$addr}>>8&0xFF)." channels";
+          $feat .= ", version ".(($d->{$addr}&0x0e000000)>>25).".".(($d->{$addr}&0x1e00000)>>21).".".(($d->{$addr}&0x1e0000)>>17);
           for($inclLow->{$addr}&0xFF) {
             when (0) {$feat .=", input select by mux";}
             when (1) {$feat .=", input 1-to-1";}
@@ -204,6 +205,8 @@ else {
   $setup[0]->{cmd}     = "getmap";
   $setup[0]->{period}  = -1;
   $setup[0]->{noaddress} = 1;
+  $setup[0]->{norate}    = 1;
+  $setup[0]->{nocache}   = 1;
   $setup[0]->{generic}   = 0;
 
   xmlpage::initPage(\@setup,$page);