Central Trigger System

From 70db6e2dda6424afe7853d874ee7d9bac567d8e4 Mon Sep 17 00:00:00 2001 From: hadeshyp Date: Mon, 3 Dec 2012 13:48:15 +0000 Subject: [PATCH] *** empty log message *** --- cts/htdocs/{thresh => commands}/get.pl | 0 cts/htdocs/{thresh => commands}/getmultreg.pl | 0 cts/htdocs/{thresh => commands}/getpadiwa.pl | 0 cts/htdocs/{thresh => commands}/put.pl | 0 cts/htdocs/{thresh => commands}/putbit.pl | 0 cts/htdocs/{thresh => commands}/spiexec.pl | 0 cts/htdocs/{index.html => cts.htm} | 25 +++++++++--------- cts/htdocs/index.htm | 22 ++++++++++++++++ cts/htdocs/{thresh => layout}/styles.css | 0 cts/htdocs/{thresh => network}/gbe.htm | 8 +++--- cts/htdocs/{thresh => scripts}/scripts.js | 0 cts/htdocs/{thresh => tdc}/tdc.htm | 12 ++++----- cts/htdocs/{thresh => tdc}/tdc_debug.htm | 20 +++++++------- cts/htdocs/thresh/padiwa.htm | 10 +++---- cts/htdocs/thresh/setbit.pl | 26 ------------------- cts/htdocs/thresh/threshold.htm | 8 +++--- 16 files changed, 63 insertions(+), 68 deletions(-) rename cts/htdocs/{thresh => commands}/get.pl (100%) rename cts/htdocs/{thresh => commands}/getmultreg.pl (100%) rename cts/htdocs/{thresh => commands}/getpadiwa.pl (100%) rename cts/htdocs/{thresh => commands}/put.pl (100%) rename cts/htdocs/{thresh => commands}/putbit.pl (100%) rename cts/htdocs/{thresh => commands}/spiexec.pl (100%) rename cts/htdocs/{index.html => cts.htm} (93%) create mode 100644 cts/htdocs/index.htm rename cts/htdocs/{thresh => layout}/styles.css (100%) rename cts/htdocs/{thresh => network}/gbe.htm (90%) rename cts/htdocs/{thresh => scripts}/scripts.js (100%) rename cts/htdocs/{thresh => tdc}/tdc.htm (92%) rename cts/htdocs/{thresh => tdc}/tdc_debug.htm (86%) delete mode 100644 cts/htdocs/thresh/setbit.pl diff --git a/cts/htdocs/thresh/get.pl b/cts/htdocs/commands/get.pl similarity index 100% rename from cts/htdocs/thresh/get.pl rename to cts/htdocs/commands/get.pl diff --git a/cts/htdocs/thresh/getmultreg.pl b/cts/htdocs/commands/getmultreg.pl similarity index 100% rename from cts/htdocs/thresh/getmultreg.pl rename to cts/htdocs/commands/getmultreg.pl diff --git a/cts/htdocs/thresh/getpadiwa.pl b/cts/htdocs/commands/getpadiwa.pl similarity index 100% rename from cts/htdocs/thresh/getpadiwa.pl rename to cts/htdocs/commands/getpadiwa.pl diff --git a/cts/htdocs/thresh/put.pl b/cts/htdocs/commands/put.pl similarity index 100% rename from cts/htdocs/thresh/put.pl rename to cts/htdocs/commands/put.pl diff --git a/cts/htdocs/thresh/putbit.pl b/cts/htdocs/commands/putbit.pl similarity index 100% rename from cts/htdocs/thresh/putbit.pl rename to cts/htdocs/commands/putbit.pl diff --git a/cts/htdocs/thresh/spiexec.pl b/cts/htdocs/commands/spiexec.pl similarity index 100% rename from cts/htdocs/thresh/spiexec.pl rename to cts/htdocs/commands/spiexec.pl diff --git a/cts/htdocs/index.html b/cts/htdocs/cts.htm similarity index 93% rename from cts/htdocs/index.html rename to cts/htdocs/cts.htm index e734587..de3f94e 100644 --- a/cts/htdocs/index.html +++ b/cts/htdocs/cts.htm @@ -1,9 +1,8 @@ - - - + + Central Trigger System - + @@ -23,7 +22,7 @@

