From d021c8f219223181ef7475c4cce5c89246abecc0 Mon Sep 17 00:00:00 2001 From: "Hadaq@styx" Date: Mon, 13 Jan 2014 02:50:10 +0100 Subject: [PATCH] new gen of histograming --- users/cosy_test/config/cts.sh | 2 +- users/cosy_test/config/trbstart.sh | 4 +- users/cosy_test/evtbuilder_start.sh | 2 +- users/cosy_test/nxscripts/mode_t.sh | 2 +- users/cosy_test/trbnet_env_pexor.sh | 1 - web/htdocs/nxyter/index.pl | 2 +- web/include/CtsCommands.pm | 4 +- xml-db/database/Nxyter.xml | 61 ++++++++++++++++++++--------- 8 files changed, 52 insertions(+), 26 deletions(-) diff --git a/users/cosy_test/config/cts.sh b/users/cosy_test/config/cts.sh index 9d7d137..2fc464d 100755 --- a/users/cosy_test/config/cts.sh +++ b/users/cosy_test/config/cts.sh @@ -9,7 +9,7 @@ trbcmd w 0x8000 0xa141 0x05f5e100 #periodic pulser 1 at 1 Hz for 0xE trigger ty trbcmd loadbit 0x8000 0xa148 0x0f00 0x0e00 # setting trigger type E for second pulser #trbcmd setbit 0x8000 0xa101 0x6 # turn on periodic pulser 1 and 0 trbcmd setbit 0x8000 0xa101 0x2 # turn on periodic pulser 0 -#trbcmd setbit 0x8000 0xa101 0x4 # turn on periodic pulser 1 +trbcmd setbit 0x8000 0xa101 0x4 # turn on periodic pulser 1 #trbcmd loadbit 0x8000 0xa13d 0x7f 0xa # setting multiplexer input trbcmd loadbit 0x8000 0xa13d 0x7f 0xc # nim 1 diff --git a/users/cosy_test/config/trbstart.sh b/users/cosy_test/config/trbstart.sh index e1fc641..b187ca9 100755 --- a/users/cosy_test/config/trbstart.sh +++ b/users/cosy_test/config/trbstart.sh @@ -18,6 +18,8 @@ TRBNUM=129 #../../../tools/command_client.pl -e etraxp$TRBNUM -c 'rw_trbv2 --trb w 0 c2 007E0100; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100' # low res for TOF | here is the change -../../../tools/command_client.pl -e etraxp$TRBNUM -c 'rw_trbv2 --trb w 0 c2 007E0000; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100' +#../../../tools/command_client.pl -e etraxp$TRBNUM -c 'rw_trbv2 --trb w 0 c2 007E0000; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100' +# || - reference token delay, 25ns per bit +../../../tools/command_client.pl -e etraxp$TRBNUM -c 'rw_trbv2 --trb w 0 c2 00000000; rw_trbv2 --trb w 0 c0 0a000000; rw_trbv2 --trb w 0 c3 00000100' diff --git a/users/cosy_test/evtbuilder_start.sh b/users/cosy_test/evtbuilder_start.sh index 1849f8b..ebb421c 100755 --- a/users/cosy_test/evtbuilder_start.sh +++ b/users/cosy_test/evtbuilder_start.sh @@ -4,7 +4,7 @@ dest="/scratch/c/hldfiles" sdest="/scratch/c/shldfiles" tmpdir="/tmp/eventbuild" pref="te" -sden=0 +sden=1 usage() { echo "Usage: $0 [-d ] [-s ] [-p ] [-t] [-h]" diff --git a/users/cosy_test/nxscripts/mode_t.sh b/users/cosy_test/nxscripts/mode_t.sh index 446576c..5dcc2dc 100755 --- a/users/cosy_test/nxscripts/mode_t.sh +++ b/users/cosy_test/nxscripts/mode_t.sh @@ -9,4 +9,4 @@ trbcmd setbit $addr $(( 0x8200 + 32 )) 0x08 trbcmd w $addr 0x8160 1 trbcmd w $addr 0x8140 100 -trbcmd w $addr 0x8218 0 +trbcmd w $addr 0x8218 0xff diff --git a/users/cosy_test/trbnet_env_pexor.sh b/users/cosy_test/trbnet_env_pexor.sh index f66d463..b559d3b 100755 --- a/users/cosy_test/trbnet_env_pexor.sh +++ b/users/cosy_test/trbnet_env_pexor.sh @@ -6,7 +6,6 @@ EXTRALIB=${HOME}/usr/lib64:${HOME}/projects/install/lib HADESLIB=${HOME}/trbsoft/trbnettools/lib export LD_LIBRARY_PATH=${HADESLIB}:${EXTRALIB}:${LD_LIBRARY_PATH} -export PATH=${HOME}/bin:${HOME}/usr/bin:${PATH} TRBSOFT=${HOME}/trbsoft diff --git a/web/htdocs/nxyter/index.pl b/web/htdocs/nxyter/index.pl index 57fcfbc..52f2bb1 100755 --- a/web/htdocs/nxyter/index.pl +++ b/web/htdocs/nxyter/index.pl @@ -43,7 +43,7 @@ $setup[4]->{period} = -1; $setup[4]->{address} = 1; $setup[5]->{name} = "NXHistograms"; -$setup[5]->{cmd} = "Nxyter-0xfe49-NXHistos&Nxyter-0xfe49-NXHistos"; +$setup[5]->{cmd} = "Nxyter-0xfe49-NXHistos-rate"; $setup[5]->{period} = -1; $setup[5]->{address} = 1; diff --git a/web/include/CtsCommands.pm b/web/include/CtsCommands.pm index e51e4e8..a099a6f 100644 --- a/web/include/CtsCommands.pm +++ b/web/include/CtsCommands.pm @@ -478,7 +478,7 @@ EOF # generate plot if ($gnuplot_fh) { - shift @$plotData if $#{ $plotData } > 30; + shift @$plotData if $#{ $plotData } > 180; push @$plotData, [ $time, $rates->{'cts_cnt_trg_asserted.value'}{'rate'}, @@ -546,4 +546,4 @@ EOF } } -1; \ No newline at end of file +1; diff --git a/xml-db/database/Nxyter.xml b/xml-db/database/Nxyter.xml index d405174..cb80ec2 100644 --- a/xml-db/database/Nxyter.xml +++ b/xml-db/database/Nxyter.xml @@ -33,12 +33,12 @@ address="0004" size="2" purpose="status" mode="r" continuous="true"> Total hit rate summed over all channels - + - Rate of Incoming Nxyter + ADC Frames, must be 31.25MHz - + Rate of Incoming Nxyter + ADC Frames, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> + @@ -75,7 +75,7 @@ Accepted incoming Trigger Rate - + @@ -96,7 +96,7 @@ Testpulse Rate - + @@ -231,8 +231,8 @@ - Data Rate being written to Event Buffer in Hz - + Data Rate being written to Event Buffer in s<sup>-1</sup> + @@ -342,13 +342,13 @@ - Nxyter Timestamp Frame Rate, must be 31.25 MHz - + Nxyter Timestamp Frame Rate, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> + - ADC Data Frame Rate, must be 31.25 MHz - + ADC Data Frame Rate, must be 31.25&middot;10<sup>6</sup>s<sup>-1</sup> + @@ -389,9 +389,9 @@ - + Nxyter Testpulse Channel Group (0=0,4,.. 1=1,5,.. 2=2,6,.. 3=3,7,..) - + @@ -506,24 +506,49 @@ + - + address="0000" size="130" purpose="config" mode="rw" continuous="true"> Continuous Hit Counter per Channel - + - + Number of Averages, power of two (2^n) - + + + + + Enable Average mode + + + + + + Continuous Hit Counter per Channel + + + + + Number of Averages, power of two (2^n) + + + + + Enable Average mode + + + + -- 2.43.0