*** empty log message ***

diff --git a/cts/cts b/cts/cts
index 726dc725e3731aeb35da060c0ee2eebe699de1ff..a20cce88d3282df79d564c789d01015c60308767 100755 (executable)
--- a/cts/cts
+++ b/cts/cts
@@ -54,11 +54,11 @@ Commands:
    write VALUES     sepearated list in the following format: {key}={value}
                     Example: cts.pl w reg0=0x12, trg_coin_config0.window=10
                      
-   m [file] |       Rate Monitor. Periodically fetch counters and calculate 
-   monitor [file]   rates. Results are send to STDOUT in an human readable form.
-                    If [file] is provided the data is additionally dumped into
-                    [file].js in the JSON format. Further a trigger rate plot
-                    is stored in [file].jpg
+   m [dir] |        Rate Monitor. Periodically fetch counters and calculate 
+   monitor [dir]    rates. Results are send to STDOUT in an human readable form.
+                    If [dir] is provided the data is additionally dumped into
+                    in the JSON format. Further a trigger rate plot
+                    is stored in [file].svg
 
 END_MSG
 }

diff --git a/cts/htdocs/cts.pl b/cts/htdocs/cts.pl
index faeea875abd798492bf76017b5b7cbf6e8a4ed05..7a543e3b504c67b5fe70f3f4e420a880e82bb5a0 100755 (executable)
--- a/cts/htdocs/cts.pl
+++ b/cts/htdocs/cts.pl
@@ -66,7 +66,7 @@ if ($query eq "init") {
 
    $cts->getTrb->stopCachedWrites();
    
-   print "1";
+   print "1;";
 }
    
 1;

diff --git a/cts/htdocs/index.html b/cts/htdocs/index.html
index ba974577afb606ed8f800e0c74499b76fb9f8e13..34a8fba209ddc5b19c6d654207e33d399410e1e3 100644 (file)
--- a/cts/htdocs/index.html
+++ b/cts/htdocs/index.html
@@ -33,19 +33,19 @@
                   <tr class="alt">
                      <td class="label">Trigger asserted</td>
                      <td class="value autorate autoratevalue" slice="cts_cnt_trg_asserted.value" suffix=" clks.">n/a</td>
-                     <td class="rate  autorate"               slice="cts_cnt_trg_asserted.value" suffix=" s<sup>-1</sup>">n/a</td>
+                     <td class="rate  autorate"               slice="cts_cnt_trg_asserted.value">n/a</td>
                   <tr>
 
                   <tr>
                      <td class="label">Trigger rising edges</td>
                      <td class="value autorate autoratevalue" slice="cts_cnt_trg_edges.value" suffix=" edges">n/a</td>
-                     <td class="rate  autorate"               slice="cts_cnt_trg_edges.value" suffix=" Hz">n/a</td>
+                     <td class="rate  autorate"               slice="cts_cnt_trg_edges.value">n/a</td>
                   <tr>
                   
                   <tr class="alt">
                      <td class="label">Trigger accepted</td>
                      <td class="value autorate autoratevalue" slice="cts_cnt_trg_accepted.value" suffix=" events">n/a</td>
-                     <td class="rate  autorate"               slice="cts_cnt_trg_accepted.value" suffix=" Hz">n/a</td>
+                     <td class="rate  autorate"               slice="cts_cnt_trg_accepted.value">n/a</td>
                   <tr>
                   
                   <tr>

diff --git a/cts/htdocs/scripts/base.js b/cts/htdocs/scripts/base.js
index 542a8998af1449c42c9ff4215cd00c77089a6aac..345449be5225d730cc3f84cc1c92b5885f8cd7f9 100644 (file)
--- a/cts/htdocs/scripts/base.js
+++ b/cts/htdocs/scripts/base.js
@@ -306,7 +306,7 @@ var CTS = new Class({
                   e.set('value', parseCallback(e, 'format')(value, undefined, e));
             }
          }
-         
+
          tmp[s.exp] = value;
          e.valueOnEnter = e.get('value');
          
@@ -451,7 +451,7 @@ var CTS = new Class({
          
          edgeType.format = edgeType.interpret = function(x, y, t) {
             if (!t) t = y;
-            x = x ? 1 : 0;
+            x = parseInt(x) ? 1 : 0;
             var tds = t.getParent().getParent().getElements('td.rate');
             tds[x].addClass('active');
             tds[(x+1)%2].removeClass('active');

diff --git a/cts/include/TrbNet.pm b/cts/include/TrbNet.pm
index eb99be04024cee14738c2e3d23770e9143ceea9c..c136bbdb0e6bb5e6d04806179250c2122d8a99b1 100644 (file)
--- a/cts/include/TrbNet.pm
+++ b/cts/include/TrbNet.pm
@@ -180,7 +180,7 @@ sub write {
    my $data = $_[2];
    
    if (not ref $data) {
-      printf "// w 0x%04x 0x%04x 0x%08x\n", $self->getEndpoint, $address, $data;
+#      printf "// w 0x%04x 0x%04x 0x%08x\n", $self->getEndpoint, $address, $data;
       if ($self->{'_cached_writes'}) {
          $self->{'_write_cache'}{$address} = $data;
       } else {
@@ -209,4 +209,4 @@ sub addKnownRegister {
 }
 
 
-1;
\ No newline at end of file
+1;