From d37555c6aed6f2e1aab823bc3c399e48b6d1863b Mon Sep 17 00:00:00 2001 From: Ludwig Maier Date: Fri, 7 Mar 2014 00:40:20 +0100 Subject: [PATCH] nxyter update registers --- users/tum_e12/configure_cts.sh | 8 +- web/htdocs/nxyter/index.pl | 2 +- web/include/CtsCommands.pm | 8 +- xml-db/database/Nxyter.xml | 192 +++++++++++++++++++-------------- 4 files changed, 122 insertions(+), 88 deletions(-) diff --git a/users/tum_e12/configure_cts.sh b/users/tum_e12/configure_cts.sh index 8d29ec4..4a27736 100755 --- a/users/tum_e12/configure_cts.sh +++ b/users/tum_e12/configure_cts.sh @@ -13,9 +13,7 @@ trbcmd w 0x8000 0x830b 0x7 trbcmd w 0x8000 0x830d 0x0 # Pulser #0 Settings -trbcmd w 0x8000 0xa140 0x0001869f -#trbcmd clearbit 0x8000 0xa101 0x2 +trbcmd w 0x8000 0xa150 0x0001869f # 1 kHz Pulser #0 +trbcmd w 0x8000 0xa151 0x000003e7 # 100 kHz Pulser #1 +trbcmd w 0x8000 0xa153 0x000053e3 # 1 kHz Random -# Pulser #0 Settings -#trbcmd w 0x8000 0xa137 0x0001869f #0x3e7 -#trbcmd clearbit 0x8000 0xa101 0x2 diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl index e1657bd..8c05cd8 100755 --- a/web/htdocs/nxyter/index.pl +++ b/web/htdocs/nxyter/index.pl @@ -40,7 +40,7 @@ $setup[2]->{period} = -1; $setup[2]->{address} = 1; $setup[3]->{name} = "TriggerHandler"; -$setup[3]->{cmd} = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TestPulse"; +$setup[3]->{cmd} = "Nxyter-0xfe49-TriggerHandler&Nxyter-0xfe49-TestPulse&Nxyter-0xfe49-EventBuffer"; $setup[3]->{period} = -1; $setup[3]->{address} = 1; diff --git a/web/include/CtsCommands.pm b/web/include/CtsCommands.pm index 2787f4c..83ee329 100644 --- a/web/include/CtsCommands.pm +++ b/web/include/CtsCommands.pm @@ -502,14 +502,14 @@ EOF set xrange [*:0] set output "$config->{'dump_dir'}/_tmp_plot.png" plot \\ -"$config->{'dump_dir'}/plot.data" using 1:3:(\$3 / 1000) with yerrorlines title "Edges", \\ -"$config->{'dump_dir'}/plot.data" using 1:4:(\$4 / 1000) with yerrorlines title "Accepted" +"$config->{'dump_dir'}/plot.data" using 1:3 with lp title "Edges", \\ +"$config->{'dump_dir'}/plot.data" using 1:4 with lp title "Accepted" set xrange [-5:0] set output "$config->{'dump_dir'}/_tmp_plotshort.png" plot \\ -"$config->{'dump_dir'}/plot.data" using 1:3:(\$3 / 1000) with yerrorlines title "Edges", \\ -"$config->{'dump_dir'}/plot.data" using 1:4:(\$4 / 1000) with yerrorlines title "Accepted" +"$config->{'dump_dir'}/plot.data" using 1:3 with lp title "Edges", \\ +"$config->{'dump_dir'}/plot.data" using 1:4 with lp title "Accepted" EOF ; diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml index 9f1de1a..6c4354e 100644 --- a/xml-db/database/Nxyter.xml +++ b/xml-db/database/Nxyter.xml @@ -6,69 +6,7 @@ > Registers for the Nxyter Readout - - - - Number of invalid frames - - - - - Number of hit overflows - - - - - Pileup Counter - - - - - Pileup Rate - - - - - Overflow Rate - - - - - Parity Error Counter - - - - - - Total hit rate summed over all channels - - - - - Rate of Incoming Nxyter + ADC Frames, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> - - - - - - - Last valid ADC value - - - - - Average of last valid ADC Values - - - - - Number of Averages, power of two (2^n) - - - - + + address="0500" size="22" purpose="status" mode="rw" continuous="true"> Merge of Nxyter and ADC Frame Rates, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> @@ -261,14 +199,19 @@ Status of Error Bits - - - - - - - - + + + + + + + + + + + + Reset Busy Status, Click to force reset + @@ -305,6 +248,11 @@ Number of Resyncs + + + Nxyter Timestamp Frame Rate, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> + + Number of Parity Errors @@ -346,11 +294,6 @@ - - ADC Clock OK, Johnson counter is synced - - - Delay of Timestamp Fifo @@ -391,6 +334,71 @@ + + + + Number of invalid frames + + + + + Number of hit overflows + + + + + Pileup Counter + + + + + Pileup Rate + + + + + Overflow Rate + + + + + Parity Error Counter + + + + + + Total hit rate summed over all channels + + + + + Rate of Incoming Nxyter + ADC Frames, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> + + + + + + + Last valid ADC value + + + + + Average of last valid ADC Values + + + + + Number of Averages, power of two (2^n) + + + + + + @@ -702,7 +710,8 @@ Error Status of all Entities - + + @@ -785,6 +794,33 @@ + + + + Evenbuffer Depth (10 ... 4000) + + + + + Last Eventbuffer Flush Counter + + + + + Event Buffer Full Flag Rate + + + + + Event Buffer Error Status (i.e. Full Rate > 0) + + + + + + + -- 2.43.0