updated Frankfurt test setup files

diff --git a/users/frankfurt_test/adcsettings.sh b/users/frankfurt_test/adcsettings.sh
index bf2fc091c7d6bd465344c691c6b6f46e6a8c5509..30fb4afff7d1eed9d966abe65232a8ccd06ebb14 100755 (executable)
--- a/users/frankfurt_test/adcsettings.sh
+++ b/users/frankfurt_test/adcsettings.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 
 #Disable second TRB3 & unused ADC FPGA
-trbcmd w 0x8000 0xc0 0x0fe8
-trbcmd w 0x8000 0xc1 0x0fe8
-trbcmd w 0x8000 0xc3 0x0ff8
+trbcmd w 0xc000 0xc0 0x0ff9
+trbcmd w 0xc000 0xc1 0x0ff9
+trbcmd w 0xc000 0xc3 0x0ff9
 
 
 cd ../../tools/
-./adc.pl 0xfe4b init
-./adc.pl 0xfe4b adc_phase 1
+./adc.pl 0x5003 init
 cd ../users/frankfurt_test
 
 

diff --git a/users/frankfurt_test/evtbuilder_start.sh b/users/frankfurt_test/evtbuilder_start.sh
index ec2ced3dad976d929efd25f6aeee1dbf3f3b104a..54060a63722d175d593e6d4ea64ff19dfe5453cb 100755 (executable)
--- a/users/frankfurt_test/evtbuilder_start.sh
+++ b/users/frankfurt_test/evtbuilder_start.sh
@@ -51,26 +51,26 @@ extraopts="--online"
 cd $tmpdir
 
 
-if [ $num = 1 ]; then
-  exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 1 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file; read; bash" &
-fi
-if [ $num = 2 ]; then
-  exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 2 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file \
-${extraopts}; read; bash" &
-fi
+#if [ "$num" -eq "1" ] ; then
+  exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "daq_evtbuild -m 1 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file; read; bash" &
+#fi
+#if [ "$num" -eq "2" ]; then
+#  exec uxterm -fg black -bg khaki -geometry 120x20+0+45 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_evtbuild -m 2 -o ${dest} -x ${pref} -I 1 --ebnum 1 -q 32 -S test -d file \
+#${extraopts}; read; bash" &
+#fi
 
 pid=$!
 echo $pid > $tmpdir/.daq_evtbuild.pid
 
 sleep 1
 
-if [ $num = 1 ]; then
-  exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 1 -i UDP:0.0.0.0:50000 -q 32 -d 1 -S test ;  " &
-fi
+#if [ "$num" -eq "1" ]; then
+  exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "daq_netmem -m 1 -i UDP:0.0.0.0:50000 -q 32 -d 1 -S test ;  " &
+#fi
 
-if [ $num = 2 ]; then
-  exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 2 -i UDP:0.0.0.0:50000 -i UDP:0.0.0.0:50003 -q 32 -d 1 -S test ;  " &
-fi
+#if [ "$num" -eq "2" ]; then
+#  exec uxterm -fg black -bg tan -geometry 120x20+0+345 -e "/d/jspc22/trb/git/daqdata/hadaq/daq_netmem -m 2 -i UDP:0.0.0.0:50000 -i UDP:0.0.0.0:50003 -q 32 -d 1 -S test ;  " &
+#fi
 pid=$!
 echo $pid > $tmpdir/.daq_netmem.pid
 

diff --git a/users/frankfurt_test/register_configgbe.db b/users/frankfurt_test/register_configgbe.db
index be145980fdaadec6aa5e3974823e1d49e8b996ea..2e74a4b284a215db12b58d451d20a49a8eee8467 100755 (executable)
--- a/users/frankfurt_test/register_configgbe.db
+++ b/users/frankfurt_test/register_configgbe.db
@@ -18,5 +18,6 @@
   0x8100      0       0x8100     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7 
   0x8200      0       0x8200     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7 
   0x8820      0       0x8200     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7 
+  0xc000      0       0x8000     0x00020001   0x00030062     0xFDE8       0x578          1            0            0        0xffffff      0x7 
 
 

diff --git a/users/frankfurt_test/register_configgbe_ip.db b/users/frankfurt_test/register_configgbe_ip.db
index a9aec07a08e2572387c24b3c3d820776a67ff0a8..7c30cb0355d13ae4dac138ae1d9ad1b5fe998712 100755 (executable)
--- a/users/frankfurt_test/register_configgbe_ip.db
+++ b/users/frankfurt_test/register_configgbe_ip.db
@@ -32,4 +32,7 @@
  0x8100                0   0x546C5E8B    0x0008      0xc0a800fe      0xc352     0xdead8100     0x0230   0xc0a80088      0xc350     0x0578
  0x8200                0   0x546C5E8B    0x0008      0xc0a800fe      0xc353     0xdead8200     0x0230   0xc0a80089      0xc350     0x0578
  0x8820                0   0x546C5E8B    0x0008      0xc0a800fe      0xc354     0xdead8820     0x0230   0xc0a8008a      0xc350     0x0578
+ 0xc000                0   0x546C5E8B    0x0008      0xc0a800fe      0xc351     0xdead8000     0x0230   0xc0a8008b      0xc350     0x0578
+
+
 

diff --git a/users/frankfurt_test/startup.sh b/users/frankfurt_test/startup.sh
index 492a211dab33935b7152e48d536eaaaf2ae54643..cfcdfe3f5366c7d31f9b0ec539cd72fc0d796414 100755 (executable)
--- a/users/frankfurt_test/startup.sh
+++ b/users/frankfurt_test/startup.sh
@@ -17,7 +17,7 @@ trbcmd s  0xe1000003133e4b28  0x02 0xf102
 trbcmd s  0xef000003133e3228  0x03 0xf103
 
 #90
-trbcmd s  0x2f0000046f397d28  0x05 0x8000
+trbcmd s  0x2f0000046f397d28  0x05 0xc000
 trbcmd s  0x810000046f398928  0x01 0x5001
 trbcmd s  0xa50000046f398628  0x00 0x5000
 trbcmd s  0x220000046f399228  0x02 0x5002