Rate Plot (may require some time to load after server (re)start)

Click to switch between short and long plot interval

@@ -35,19 +34,19 @@ - + - + - + @@ -57,13 +56,13 @@ - + - + @@ -132,7 +131,7 @@ - +

#	Window	Coin Mask	Coin Mask	Inhibit Mask
Counter	Trigger asserted	n/a	n/a
Trigger rising edges	n/a	n/a
Trigger accepted	n/a	n/a
			Last Idle Time	n/a
Last Dead Time	n/a	n/a

@@ -248,12 +247,12 @@ Current Trigger (15:0) - n/a + n/a Buffered Trigger (15:0) - n/a + n/a

diff --git a/cts/htdocs/index.htm b/cts/htdocs/index.htm new file mode 100644 index 0000000..f3a2f2a --- /dev/null +++ b/cts/htdocs/index.htm @@ -0,0 +1,22 @@ + + + + + + +DAQ Control + + + + +

DAQ Control

+ +

CTS Control +
TDC +
TDC Debug +
Padiwa +
Threshold settings +
GbE status + + \ No newline at end of file diff --git a/cts/htdocs/thresh/styles.css b/cts/htdocs/layout/styles.css similarity index 100% rename from cts/htdocs/thresh/styles.css rename to cts/htdocs/layout/styles.css diff --git a/cts/htdocs/thresh/gbe.htm b/cts/htdocs/network/gbe.htm similarity index 90% rename from cts/htdocs/thresh/gbe.htm rename to cts/htdocs/network/gbe.htm index 059bff9..3288ab8 100644 --- a/cts/htdocs/thresh/gbe.htm +++ b/cts/htdocs/network/gbe.htm @@ -2,8 +2,8 @@ - - + + GbE Registers @@ -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); diff --git a/cts/htdocs/thresh/scripts.js b/cts/htdocs/scripts/scripts.js similarity index 100% rename from cts/htdocs/thresh/scripts.js rename to cts/htdocs/scripts/scripts.js diff --git a/cts/htdocs/thresh/tdc.htm b/cts/htdocs/tdc/tdc.htm similarity index 92% rename from cts/htdocs/thresh/tdc.htm rename to cts/htdocs/tdc/tdc.htm index 239c5b5..199461d 100644 --- a/cts/htdocs/thresh/tdc.htm +++ b/cts/htdocs/tdc/tdc.htm @@ -2,8 +2,8 @@ - - + + TDC Registers @@ -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); } diff --git a/cts/htdocs/thresh/tdc_debug.htm b/cts/htdocs/tdc/tdc_debug.htm similarity index 86% rename from cts/htdocs/thresh/tdc_debug.htm rename to cts/htdocs/tdc/tdc_debug.htm index 8338a03..b52b388 100644 --- a/cts/htdocs/thresh/tdc_debug.htm +++ b/cts/htdocs/tdc/tdc_debug.htm @@ -2,8 +2,8 @@ - - + + TDC Registers @@ -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); diff --git a/cts/htdocs/thresh/padiwa.htm b/cts/htdocs/thresh/padiwa.htm index 3849477..c7a7f33 100644 --- a/cts/htdocs/thresh/padiwa.htm +++ b/cts/htdocs/thresh/padiwa.htm @@ -2,8 +2,8 @@ - - + + Padiwa @@ -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 index 6d2d6fe..0000000 --- a/cts/htdocs/thresh/setbit.pl +++ /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 diff --git a/cts/htdocs/thresh/threshold.htm b/cts/htdocs/thresh/threshold.htm index f8eefd3..c80ca91 100644 --- a/cts/htdocs/thresh/threshold.htm +++ b/cts/htdocs/thresh/threshold.htm @@ -2,8 +2,8 @@ - - + + Threshold settings @@ -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{ -- 2.43.0