latest changes

diff --git a/users/cosy_test/config/cts.sh b/users/cosy_test/config/cts.sh
index aaec015bfb4232755fa1966b33e8643500c4f0c8..8429d1934900a41fafbe10ebae5b78f5eba0a223 100755 (executable)
--- a/users/cosy_test/config/cts.sh
+++ b/users/cosy_test/config/cts.sh
@@ -2,5 +2,14 @@
 
 echo "Doing CTS configuration"
 
-trbcmd w 0x8000 0xa140 0x000f4240 # pulser freq
+#trbcmd w 0x8000 0xa140 0x000f4240 # pulser freq 100 Hz
+trbcmd w 0x8000 0xa140 0x05f5e0ff # pulser freq 1 Hz
 trbcmd setbit 0x8000 0xa101 0x2 # turn on pulser
+
+trbcmd loadbit 0x8000 0xa13d 0x7f 0xa # setting multiplexer input
+trbcmd loadbit 0x8000 0xa13e 0x7f 0xb # setting multiplexer input
+
+trbcmd loadbit 0x8000 0xa129 0x100 0x100 # setting multiplexer input invert
+
+trbcmd w 0x8000 0xc801 0x000f000f
+

diff --git a/users/cosy_test/config/dhcp/addresses_trb3.db b/users/cosy_test/config/dhcp/addresses_trb3.db
index 95d065e865005710378786c407faf6d1244dc749..41b6958559d48c374cc8abcb4087ae98375cd2db 100755 (executable)
--- a/users/cosy_test/config/dhcp/addresses_trb3.db
+++ b/users/cosy_test/config/dhcp/addresses_trb3.db
@@ -4,8 +4,8 @@
 # Address #  S/N  #  FPGA
 
 
-0x3800             33     0
-0x3801             33     1
+0x3800             33     1
+0x3801             33     0
 0x3802             33     2
 0x3803             33     3
 0x8900      33            5

diff --git a/users/cosy_test/config/gbe/register_configgbe_ip.db b/users/cosy_test/config/gbe/register_configgbe_ip.db
index b8f28395ed140962cf28062c66579f42222fc5ef..ccf93f196b6a6b0a6f5e4259b46ec8ae4f18040a 100755 (executable)
--- a/users/cosy_test/config/gbe/register_configgbe_ip.db
+++ b/users/cosy_test/config/gbe/register_configgbe_ip.db
@@ -33,6 +33,6 @@
 #  0x8800      0       0x607bf78c      0x001d          0x0a9b3b46     0xc350     0xdead8800     0x0230     0x0a9b3b12     0xc350       0x0578
 
 
- 0x8000                0          0x4c80c43e     0xd85d                0xc0a80001        0xc350          0xdead8000    0x0230   0xc0a80216         0xc350          0x0578
- 0x8800                0          0x4c80c43e     0xd85d                0xc0a80001        0xc358          0xdead8800    0x0230   0xc0a80216         0xc358          0x0578
- 0x8900                0          0x4c80c43e     0xd85d                0xc0a80001        0xc359          0xdead8900    0x0230   0xc0a80216         0xc359          0x0578
+ 0x8000                0          0x4c80c43e     0xd85d                0xc0a86401        0xc350          0xdead8000    0x0230   0xc0a86416         0xc350          0x0578
+ 0x8800                0          0x4c80c43e     0xd85d                0xc0a86401        0xc358          0xdead8800    0x0230   0xc0a86416         0xc358          0x0578
+ 0x8900                0          0x4c80c43e     0xd85d                0xc0a86401        0xc359          0xdead8900    0x0230   0xc0a86416         0xc359          0x0578

diff --git a/users/cosy_test/config/nxyter/nxsetup_0x3800.dat b/users/cosy_test/config/nxyter/nxsetup_0x3800.dat
index 2d765d1e6f2f5c9dea603756227fad7e62d8d2d2..eeee72c2bbd546993d2e0d451f63caf1ba543dc4 100644 (file)
--- a/users/cosy_test/config/nxyter/nxsetup_0x3800.dat
+++ b/users/cosy_test/config/nxyter/nxsetup_0x3800.dat
@@ -19,10 +19,10 @@
 0x00000000    # 15  Channel Masks END
 0x000000a0    # 16  
 0x000000ff    # 17
-0x00000041    # 18  Common Threshold, default 0x80
+0x00000028    # 18  Common Threshold, default 0x80
 0x0000001e    # 19
 0x0000005f    # 20
