From: Ludwig Maier Date: Tue, 5 Nov 2013 17:34:04 +0000 (+0100) Subject: nxyter new database entries X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=95286def0a0f900ba8933243bfd286fb2fa5dab7;p=daqtools.git nxyter new database entries --- diff --git a/users/tum_e12/trbdhcp.conf b/users/tum_e12/trbdhcp.conf deleted file mode 100644 index a4e1c71..0000000 --- a/users/tum_e12/trbdhcp.conf +++ /dev/null @@ -1,5 +0,0 @@ -0x8000 0x12000002e2d98d28 0x05 -0x8900 0xcf000003480d8a28 0x00 -0x8901 0x99000002e30e5728 0x01 -0x8902 0x4e000002e2e24c28 0x02 -0x8903 0x6a000002e2e24328 0x03 diff --git a/users/tum_e12/trbdhcp.conf b/users/tum_e12/trbdhcp.conf new file mode 120000 index 0000000..08e20d3 --- /dev/null +++ b/users/tum_e12/trbdhcp.conf @@ -0,0 +1 @@ +/home/rich/hadesdaq/main/trbdhcp.conf \ No newline at end of file diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl index 2f16532..d5a7ae5 100755 --- a/web/htdocs/nxyter/index.pl +++ b/web/htdocs/nxyter/index.pl @@ -21,16 +21,35 @@ $setup[0]->{cmd} = "Nxyter-0x3800-DataValidate"; $setup[0]->{period} = -1; $setup[0]->{address} = 1; - $setup[1]->{name} = "TrigValid"; $setup[1]->{cmd} = "Nxyter-0x3800-TriggerValidate"; $setup[1]->{period} = -1; $setup[1]->{address} = 1; -$setup[2]->{name} = "OtherStuff"; -$setup[2]->{cmd} = "Nxyter-0x3800-TriggerValidate"; +$setup[2]->{name} = "TriggerHandler"; +$setup[2]->{cmd} = "Nxyter-0x3800-TriggerHandler"; $setup[2]->{period} = -1; -$setup[2]->{generic} = 1; +$setup[2]->{address} = 1; + +$setup[3]->{name} = "Testpulse"; +$setup[3]->{cmd} = "Nxyter-0x3800-TestPulse"; +$setup[3]->{period} = -1; +$setup[3]->{address} = 1; + +$setup[4]->{name} = "DataReceiver"; +$setup[4]->{cmd} = "Nxyter-0x3800-DataReceiver"; +$setup[4]->{period} = -1; +$setup[4]->{address} = 1; + +$setup[5]->{name} = "I2CRegister"; +$setup[5]->{cmd} = "Nxyter-0x3800-NxyterI2C"; +$setup[5]->{period} = -1; +$setup[5]->{address} = 1; + +$setup[6]->{name} = "OtherStuff"; +$setup[6]->{cmd} = "Nxyter-0x3800-TriggerValidate"; +$setup[6]->{period} = -1; +$setup[6]->{generic} = 1; xmlpage::initPage(\@setup,$page); diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml index 582f180..b7513d0 100644 --- a/xml-db/database/Nxyter.xml +++ b/xml-db/database/Nxyter.xml @@ -13,105 +13,152 @@ Number of invalid frames + Number of hit overflows + - Number of hit overflows + Pileup Counter + - Number of hit overflows + Parity Error Counter + + address="0004" size="2" purpose="status" mode="r" continuous="true"> Total hit rate summed over all channels + - Number of Hits on nxyter + Rate of Incoming Nxyter Frames, must be 31.25MHz + - - - Rate of test pulses - - - - Delay of the testpulse after Trigger - - - + + + Enable test pulse + + + + Delay of the testpulse after Trigger + + + + + Accepted incoming Trigger Rate + + + + Invalid Timing Trigger counter + + + + + + + Length of Trigger TestPulse + + + + + Testpulse Rate + + + + + + + address="0180" size="15" purpose="config" mode="rw" continuous="false"> Readout mode selection - Ref + Valid + Window - Ref + Valid - Raw + Time + Valid - Raw - Raw + Valid + TS Select + TS Ovfl,Parity valid + TS Select + TS Ovfl,Parity,Pileup valid + TS Select + ignore TS Status Bits + TS Select + ignore TS Status Bits + TS Ovfl,Parity valid + TS Ovfl,Parity,Pileup valid + ignore TS Status Bits + ignore TS Status Bits - + + Delay of the trigger window - + + Width of the trigger window - + + CTS Trigger Delay - + + Maximal read-out time - + - + + + Adds positive offset to FPGA Timestamp + + + + Maximal read-out time - + + Internal reference timestamp of current event - + + Lower timestamp limit of data selection window - - Upper timestamp limit of data selection window - + + + TS Window Error Counter + - - Data Fifo data delay + + + Current Data-Fifo delay value - - + + + Data channel read-out finished - - - + Status of the timestamp Fifo + Timestamp Fifo full + Timestamp Fifo Empty + Timestamp Fifo Almost Empty + Synchronized to Nxyter Frame @@ -147,33 +198,71 @@ Number of Parity Errors - - - Delay setting for ADC sample clock - + + + ADC Sampling PLL Clock Not Lock Counter + - - Number of ADC Resets - + + johnson_counter_sync (experts only) + - - Debug Multiplexer selection - - Normal Debug - ADC Nxyter - ADC Testchannel - ADC Reset Handler - + + PLL ADC Sampling Clock DPHASE + + + + + PLL ADC Sampling Clock FINEDELB + - - Current ADC Fifo value - + + Current ADC value + + + + + + + + + Nxyter I2C Register + + + I2C Write Token + + + + I2C Read Token + + + + I2C Write Token + + + + I2c Register Value + + + + diff --git a/xml-db/get.pl b/xml-db/get.pl index 13cbb5a..9e05f21 100755 --- a/xml-db/get.pl +++ b/xml-db/get.pl @@ -279,7 +279,6 @@ sub generateoutput { $addr = $obj->{address}+$slice*$stepsize; #### Prepare table header line - my $wr = 1 if $obj->{mode} =~ /w/; foreach my $b (sort keys %{$data->{$addr}}) { my $ttmp = ""; my $sl; @@ -291,6 +290,7 @@ sub generateoutput { my $fullc = $c; $fullc .= ".$slice" if ($once != 1 && defined $obj->{repeat}); my $cstr = sprintf("%s-0x%04x-%s", $entity,$b,$fullc ); + my $wr = 1 if $db->{$c}->{mode} =~ /w/; $ttmp .= FormatPretty($data->{$addr}->{$b},$db->{$c},"td",($wr?"editable":""),$cstr); } } @@ -298,6 +298,7 @@ sub generateoutput { my $fullc = $name; $fullc .= ".$slice" if ($once != 1 && defined $obj->{repeat}); my $cstr = sprintf("%s-0x%04x-%s", $entity,$b,$fullc ); + my $wr = 1 if $obj->{mode} =~ /w/; $ttmp .= FormatPretty($data->{$addr}->{$b},$obj,"td",($wr?"editable":""),$cstr); } push (@tarr,$ttmp); diff --git a/xml-db/put.pl b/xml-db/put.pl index ad325c8..562e56f 100755 --- a/xml-db/put.pl +++ b/xml-db/put.pl @@ -123,7 +123,7 @@ sub writedata { return -2; } - foreach my $b (keys $o) { + foreach my $b (keys %$o) { $old = $o->{$b}; my $mask = ~(((1<<$obj->{bits})-1) << $obj->{start}); $old = $old & $mask;