From: Carsten Schwarz Date: Tue, 11 Feb 2025 13:59:07 +0000 (+0100) Subject: update feb25 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=86ce88641a2ce922deed726f014f896b7c575ede;p=daqtools.git update feb25 --- diff --git a/users/gsi_dirc/addresses_dirich.db b/users/gsi_dirc/addresses_dirich.db index 5476760..9837c35 100644 --- a/users/gsi_dirc/addresses_dirich.db +++ b/users/gsi_dirc/addresses_dirich.db @@ -3,10 +3,18 @@ # Address # S/N # FPGA -#0x2014 1107 1 -0x2015 0906 1 -0x2016 0915 1 -0x2017 0905 1 +#0x2014 1324 1 +#0x2015 1325 1 +#0x2016 1317 1 +#0x2017 3876 1 +#0x2018 3877 1 +0x2019 1314 1 +0x2020 3875 1 +#0x2021 1303 1 + + + + #0x1205 0541 1 #0x1206 0591 1 #0x1207 1601 1 diff --git a/users/gsi_dirc/check_ping.pl b/users/gsi_dirc/check_ping.pl index 67e813d..8bf4379 100755 --- a/users/gsi_dirc/check_ping.pl +++ b/users/gsi_dirc/check_ping.pl @@ -33,7 +33,7 @@ my $map = { -1 => { trb => 56, sys => "CTS" }, }; -my $MAX_PROCESSES=10; +my $MAX_PROCESSES=19; my $pm = Parallel::ForkManager->new($MAX_PROCESSES); my $maximal_reboot_counter = 4; my $number_of_reboots_done = 0; diff --git a/users/gsi_dirc/dirich_voltages.sh b/users/gsi_dirc/dirich_voltages.sh index c8fdc26..f39ba85 100755 --- a/users/gsi_dirc/dirich_voltages.sh +++ b/users/gsi_dirc/dirich_voltages.sh @@ -4,10 +4,20 @@ echo "power current " ../frankfurt_test/trb3scadc.pl 0x8005 4 echo "concentrator " ../frankfurt_test/trb3scadc.pl 0x8005 2 +echo "drich 2014" +../frankfurt_test/trb3scadc.pl 0x2014 1 echo "drich 2015" ../frankfurt_test/trb3scadc.pl 0x2015 1 echo "drich 2016" ../frankfurt_test/trb3scadc.pl 0x2016 1 echo "drich 2017" ../frankfurt_test/trb3scadc.pl 0x2017 1 +echo "drich 2018" +../frankfurt_test/trb3scadc.pl 0x2018 1 +echo "drich 2019" +../frankfurt_test/trb3scadc.pl 0x2019 1 +echo "drich 2020" +../frankfurt_test/trb3scadc.pl 0x2020 1 +echo "drich 2021" +../frankfurt_test/trb3scadc.pl 0x2021 1 diff --git a/users/gsi_dirc/lv_dirich/dirich_lv_on.sh b/users/gsi_dirc/lv_dirich/dirich_lv_on.sh index e7ebf3a..368315f 100755 --- a/users/gsi_dirc/lv_dirich/dirich_lv_on.sh +++ b/users/gsi_dirc/lv_dirich/dirich_lv_on.sh @@ -5,26 +5,26 @@ resources = pyvisa.ResourceManager('@py') hmp4040 = resources.open_resource('TCPIP::192.168.0.71::5025::SOCKET') # hmp4040.write('INST OUT1') -hmp4040.write('VOLT 2.0') -hmp4040.write('CURR 5.0') +hmp4040.write('VOLT 1.5') +hmp4040.write('CURR 10') hmp4040.write('OUTP:SEL ON') time.sleep(0.2) # hmp4040.write('INST OUT2') -hmp4040.write('VOLT 2.1') +hmp4040.write('VOLT 2.5') hmp4040.write('CURR 3.0') hmp4040.write('OUTP:SEL ON') time.sleep(0.2) # hmp4040.write('INST OUT3') -hmp4040.write('VOLT 2.8') -hmp4040.write('CURR 1.0') +hmp4040.write('VOLT 3.1') +hmp4040.write('CURR 2.0') hmp4040.write('OUTP:SEL ON') time.sleep(0.2) # hmp4040.write('INST OUT4') hmp4040.write('VOLT 4.0') -hmp4040.write('CURR 1.0') +hmp4040.write('CURR 2.0') hmp4040.write('OUTP:SEL ON') time.sleep(0.2) # diff --git a/users/gsi_dirc/readout.pl b/users/gsi_dirc/readout.pl index bd601c2..7516c45 100755 --- a/users/gsi_dirc/readout.pl +++ b/users/gsi_dirc/readout.pl @@ -4,7 +4,7 @@ use strict; use Getopt::Long; my $help = ""; -my $dataPath = "/d/jul2023/"; +my $dataPath = "/d/jul2024/"; my $label = "cern"; my $time = -1; my $name = "pulser_"; @@ -56,7 +56,7 @@ if(!defined $old) { else { #$c=qq|xterm -geometry 122x15-0+0 -e bash -c 'daq_evtbuild -S $label -m 9 -x $name --filesize 1536 -d file -o $dataPath'|; - $c=qq|xterm -geometry 122x15-0+0 -e bash -c 'daq_evtbuild -S $label -m 2 -x $name --filesize 1536 -d file -o $dataPath'|; + $c=qq|xterm -geometry 122x15-0+0 -e bash -c 'daq_evtbuild -S $label -m 13 -x $name --filesize 1536 -d file -o $dataPath'|; #2016 $c=qq|xterm -geometry 122x15-0+0 -e bash -c 'daq_evtbuild -S $label -m 10 -x $name --filesize 1536 -d file -o $dataPath'|; #$c=qq|xterm -geometry 122x16-0+0 -e bash -c 'daq_evtbuild -S $label -m 23 -x $name -d file -o $dataPath'|; print "test"; @@ -74,7 +74,7 @@ else { #$c=qq"xterm -geometry 82x45-0+210 -e bash -c 'daq_netmem -S $label -m 10 -i UDP:127.0.0.1:49999 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50001 -i UDP:127.0.0.1:50002 -i UDP:127.0.0.1:50003 -i UDP:127.0.0.1:50004 -i UDP:127.0.0.1:50005 -i UDP:127.0.0.1:50006 -i UDP:127.0.0.1:50007 -i UDP:127.0.0.1:50008'"; - $c=qq"xterm -geometry 82x44-0+234 -e bash -c 'daq_netmem -S $label -m 2 -i UDP:127.0.0.1:49999 -i UDP:127.0.0.1:50004; sleep 2 '"; + $c=qq"xterm -geometry 82x44-0+234 -e bash -c 'daq_netmem -S $label -m 13 -i UDP:127.0.0.1:49999 -i UDP:127.0.0.1:50004; sleep 2 '"; #$c=qq"xterm -geometry 82x44-0+234 -e bash -c 'daq_netmem -S $label -m 23 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50001 -i UDP:127.0.0.1:50002 -i UDP:127.0.0.1:50003 -i UDP:127.0.0.1:50004 -i UDP:127.0.0.1:50005 -i UDP:127.0.0.1:50006 -i UDP:127.0.0.1:50007 -i UDP:127.0.0.1:50008 -i UDP:127.0.0.1:50009 -i UDP:127.0.0.1:50010 -i UDP:127.0.0.1:50011 -i UDP:127.0.0.1:50012 -i UDP:127.0.0.1:50013 -i UDP:127.0.0.1:50014 -i UDP:127.0.0.1:50015 -i UDP:127.0.0.1:50016 -i UDP:127.0.0.1:50017 -i UDP:127.0.0.1:50018 -i UDP:127.0.0.1:50019 -i UDP:127.0.0.1:50020 -i UDP:127.0.0.1:50021 -i UDP:127.0.0.1:50022; sleep 2'"; diff --git a/users/gsi_dirc/register_config_tdc.db b/users/gsi_dirc/register_config_tdc.db index 78850a2..873487c 100644 --- a/users/gsi_dirc/register_config_tdc.db +++ b/users/gsi_dirc/register_config_tdc.db @@ -56,10 +56,14 @@ 0x2010 0 0x0000ffff 0x00000000 - 0x2014 0 0xffffffff 0x00000000 - 0x2015 0 0xffffffff 0x00000000 - 0x2016 0 0xffffffff 0x00000000 - 0x2017 0 0xffffffff 0x00000000 +# 0x2014 0 0xffffffff 0x00000000 +# 0x2015 0 0xffffffff 0x00000000 +# 0x2016 0 0xffffffff 0x00000000 +# 0x2017 0 0xffffffff 0x00000000 +# 0x2018 0 0xffffffff 0x00000000 + 0x2019 0 0xffffffff 0x00000000 + 0x2020 0 0xffffffff 0x00000000 +# 0x2021 0 0xffffffff 0x00000000 diff --git a/users/gsi_dirc/startup.sh b/users/gsi_dirc/startup.sh index e9ef60a..09deb61 100755 --- a/users/gsi_dirc/startup.sh +++ b/users/gsi_dirc/startup.sh @@ -312,7 +312,7 @@ echo "padiwa_threshold_results loading" #./HADESthreshscan_v1 --no-autosave -f ~/trbsoft/daqtools/users/gsi_dirc/thresholds/dirich/20220914_113041_std_save.thr -l 0 -t 60 # Use latest threshold -~/trbsoft/daqtools/thresholds/trb_dirich_threshold/HADESthreshscan_v1 -l 0 -t 0 40 +~/trbsoft/daqtools/thresholds/trb_dirich_threshold/HADESthreshscan_v1 --no-autosave -l 0 -t 0 40 # diff --git a/users/gsi_dirc/trbreset_loop.pl b/users/gsi_dirc/trbreset_loop.pl index f1a73a2..185acb2 100755 --- a/users/gsi_dirc/trbreset_loop.pl +++ b/users/gsi_dirc/trbreset_loop.pl @@ -4,7 +4,8 @@ use strict; use warnings; ### Change THIS! -my $required_endpoints = 14; +# 2xTRB=10 + 2 Dirich + 1 Concentrator +my $required_endpoints = 13; # barrel my $required_endpoints = 25;