]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
*** empty log message ***
authorhadeshyp <hadeshyp>
Mon, 3 Dec 2012 13:48:15 +0000 (13:48 +0000)
committerhadeshyp <hadeshyp>
Mon, 3 Dec 2012 13:48:15 +0000 (13:48 +0000)
16 files changed:
cts/htdocs/commands/get.pl [moved from cts/htdocs/thresh/get.pl with 100% similarity]
cts/htdocs/commands/getmultreg.pl [moved from cts/htdocs/thresh/getmultreg.pl with 100% similarity]
cts/htdocs/commands/getpadiwa.pl [moved from cts/htdocs/thresh/getpadiwa.pl with 100% similarity]
cts/htdocs/commands/put.pl [moved from cts/htdocs/thresh/put.pl with 100% similarity]
cts/htdocs/commands/putbit.pl [moved from cts/htdocs/thresh/putbit.pl with 100% similarity]
cts/htdocs/commands/spiexec.pl [moved from cts/htdocs/thresh/spiexec.pl with 100% similarity]
cts/htdocs/cts.htm [moved from cts/htdocs/index.html with 93% similarity]
cts/htdocs/index.htm [new file with mode: 0644]
cts/htdocs/layout/styles.css [moved from cts/htdocs/thresh/styles.css with 100% similarity]
cts/htdocs/network/gbe.htm [moved from cts/htdocs/thresh/gbe.htm with 90% similarity]
cts/htdocs/scripts/scripts.js [moved from cts/htdocs/thresh/scripts.js with 100% similarity]
cts/htdocs/tdc/tdc.htm [moved from cts/htdocs/thresh/tdc.htm with 92% similarity]
cts/htdocs/tdc/tdc_debug.htm [moved from cts/htdocs/thresh/tdc_debug.htm with 86% similarity]
cts/htdocs/thresh/padiwa.htm
cts/htdocs/thresh/setbit.pl [deleted file]
cts/htdocs/thresh/threshold.htm

similarity index 93%
rename from cts/htdocs/index.html
rename to cts/htdocs/cts.htm
index e7345870ac4af47022e316c7903408d0bfb4402b..de3f94e87018eae0c1086e2fa83fccbadda0ba02 100644 (file)
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html version="-//W3C//DTD XHTML 1.1//EN" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html>
+<html>
    <head>
       <title>Central Trigger System</title>
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
       <link href="layout/base.css" rel="Stylesheet" type="text/css" />
       <script src="scripts/mootools-core-1.4.5.js" type="text/javascript"></script>
       <script src="scripts/base.js" type="text/javascript"></script>
@@ -23,7 +22,7 @@
             <div class="header"><span class="indicator"></span> Status overview</div>
             
             <div class="content">
-               <img src="monitor/plot.png" id="rate-plot" title="Click to switch between short and long plot interval" alt="Rate Plot (may require some time to load after server (re)start)" />
+               <img src="monitor/plot.png" id="rate-plot" title="Click to switch between short and long plot interval" />
                <table id="overview-tab">
                   <tr>
                      <th class="label">Counter</th>
                      <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" format="rateToFrac">n/a</td>
-                  </tr>
+                  <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">n/a</td>
-                  </tr>
+                  <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">n/a</td>
-                  </tr>
+                  <tr>
                   
                   <tr>
                      <td colspan="3">&nbsp;</td>
                      <td class="label">Last Idle Time</td>
                      <td class="value autoupdate" slice="cts_cnt_idle_time.value" format="countToTime" suffix=" ns">n/a</td>
                      <td class="rate "></td>
-                  </tr>
+                  <tr>
 
                   <tr>
                      <td class="label">Last Dead Time</td>
                      <td class="value autoupdate" slice="cts_cnt_dead_time.value" format="countToTime" suffix=" ns">n/a</td>
                      <td class="rate  autoupdate" slice="cts_cnt_dead_time.value" format="countToFreq">n/a</td>
-                  </tr>
+                  <tr>
 
                   <tr>
                      <td colspan="3">&nbsp;</td>
                      <tr>
                         <th class="num">#</th>
                         <th class="window">Window</th>
-                        <th class="coin"><abbr title="Inputs that are required to rise within the specified window of time (edge sensitive)">Coin Mask</abbr></th>
+                        <th class="coin"><abbr title="Inputs that are required to rise within the specified window of time (edge sensitive)">Coin Mask</acronym></th>
                         <th class="inhibit"><abbr title="Additionally to the Coin Mask, this input have to be asserted (level sensitive)">Inhibit Mask</abbr></th>
                      </tr>
                   </table>
                      
                      <tr class="alt">
                         <td class="label">Current Trigger (15:0)</td>