-0x00000074    # 21
+0x0000008a    # 21
 0x00000064    # 22
 0x00000089    # 23
 0x000000ff    # 24  Testpulse Strength, default 0x80

diff --git a/users/cosy_test/config/nxyter/nxsetup_0x3801.dat b/users/cosy_test/config/nxyter/nxsetup_0x3801.dat
index 830702d3e56e77f196077b755dfc2c46b1bfd072..503ccf31172e21d75d9652229e96df1a95a2e267 100644 (file)
--- a/users/cosy_test/config/nxyter/nxsetup_0x3801.dat
+++ b/users/cosy_test/config/nxyter/nxsetup_0x3801.dat
@@ -19,10 +19,10 @@
 0x00000000    # 15  Channel Masks END
 0x000000a0    # 16  
 0x000000ff    # 17
-0x0000005a    # 18  Common Threshold, default 0x80
+0x00000028    # 18  Common Threshold, default 0x80
 0x0000001e    # 19
 0x0000005f    # 20
-0x00000088    # 21
+0x0000008e    # 21
 0x00000064    # 22
 0x00000089    # 23
 0x000000ff    # 24  Testpulse Strength, default 0x80

diff --git a/users/cosy_test/config/nxyter/nxsetup_0x3802.dat b/users/cosy_test/config/nxyter/nxsetup_0x3802.dat
index 65c920d3f318e9ec10dc612d75bb9128d7ea81e6..1afed2b0ddb7ffe3c8655e771b69a9a2c8342c99 100644 (file)
--- a/users/cosy_test/config/nxyter/nxsetup_0x3802.dat
+++ b/users/cosy_test/config/nxyter/nxsetup_0x3802.dat
@@ -19,10 +19,10 @@
 0x00000000    # 15  Channel Masks END
 0x000000a0    # 16  
 0x000000ff    # 17
-0x00000041    # 18  Common Threshold, default 0x80
+0x00000028    # 18  Common Threshold, default 0x80
 0x0000001e    # 19
 0x0000005f    # 20
-0x0000008c    # 21
+0x0000009b    # 21
 0x00000064    # 22
 0x00000089    # 23
 0x000000ff    # 24  Testpulse Strength, default 0x80

diff --git a/users/cosy_test/config/nxyter/nxsetup_0x3803.dat b/users/cosy_test/config/nxyter/nxsetup_0x3803.dat
index 4e42fa6f7033bbe5c026e5a9ef72eeeaa825039c..f7506a9412859a6b887d71d50e75e22464631ad8 100644 (file)
--- a/users/cosy_test/config/nxyter/nxsetup_0x3803.dat
+++ b/users/cosy_test/config/nxyter/nxsetup_0x3803.dat
@@ -19,10 +19,10 @@
 0x00000000    # 15  Channel Masks END
 0x000000a0    # 16  
 0x000000ff    # 17
-0x0000005a    # 18  Common Threshold, default 0x80
+0x00000028    # 18  Common Threshold, default 0x80
 0x0000001e    # 19
 0x0000005f    # 20
-0x0000008c    # 21
+0x000000a8    # 21
 0x00000064    # 22
 0x00000089    # 23
 0x000000ff    # 24  Testpulse Strength, default 0x80

diff --git a/users/cosy_test/config/nxyter/trb3_setup.sh b/users/cosy_test/config/nxyter/trb3_setup.sh
index 801366aa60496d731a9cb7238e3e4900a850b359..97fb2291918adc2895ab9519cf259bad1ab5fc99 100755 (executable)
--- a/users/cosy_test/config/nxyter/trb3_setup.sh
+++ b/users/cosy_test/config/nxyter/trb3_setup.sh
@@ -37,6 +37,8 @@ trbcmd w $board 0x8401 0      # window  offset 200ns
 trbcmd w $board 0x8402 250    # window width 800ns
 trbcmd w $board 0x8403 125    # CTS-Delay 400ns
 
+trbcmd w $board 0x8140 100     # test pulse length 400 ns
+
 # Decoder Settings
 trbcmd w $board 0x8120 0      # reset all counters
 

diff --git a/users/cosy_test/config/programfpga.sh b/users/cosy_test/config/programfpga.sh
index 09025981709cb19489adbd30ae70c5c8b2a4af5d..b5677c5b34bc5ce76247d130fa2c937260e1da9f 100755 (executable)
--- a/users/cosy_test/config/programfpga.sh
+++ b/users/cosy_test/config/programfpga.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 
-echo "Programming FPGAs"
-#Start
-../../../tools/command_client.pl -e etraxp129 -c "jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl " &
+trb2/program_hub.sh &
+trb2/program_start.sh &
 
