From 96402a7e6b1d90bce292d05b78d19f5db4e67e22 Mon Sep 17 00:00:00 2001 From: Ludwig Maier Date: Fri, 29 Nov 2013 04:19:28 +0100 Subject: [PATCH] nxyter register update --- users/tum_e12/configure_cts.sh | 6 ++--- xml-db/database/Nxyter.xml | 46 ++++++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/users/tum_e12/configure_cts.sh b/users/tum_e12/configure_cts.sh index 614893e..8d29ec4 100755 --- a/users/tum_e12/configure_cts.sh +++ b/users/tum_e12/configure_cts.sh @@ -13,9 +13,9 @@ trbcmd w 0x8000 0x830b 0x7 trbcmd w 0x8000 0x830d 0x0 # Pulser #0 Settings -#trbcmd w 0x8000 0xa140 0x0001869f +trbcmd w 0x8000 0xa140 0x0001869f #trbcmd clearbit 0x8000 0xa101 0x2 # Pulser #0 Settings -trbcmd w 0x8000 0xa137 0x0001869f #0x3e7 -trbcmd clearbit 0x8000 0xa101 0x2 +#trbcmd w 0x8000 0xa137 0x0001869f #0x3e7 +#trbcmd clearbit 0x8000 0xa101 0x2 diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml index 465b64f..2b9b9ce 100644 --- a/xml-db/database/Nxyter.xml +++ b/xml-db/database/Nxyter.xml @@ -7,7 +7,7 @@ Registers for the Nxyter Readout + address="0120" size="9" purpose="status" mode="r" continuous="true"> Number of invalid frames @@ -42,6 +42,21 @@ + + Last valid ADC value + + + + + Average of last valid ADC Values + + + + + Number of Averages, power of two (2^n) + + + @@ -188,7 +203,7 @@ + address="0500" size="19" purpose="status" mode="rw" continuous="true"> Current Timestamp Value read from Fifo @@ -245,21 +260,21 @@ - - Current ADC value - + + Current ADC raw value + - - - "ADC Input Error Enable - + + + + - - ADC Input Error Counter - + + + - + ADC Clock OK, Johnson counter is synced @@ -301,6 +316,11 @@ + + ADC Test Channel Value + + +