-                        <td class="value autoupdate" slice="cts_cur_trg_state" format="var x=function(x,data){return '&lt;pre&gt;'+ data.f.mask + '&lt;/pre&gt;' + (data.v.asserted?', Asserted, Type '+data.f.type:', Not asserted')}; x">n/a</td>
+                        <td class="value autoupdate" slice="cts_cur_trg_state" format="var x=function(x,data){return '<pre>'+ data.f.mask + '</pre>' + (data.v.asserted?', Asserted, Type '+data.f.type:', Not asserted')}; x">n/a</td>
                      </tr>
                      
                      <tr>
                         <td class="label">Buffered Trigger (15:0)</td>
-                        <td class="value autoupdate" slice="cts_buf_trg_state" format="var x=function(x,data){return '&lt;pre&gt;'+ data.f.mask + '&lt;/pre&gt;, Type: '+data.f.type}; x">n/a</td>
+                        <td class="value autoupdate" slice="cts_buf_trg_state" format="var x=function(x,data){return '<pre>'+ data.f.mask + '</pre>, Type: '+data.f.type}; x">n/a</td>
                      </tr>
                   </table>
                </div>
diff --git a/cts/htdocs/index.htm b/cts/htdocs/index.htm
new file mode 100644 (file)
index 0000000..f3a2f2a
--- /dev/null
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<link href="layout/styles.css" rel="stylesheet" type="text/css"/>
+<script src="scripts/scripts.js" type="text/javascript"></script>
+<title>DAQ Control</title>
+</head>
+<body>
+
+
+<h2>DAQ Control</h2>
+
+<ul>
+<li><a href="cts.htm">CTS Control</a>
+<li><a href="tdc/tdc.htm">TDC</a>
+<li><a href="tdc/tdc_debug.htm">TDC Debug</a>
+<li><a href="thresh/padiwa.htm">Padiwa</a>
+<li><a href="thresh/threshold.htm">Threshold settings</a>
+<li><a href="network/gbe.htm">GbE status</a>
+</body>
+</html>
\ No newline at end of file
similarity index 90%
rename from cts/htdocs/thresh/gbe.htm
rename to cts/htdocs/network/gbe.htm
index 059bff91b5dcc08cf171bc60c05a77938d4849e7..3288ab89f9cad13498c8c02a4a94386fead71edd 100644 (file)
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<link href="styles.css" rel="stylesheet" type="text/css"/>
-<script src="scripts.js" type="text/javascript"></script>
+<link href="../layout/styles.css" rel="stylesheet" type="text/css"/>
+<script src="../scripts/scripts.js" type="text/javascript"></script>
 <title>GbE Registers</title>
 </head>
 <body>
@@ -37,7 +37,7 @@ function setValues() {
   updaterate = document.getElementById("form_rate").value;
   board      = document.getElementById("form_board").value;
   clearInterval(updateRegsTask);
-  updateRegsTask = setInterval("getdata('get.pl?"+board+"-83f3-10',updateregs)",updaterate);
+  updateRegsTask = setInterval("getdata('../commands/get.pl?"+board+"-83f3-10',updateregs)",updaterate);
   
   }
 
@@ -96,7 +96,7 @@ function updateregs(data) {
   }
 
     
-updateRegsTask = setInterval("getdata('get.pl?"+board+"-83f3-10',updateregs)",updaterate);
+updateRegsTask = setInterval("getdata('../commands/get.pl?"+board+"-83f3-10',updateregs)",updaterate);
 
   
   
similarity index 92%
rename from cts/htdocs/thresh/tdc.htm
rename to cts/htdocs/tdc/tdc.htm
index 239c5b54733244040e307b660f4acb6a664e9f06..199461dbbe22a87149b097b5728f9ef4a93b5564 100644 (file)
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<link href="styles.css" rel="stylesheet" type="text/css"/>
-<script src="scripts.js" type="text/javascript"></script>
+<link href="../layout/styles.css" rel="stylesheet" type="text/css"/>
+<script src="../scripts/scripts.js" type="text/javascript"></script>
 <title>TDC Registers</title>
 </head>
 <body>