-#Hub
-../../../tools/command_client.pl -e etraxp022 -c "jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga1_full_20110517.stp"
-echo "Second FPGA"
-../../../tools/command_client.pl -e etraxp022 -c "jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20110523.stp"
+wait
 
-echo "Finished"
\ No newline at end of file

diff --git a/users/cosy_test/config/startup.sh b/users/cosy_test/config/startup.sh
index 00ec78c8ed651b8600e3c3764341875b476fd4d1..cdfe9c3269b8889f11b3bb770f93786c0b528961 100755 (executable)
--- a/users/cosy_test/config/startup.sh
+++ b/users/cosy_test/config/startup.sh
@@ -19,6 +19,9 @@ echo "++ nXYTER"
 ./nxyter.sh
 echo "++ CTS"
 ./cts.sh
+echo "++ Scalers"
+./scalers.sh
+
 echo "================================"
 trbcmd i 0xffff
 echo "================================"

diff --git a/users/cosy_test/config/trb2/program_hub.sh b/users/cosy_test/config/trb2/program_hub.sh
index 90f79173a2c04e7f505688ea004999f712dec39f..b1f342241136273bbc14c6c2680a03c6d703e1e6 100755 (executable)
--- a/users/cosy_test/config/trb2/program_hub.sh
+++ b/users/cosy_test/config/trb2/program_hub.sh
@@ -1,9 +1,15 @@
 #!/bin/bash
 
-echo "Programming FPGAs - HUB"
+echo "HUB: Programming FPGA #1"
 #Hub
-../../../tools/command_client.pl -e etraxp022 -c "jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga1_full_20110517.stp"
-echo "Second FPGA"
-../../../tools/command_client.pl -e etraxp022 -c "jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20110523.stp"
+cmd="../../../tools/command_client.pl -e etraxp022 -c 'jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga1_full_20110517.stp'"
+echo ${cmd}
+#{cmd}
+../../../tools/command_client.pl -e etraxp022 -c 'jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga1_full_20110517.stp'
+echo "HUB: Programming FPGA #2"
 
+cmd="../../../tools/command_client.pl -e etraxp022 -c 'jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20110523.stp'"
+echo ${cmd}
+#${cmd}
+../../../tools/command_client.pl -e etraxp022 -c 'jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20110523.stp'
 echo "Finished HUB"

diff --git a/users/cosy_test/config/trb2/program_start.sh b/users/cosy_test/config/trb2/program_start.sh
index 73f22920d924c1bad823d9743b0f2e860d3b0882..968e6a499919cc5b43215fda993b43802a1d8957 100755 (executable)
--- a/users/cosy_test/config/trb2/program_start.sh
+++ b/users/cosy_test/config/trb2/program_start.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 
-echo "Programming FPGAs - START"
-#Start
+echo "START: Programming FPGAs"
+
+cmd="../../../tools/command_client.pl -e etraxp129 -c 'jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl'"
+
+echo "${cmd}"
+
+#${cmd}
+
 ../../../tools/command_client.pl -e etraxp129 -c "jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl "
 
 echo "Finished START"

diff --git a/users/cosy_test/config/trbstart.sh b/users/cosy_test/config/trbstart.sh
index 609e9d52513014029b4e617771119778d3c616b5..e1fc641d36aef8c3feb3c3e26cc461ab07b2ab5c 100755 (executable)
--- a/users/cosy_test/config/trbstart.sh
+++ b/users/cosy_test/config/trbstart.sh
@@ -9,7 +9,8 @@ TRBNUM=129
 
 #../../../tools/command_client.pl -e etraxp$TRBNUM -c 'spi_trbv2_rl /home/hadaq/start_and_veto/thresholds_test'
 #../../../tools/command_client.pl -e etraxp$TRBNUM -c 'spi_trbv2_rl /home/hadaq/start/run.cfg'
-../../../tools/command_client.pl -e etraxp$TRBNUM -c 'spi_trbv2_rl /home/hadaq/start/all_pmt.cfg'
+#../../../tools/command_client.pl -e etraxp$TRBNUM -c 'spi_trbv2_rl /home/hadaq/start/all_pmt.cfg'
+../../../tools/command_client.pl -e etraxp$TRBNUM -c 'spi_trbv2_3 /home/hadaq/start_and_veto/thresholds_juelich_129_12_2013'
 
 ../../../tools/command_client.pl -e etraxp$TRBNUM -c "cd /home/hadaq/scripts/; ./trbv2_TDCs_configure.sh ${TRBNUM}"
 

