From: Ludwig Maier Date: Mon, 17 Feb 2014 02:03:58 +0000 (+0100) Subject: nxyter register update X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=ef46630d3a36b89c43cba9007b178bd7e952a83d;p=daqtools.git nxyter register update --- diff --git a/users/tum_e12/HOWTORUN.TXT b/users/tum_e12/HOWTORUN.TXT index a23dded..8dc31fa 100644 --- a/users/tum_e12/HOWTORUN.TXT +++ b/users/tum_e12/HOWTORUN.TXT @@ -7,6 +7,7 @@ trbcmd reset trbdhcp configure_eb.sh configure_cts.sh +sleep 2 /home/rich/TRB/trbsoft/nxyter/setup.sh xterm -e "cd ../../web; cts_gui --port 1234 --noopenxterm --quiet" & diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl index 4093f87..7775209 100755 --- a/web/htdocs/nxyter/index.pl +++ b/web/htdocs/nxyter/index.pl @@ -25,7 +25,7 @@ $page->{link} = "../"; my @setup; $setup[0]->{name} = "NXControl"; -$setup[0]->{cmd} = "Nxyter-0xfe49-NXControl"; +$setup[0]->{cmd} = "Nxyter-0xfe49-NXControl&Nxyter-0xfe49-ADCMonitor"; $setup[0]->{period} = -1; $setup[0]->{generic} = 1; @@ -45,7 +45,7 @@ $setup[3]->{period} = -1; $setup[3]->{address} = 1; $setup[4]->{name} = "I2CRegister"; -$setup[4]->{cmd} = "Nxyter-0xfe49-NxyterI2C&Nxyter-0xfe49-NxyterDAC"; +$setup[4]->{cmd} = "Nxyter-0xfe49-NxyterI2C&Nxyter-0xfe49-NxyterDAC&Nxyter-0xfe49-I2CTokens"; $setup[4]->{period} = -1; $setup[4]->{address} = 1; diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml index 55ebffe..cf206b0 100644 --- a/xml-db/database/Nxyter.xml +++ b/xml-db/database/Nxyter.xml @@ -59,6 +59,7 @@ + @@ -85,6 +86,7 @@ + @@ -100,7 +102,8 @@ - + + @@ -236,6 +239,7 @@ + @@ -259,7 +263,7 @@ Timestamp Fifo Almost Empty - + Synchronized to Nxyter Frame @@ -358,6 +362,8 @@ + + @@ -374,9 +380,9 @@ - + Nxyter Testpulse Polarity (1 = negative, 0 = positive) - + @@ -398,60 +404,278 @@ I2C Online, i.e. Nxyter is connected - - + - - Nxyter I2C Register - - - I2C Write Token - - - - I2C Read Token - - - - Dummy Register - + + 0..15: Channel Mask Register + + + + + + + + + + + + + 16: Gate Voltage Preamplifier Current Sink (Vcg) + + + + + 17: Bias Voltage Shapers (VcgFoll) + + + + + 18: Global Threshold of Comparators + + - - I2C Register Value + + 19: Discharge time of Preamplifier. + + + + + 20: Bias Voltage Fast Shaper + + + + + 21: Bias Voltage Slow Shaper first stage + + + + + 22: Bias Voltage Slow Shaper second stage + + + + + 23: Target Voltage of common mode feedback + + + + + 24: Strength of internal Testpulse + + + + + 25: Current of Main Stage of Comparator + + + + + 26: Dead Time of analog channels + + + + + 27: Current of Output Stage of Comparators + + + + + 28: Current of Peak Detect and hold Circuit + + + + + 29: Current of Time Walk Compensation Circuit + + + + + 30..31: Spare + + + + + 32: Configuration Register #1 + + Timestamp LSB Select(0: CLK256A, 1:CLK256B + + + Disable 128MHz Readout Clock + + + Disable 32MHz Readout Clock + + + TestTrigger Synchronize + + + TestTrigger Enable + + + TestPulse Polarity (1: negative, 0: positive) + + + TestPulse Synchronize + + + TestPulse Enable - + + + + 33: Configuration Register #2 + + Must always be set + + + Front End Polarity (0: negative input charge, 1: positive input charge) + + + Nxyter Testpulse Channel Group (0=0,4,.. 1=1,5,.. 2=2,6,.. 3=3,7,..) + + + + + 34..37: Spare + + + + 38: Testpulse Delay + + + + + 39: Test Trigger Delay + + + + + + 40..42: Spare + + + + + 43..45: Clock Delay Registers + + + + + Update Nxyter I2C Register + + + + + Update Nxyter DAC Register + + + + + Update Nxyter I2C and DAC Register + + + + - - - Nxyter DAC Register - - - DAC Write Token - - - - DAC Read Token - - + + + Nxyter DAC Register Channel Down - DAC Trim Value - + + + Nxyter DAC Register Test Channel + + Channel Down + + + DAC Trim Value Test Channel + + + + + + + + + I2C Register Write Token Status 31 .. 0 + + + + I2C Register Write Token Status 45 .. 32 + + + + + I2C Register Read Token Status 31 .. 0 + + + + I2C Register Read Token Status 45 .. 32 + + + + + I2C Register Write Token DAC Status 31 .. 0 + + + + I2C Register Write Token DAC Status 63 .. 32 + + + + I2C Register Write Token DAC Status 95 .. 64 + + + + I2C Register Write Token DAC Status 127 .. 95 + + + + I2C Register Write Token DAC Status 128 + + + + + I2C Register Read Token DAC Status 31 .. 0 + + + + I2C Register Read Token DAC Status 63 .. 32 + + + + I2C Register Read Token DAC Status 95 .. 64 + + + + I2C Register Read Token DAC Status 127 .. 95 + + + + I2C Register Read Token DAC Status 128 + + + + + + @@ -507,6 +731,38 @@ + + + + + + Nxyter Slow Shaper Pin + + + + + + Nxyter Fast Shaper Pin + + + + + + FEB Temperature Sensor + + + + + + FEB Current + + + + + + + @@ -519,21 +775,8 @@ - - - ADC Value Average per Channel - - - - - - Number of Averages per Channel, power of two (2^n) - - - + address="0100" size="128" purpose="config" mode="r" continuous="true"> Continuous Pile Up Counter per Channel @@ -541,13 +784,27 @@ + address="0200" size="128" purpose="config" mode="r" continuous="true"> Continuous Overflow Counter per Channel + + + ADC Value Average per Channel + + + + + + Number of Averages per Channel, power of two (2^n) + + + +