@@ -56,13 +56,13 @@ function settimers(time1,time2) {
   if(time1 != -1) {
     if(!time1) time1 = updaterate;
     clearTimeout(updateTask);
-    updateTask = setTimeout("getdata('get.pl?"+board+"-c000-"+channels+split+"',update)",time1);
+    updateTask = setTimeout("getdata('../commands/get.pl?"+board+"-c000-"+channels+split+"',update)",time1);
     }
     
   if(time2 != -1) {
     if(!time2) time2 = updaterate2;
     clearTimeout(updateRegsTask);
-    updateRegsTask = setTimeout("getdata('getmultreg.pl?"+board+"-"+reglist+"',updateregs)",time2);
+    updateRegsTask = setTimeout("getdata('../commands/getmultreg.pl?"+board+"-"+reglist+"',updateregs)",time2);
     }
   }
 
@@ -139,7 +139,7 @@ function setValues() {
 function setEnable(e,board,channel) {
   reg = Math.floor(channel/32) + 0xc2;
   op  = e.checked?"set":"clr";
-  getdata("putbit.pl?"+board+"-"+reg.toString(16)+"-"+op+"-"+(1<<(channel%32)).toString(16),0);
+  getdata("../commands/putbit.pl?"+board+"-"+reg.toString(16)+"-"+op+"-"+(1<<(channel%32)).toString(16),0);
   settimers(200,50);
   }
 
@@ -147,7 +147,7 @@ function setEnableBlock(e,board,channel,val) {
   reg = Math.floor(channel/2) + 0xc2;
   op  = val?"set":"clr";
   value = channel%2?0xffff0000:0xffff;
-  getdata("putbit.pl?"+board+"-"+reg.toString(16)+"-"+op+"-"+value.toString(16),0);
+  getdata("../commands/putbit.pl?"+board+"-"+reg.toString(16)+"-"+op+"-"+value.toString(16),0);
   settimers(200,50);
   }  
   
similarity index 86%
rename from cts/htdocs/thresh/tdc_debug.htm
rename to cts/htdocs/tdc/tdc_debug.htm
index 8338a03b0fd439edfda3892f5aeb1dd76b892474..b52b3885b8f150ef7d1bfd57d9477357a854d0b4 100644 (file)
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<link href="styles.css" rel="stylesheet" type="text/css"/>
-<script src="scripts.js" type="text/javascript"></script>
+<link href="../layout/styles.css" rel="stylesheet" type="text/css"/>
+<script src="../scripts/scripts.js" type="text/javascript"></script>
 <title>TDC Registers</title>
 </head>
 <body>
@@ -99,13 +99,13 @@ function setValues() {
   showstatus = document.getElementById("form_status").checked;
   channels   = document.getElementById("form_channels").value;
   clearInterval(updateTask);
-  updateTask = setInterval("getdata('get.pl?"+board+"-c000-"+channels+split+"',update)",updaterate);
+  updateTask = setInterval("getdata('../commands/get.pl?"+board+"-c000-"+channels+split+"',update)",updaterate);
   clearInterval(updateEncTask);
-  updateEncTask = setInterval("getdata('get.pl?"+board+"-c200-"+channels+split+"',updateEnc)",updaterate);
+  updateEncTask = setInterval("getdata('../commands/get.pl?"+board+"-c200-"+channels+split+"',updateEnc)",updaterate);
   clearInterval(updateFifoTask);
-  updateFifoTask = setInterval("getdata('get.pl?"+board+"-c300-"+channels+split+"',updateFifo)",updaterate);
+  updateFifoTask = setInterval("getdata('../commands/get.pl?"+board+"-c300-"+channels+split+"',updateFifo)",updaterate);
   clearInterval(updateLostTask);
-  updateLostTask = setInterval("getdata('get.pl?"+board+"-c400-"+channels+split+"',updateLost)",updaterate);  
+  updateLostTask = setInterval("getdata('../commands/get.pl?"+board+"-c400-"+channels+split+"',updateLost)",updaterate);  
 
   }
 
@@ -222,10 +222,10 @@ function updateLost(data) {
  
 
     
-updateTask = setInterval("getdata('get.pl?"+board+"-c000-"+channels+split+"',update)",updaterate);
-updateEncTask = setInterval("getdata('get.pl?"+board+"-c200-"+channels+split+"',updateEnc)",updaterate);
-updateFifoTask = setInterval("getdata('get.pl?"+board+"-c300-"+channels+split+"',updateFifo)",updaterate);
-updateLostTask = setInterval("getdata('get.pl?"+board+"-c400-"+channels+split+"',updateLost)",updaterate);
+updateTask = setInterval("getdata('../commands/get.pl?"+board+"-c000-"+channels+split+"',update)",updaterate);
+updateEncTask = setInterval("getdata('../commands/get.pl?"+board+"-c200-"+channels+split+"',updateEnc)",updaterate);
+updateFifoTask = setInterval("getdata('../commands/get.pl?"+board+"-c300-"+channels+split+"',updateFifo)",updaterate);
+updateLostTask = setInterval("getdata('../commands/get.pl?"+board+"-c400-"+channels+split+"',updateLost)",updaterate);
   
   
 </script>
index 3849477b5306b34749c1ccebd47b7955c5f5527f..c7a7f33bf3d202804dfa56f9a0ab9b417f316a61 100644 (file)
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<link href="styles.css" rel="stylesheet" type="text/css"/>
-<script src="scripts.js" type="text/javascript"></script>
+<link href="../layout/styles.css" rel="stylesheet" type="text/css"/>
+<script src="../scripts/scripts.js" type="text/javascript"></script>
 <title>Padiwa</title>
 </head>
 <body>
@@ -30,7 +30,7 @@ var board      = document.getElementById("form_board").value;
 var option     = document.getElementById("form_option").value;
 var min        = document.getElementById("form_min").value;
 var max        = document.getElementById("form_max").value;
-var updateTask = setTimeout("getdata('getpadiwa.pl?"+board+"-"+option+"',update)",100);
+var updateTask = setTimeout("getdata('../commands/getpadiwa.pl?"+board+"-"+option+"',update)",100);
 
 function setValues() {
   updaterate = document.getElementById("form_rate").value;
@@ -39,7 +39,7 @@ function setValues() {
   min        = document.getElementById("form_min").value;
   max        = document.getElementById("form_max").value;
   clearTimeout(updateTask);
-  updateTask = setTimeout("getdata('getpadiwa.pl?"+board+"-"+option+"',update)",100);
+  updateTask = setTimeout("getdata('../commands/getpadiwa.pl?"+board+"-"+option+"',update)",100);
   }
 
 
@@ -87,7 +87,7 @@ function update(data) {
     }
   document.getElementById("content").innerHTML  = o;
   clearTimeout(updateTask);
-  updateTask = setTimeout("getdata('getpadiwa.pl?"+board+"-"+option+"',update)",updaterate);
+  updateTask = setTimeout("getdata('../commands/getpadiwa.pl?"+board+"-"+option+"',update)",updaterate);
   }
     
   
diff --git a/cts/htdocs/thresh/setbit.pl b/cts/htdocs/thresh/setbit.pl
deleted file mode 100644 (file)
index 6d2d6fe..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-&htsponse(200, "OK");
-print "Content-type: text/html\r\n\r\n";
-
-
-
-use HADES::TrbNet;
-use Data::Dumper;
-
- if (!defined &trb_init_ports()) {
-   die("can not connect to trbnet-daemon on the $ENV{'DAQOPSERVER'}");
- }
-
-my ($board,$addr,@values) = split('-',$ENV{'QUERY_STRING'}); 
-
-if(!defined $board || !defined $addr || !defined $values[0]) {exit -1;}
-$board = hex($board);
-$addr = hex($addr);
-
-for(my $x = 0; $x < scalar @values; $x++) {
-  $values[$x] = hex($values[$x]);
-  }
-
-
-my $hits = trb_register_write_mem($board,$addr,0,\@values,scalar @values);
-  
-exit 1;
\ No newline at end of file
index f8eefd3c9093e97e2115ec1be90075f84b6011f1..c80ca9119be4d0eca22b58b2e0ea22734beea63f 100644 (file)
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<link href="styles.css" rel="stylesheet" type="text/css"/>
-<script src="scripts.js" type="text/javascript"></script>
+<link href="../layout/styles.css" rel="stylesheet" type="text/css"/>
+<script src="../scripts/scripts.js" type="text/javascript"></script>
 <title>Threshold settings</title>
 </head>
 <body>
@@ -66,7 +66,7 @@ function update(bar,scale) {
   
 function doUpdate() {
   if(dataWaiting) {
-    cmdstring = "put.pl?"+board+"-d400-"+command+"-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"+chain+"-1";
+    cmdstring = "../commands/put.pl?"+board+"-d400-"+command+"-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"+chain+"-1";
     getdata(cmdstring,showret);
     dataWaiting = 0;
     }
@@ -95,7 +95,7 @@ function setValues() {
   type       = document.getElementById("form_type").value;
   reference  = document.getElementById("form_ref").value;
   if(type == 8) {
-    cmdstring = "spiexec.pl?"+board+"-d400-"+(((chan << 16)).toString(16))+"-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"+chain+"-1";
+    cmdstring = "../commands/spiexec.pl?"+board+"-d400-"+(((chan << 16)).toString(16))+"-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0-"+chain+"-1";
     getdata(cmdstring,anaret2);
     }
   else{