diff --git a/users/cosy_test/nxscripts/mode_st.sh b/users/cosy_test/nxscripts/mode_st.sh
index ee88388f3803b43a5e276e8c9f96fb321c24aa9a..daaea5814734a910fea9689b617c35cefae3b0c5 100755 (executable)
--- a/users/cosy_test/nxscripts/mode_st.sh
+++ b/users/cosy_test/nxscripts/mode_st.sh
@@ -7,4 +7,6 @@
 trbcmd clearbit $addr $(( 0x8200 + 32 )) 0x01
 trbcmd clearbit $addr $(( 0x8200 + 32 )) 0x08
 
+trbcmd w $addr 0x8218 0
+
 trbcmd w $addr 0x8160 0

diff --git a/users/cosy_test/nxscripts/mode_t.sh b/users/cosy_test/nxscripts/mode_t.sh
index 5c36483be97971d8948f29703a905687db25183c..446576cd6c7af9e80b43dbb22d5f8472c2a99f5a 100755 (executable)
--- a/users/cosy_test/nxscripts/mode_t.sh
+++ b/users/cosy_test/nxscripts/mode_t.sh
@@ -8,3 +8,5 @@ trbcmd setbit $addr $(( 0x8200 + 32 )) 0x08
 
 trbcmd w $addr 0x8160 1
 trbcmd w $addr 0x8140 100
+
+trbcmd w $addr 0x8218 0

diff --git a/users/cosy_test/nxscripts/mode_tp.sh b/users/cosy_test/nxscripts/mode_tp.sh
index c8a93224bfb2baf2d8345513eb799a020cc41b45..adf77efedbe8538ce373f1e33c0df8a83a7bcc82 100755 (executable)
--- a/users/cosy_test/nxscripts/mode_tp.sh
+++ b/users/cosy_test/nxscripts/mode_tp.sh
@@ -10,5 +10,7 @@
 trbcmd setbit $addr $(( 0x8200 + 32 )) 0x01
 trbcmd setbit $addr $(( 0x8200 + 32 )) 0x08
 
+trbcmd w $addr 0x8218 0xff
+
 trbcmd w $addr 0x8160 1
 trbcmd w $addr 0x8140 100

diff --git a/users/cosy_test/trbnet_env_pexor.sh b/users/cosy_test/trbnet_env_pexor.sh
index d0b1efb2b07ad86d22b6412e6e1ce6b7456c22cc..ea234979b48233c016b87a93efd48de6f406b31c 100755 (executable)
--- a/users/cosy_test/trbnet_env_pexor.sh
+++ b/users/cosy_test/trbnet_env_pexor.sh
@@ -20,6 +20,6 @@ echo "TRBnet environment ready to use!"
 echo "================================"
 echo ""
 
-PS1=${COLOR_YELLOW}'\u@\h\[\033[01;34m\] \w$(parse_git_branch)'${COLOR_NC}' '
+#PS1=${COLOR_YELLOW}'\u@\h\[\033[01;34m\] \w$(parse_git_branch)'${COLOR_NC}' '
 
-[ -z "$(pidof trbnetd)" ] && /home/hadaq/trbsoft/trbnettools/binlocal/trbnetd
+[ -z "$(pidof trbnetd)" ] && /home/hadaq/trbsoft/trbnettools/bin/trbnetd

diff --git a/users/cosy_test/trbnet_env_trb3.sh b/users/cosy_test/trbnet_env_trb3.sh
index 149a2294595405a27a9b38d3883d92b49b24b60c..9ac718b670fcb9a3f4da480241f9ee281f16de8b 100755 (executable)
--- a/users/cosy_test/trbnet_env_trb3.sh
+++ b/users/cosy_test/trbnet_env_trb3.sh
@@ -3,7 +3,7 @@
 export TRB3_SERVER=trb3069
 
 if [ -z "$(pidof trbnetd)" ]; then
-       /home/hadaq/trbsoft/trbnettools_trb3/binlocal/trbnetd
+       /home/hadaq/trbsoft/trbnettools_trb3/bin/trbnetd
 fi
 
 . /home/hadaq/trbsoft/daqtools/users/cosy_test/trbnet_env_pexor.sh