From fb0f54ba29ab5e8d18fcb328702ecf8bb587e2b0 Mon Sep 17 00:00:00 2001 From: Ludwig Maier Date: Thu, 27 Mar 2014 17:30:08 +0100 Subject: [PATCH] nxyter update --- users/tum_e12/configure_cts.sh | 4 +- users/tum_e12/configure_eb.sh | 6 ++ web/htdocs/nxyter/index_a.pl | 10 +++ xml-db/database/Nxyter.xml | 128 ++++++++++++++++++++------------- 4 files changed, 96 insertions(+), 52 deletions(-) diff --git a/users/tum_e12/configure_cts.sh b/users/tum_e12/configure_cts.sh index 4a27736..c99374e 100755 --- a/users/tum_e12/configure_cts.sh +++ b/users/tum_e12/configure_cts.sh @@ -1,10 +1,10 @@ #!/bin/bash -trbcmd w 0x8000 0x8300 0x8000 +trbcmd w 0x8000 0x8300 0x8900 trbcmd w 0x8000 0x8301 0x00020001 trbcmd w 0x8000 0x8302 0x00030062 trbcmd w 0x8000 0x8303 0xea60 -trbcmd w 0x8000 0x8304 0x2260 +trbcmd w 0x8000 0x8304 0x578 trbcmd w 0x8000 0x8305 0x1 trbcmd w 0x8000 0x8306 0x0 trbcmd w 0x8000 0x8307 0x0 diff --git a/users/tum_e12/configure_eb.sh b/users/tum_e12/configure_eb.sh index bda91eb..6cc16e6 100755 --- a/users/tum_e12/configure_eb.sh +++ b/users/tum_e12/configure_eb.sh @@ -1,5 +1,11 @@ #!/bin/bash + +# trun of other fpgas +trbcmd w 0x8000 0x00c0 0xfffffff9 +trbcmd w 0x8000 0x00c1 0xfffffff9 +trbcmd w 0x8000 0x00c3 0xffffffff # slow control still on?? + # MAC Address of the EB # i.e. 6C:F0:49:02:D7:45 diff --git a/web/htdocs/nxyter/index_a.pl b/web/htdocs/nxyter/index_a.pl index 6f8be80..cda1ebc 100755 --- a/web/htdocs/nxyter/index_a.pl +++ b/web/htdocs/nxyter/index_a.pl @@ -64,6 +64,16 @@ $setup[7]->{cmd} = "Nxyter-0x3801-ADCHist"; $setup[7]->{period} = -1; $setup[7]->{address} = 1; +$setup[8]->{name} = "IToken_0"; +$setup[8]->{cmd} = "Nxyter-0x3800-I2CTokens"; +$setup[8]->{period} = -1; +$setup[8]->{address} = 1; + +$setup[9]->{name} = "IToken_1"; +$setup[9]->{cmd} = "Nxyter-0x3801-I2CTokens"; +$setup[9]->{period} = -1; +$setup[9]->{address} = 1; + xmlpage::initPage(\@setup,$page); 1; diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml index 6c4354e..7770fde 100644 --- a/xml-db/database/Nxyter.xml +++ b/xml-db/database/Nxyter.xml @@ -77,7 +77,7 @@ Delay of the trigger window - + @@ -213,7 +213,12 @@ Reset Busy Status, Click to force reset - + + + reset Timeout Flag + + + Reset Handler Counter @@ -288,12 +293,7 @@ ADC Reset counter - - - - - - + Delay of Timestamp Fifo @@ -335,23 +335,18 @@ + address="0120" size="17" purpose="status" mode="r" continuous="true"> - - Number of invalid frames - + + Total hit rate summed over all channels + - - - Number of hit overflows - + + + Rate of Incoming Nxyter + ADC Frames, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> + - - Pileup Counter - - - Pileup Rate @@ -361,42 +356,74 @@ 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 - + + Number of invalid frames + - + Average of last valid ADC Values - + Number of Averages, power of two (2^n) - + + + Average of last Token Return ADC Values + + + + + ADCTR Error Status + + + + + ADCTR Error Rate + + + + + ADCTR Error Counter + + + + + ADCTR Mean + + + + + ADCTR Limit + + + + + Reserved + + + + + Number of hit overflows + + + + + Pileup Counter + + + + Reserved + + + + + Error Status of all Entities - - + + + @@ -809,12 +837,12 @@ Event Buffer Full Flag Rate - + Event Buffer Error Status (i.e. Full Rate > 0) - + -- 2.43.0