From 8d32c196e6b4259513516cf6bc9a64c741007e6b Mon Sep 17 00:00:00 2001 From: hadaq Date: Mon, 3 Aug 2015 16:55:30 +0200 Subject: [PATCH] status after sucessful beamtime, mt --- dmon/scripts/dmon_evtbnetmem.pl | 105 ++++++++++---- dmon/scripts/dmon_qa.pl | 2 +- thresholds/logger_threshold.conf | 2 +- thresholds/run_thresh_on_system.pl | 12 ++ thresholds/thresholds_automatic.pl | 5 +- thresholds/thresholds_compare_dirc.pl | 6 +- users/gsi_dirc/EventBuilderNew.xml | 31 ++-- users/gsi_dirc/addresses_trb3.db | 22 +-- users/gsi_dirc/dmon_config.pl | 54 +++---- users/gsi_dirc/first.C | 10 +- users/gsi_dirc/padiwa_led_off.pl | 22 ++- users/gsi_dirc/prepare_padiwas_invert_leds.pl | 16 ++- users/gsi_dirc/register_config_tdc.db | 19 +-- users/gsi_dirc/register_configgbe.db | 6 +- users/gsi_dirc/register_configgbe_ip.db | 8 +- users/gsi_dirc/start_readout.pl | 80 ----------- users/gsi_dirc/startup.sh | 133 +++++++++--------- users/gsi_dirc/trb_power_cycle | 2 +- users/gsi_dirc/trbreset_loop.pl | 8 +- web/cts_gui | 10 +- web/httpi | 2 +- 21 files changed, 281 insertions(+), 274 deletions(-) delete mode 100755 users/gsi_dirc/start_readout.pl diff --git a/dmon/scripts/dmon_evtbnetmem.pl b/dmon/scripts/dmon_evtbnetmem.pl index 93d9c82..881d794 100755 --- a/dmon/scripts/dmon_evtbnetmem.pl +++ b/dmon/scripts/dmon_evtbnetmem.pl @@ -12,6 +12,10 @@ use lib "../perllibs/"; use List::Util qw[min max]; use Dmon; use Data::Dumper; +use LWP::Simple; + +# please change to 1 if you use the "old"-eventbuilder, 0 for dabc +my $old_eb = 0; my %config = Dmon::StartUp(); @@ -27,14 +31,27 @@ my $shm_string = $config{EvtbNetmem}->{shm_string}; my $eb_shm = "/dev/shm/daq_evtbuild$shm_string.shm"; my $nm_shm = "/dev/shm/daq_netmem$shm_string.shm"; +my $url = "http://localhost:8090/EventBuilder/Terminal/Output/value/get.json"; -while (1) { +my $content; +my $number_of_events; +my $number_of_bytes; +my $eb_data; +my $nm_data; +while (1) { +if(!$old_eb) { + $content = get $url; + next if(!defined $content); + ($number_of_events) = $content =~ /Events:(.*?)Rate/; + ($number_of_bytes) = $content =~ /Data:(.*?)Rate/; +} +else { + $eb_data = slurp_shm($eb_shm); + $nm_data = slurp_shm($nm_shm); +} - my $eb_data = slurp_shm($eb_shm); - my $nm_data = slurp_shm($nm_shm); - # print "evtbuid keys: \n".join(" ",sort keys %$eb_data)."\n\n"; # print "netmem keys: \n".join(" ",sort keys %$nm_data)."\n\n"; # #evtbuid keys: @@ -52,22 +69,48 @@ while (1) { # print "nm data:\n"; # print Dumper $nm_data; - eval{ +eval{ my $status = Dmon::OK; - $status = Dmon::ERROR unless defined $eb_data->{evtsComplete}; + if($old_eb) { + $status = Dmon::ERROR unless defined $eb_data->{evtsComplete}; + } + else { + $status = Dmon::ERROR unless defined $number_of_events; + } my $title = "EvtsComplete"; - my $value = Dmon::SciNotation($eb_data->{evtsComplete}); + + my $value; + if($old_eb) { + $value = Dmon::SciNotation($eb_data->{evtsComplete}); + } + else { + $value = $number_of_events; + } + my $longtext = "See plot"; Dmon::WriteQALog($config{flog},"evtbnetmem",5,$status,$title,$value,$longtext,''); - }; - eval{ +}; +eval{ my $status = Dmon::OK; - $status = Dmon::ERROR unless defined $eb_data->{bytesWritten}; + + if($old_eb) { + $status = Dmon::ERROR unless defined $eb_data->{bytesWritten}; + } + else { + $status = Dmon::ERROR unless defined $number_of_bytes; + } + my $title = "BytesWritten"; - my $value = Dmon::SciNotation($eb_data->{bytesWritten}); + my $value; + if($old_eb) { + $value = Dmon::SciNotation($number_of_bytes); + } + else { + $value = $number_of_bytes; + } my $longtext = "See plot"; Dmon::WriteQALog($config{flog},"eb2",5,$status,$title,$value,$longtext,''); - }; +}; # eval{ # my $status = Dmon::OK; # my $title = "NetmemStatus"; @@ -75,27 +118,27 @@ while (1) { # my $longtext = "See plot"; # Dmon::WriteQALog($config{flog},"eb3",5,$status,$title,$value,$longtext,''); # }; - sleep(1); +sleep(1); } sub slurp_shm { - - my $infile = shift; - open (INFILE, "<", $infile) or return; - binmode (INFILE); - - my $data = {}; - while (1) { - my $string; - my $rawval; - read (INFILE, $string, 32) or last; - ($string) = $string =~ m/^([\w]+)/; - last unless ($string); - read (INFILE, $rawval , 8) or last; - my $number = unpack("L",pack("a8",$rawval)); + + my $infile = shift; + open (INFILE, "<", $infile) or return; + binmode (INFILE); + + my $data = {}; + while (1) { + my $string; + my $rawval; + read (INFILE, $string, 32) or last; + ($string) = $string =~ m/^([\w]+)/; + last unless ($string); + read (INFILE, $rawval , 8) or last; + my $number = unpack("L",pack("a8",$rawval)); # printf("%20s : %16d (0x%016X) \n",$string,$number,$number); - $data->{$string}=$number; - } - close(INFILE); - return $data; + $data->{$string}=$number; + } + close(INFILE); + return $data; } diff --git a/dmon/scripts/dmon_qa.pl b/dmon/scripts/dmon_qa.pl index e31cd41..b2cd613 100755 --- a/dmon/scripts/dmon_qa.pl +++ b/dmon/scripts/dmon_qa.pl @@ -41,7 +41,7 @@ while($a = ) { if($readlines++ > 10000) { $readlines = 0; close(FLOG); - system "cat " . Dmon::DMONDIR . "/qalog >> " . $config{UserDirectory} . "/qalog_persist"; + system "cat " . Dmon::DMONDIR . "/qalog >> " . $config{qalog_persistDirectory} . "/qalog_persist"; open(FL,">".Dmon::DMONDIR."/qalog"); close(FL); open(FLOG, "tail -F ".Dmon::DMONDIR."/qalog|"); diff --git a/thresholds/logger_threshold.conf b/thresholds/logger_threshold.conf index e5b200c..0bdd71e 100644 --- a/thresholds/logger_threshold.conf +++ b/thresholds/logger_threshold.conf @@ -1,4 +1,4 @@ -log4perl.logger.padiwa_threshold=DEBUG, A1 +log4perl.logger.padiwa_threshold=ERROR, A1 log4perl.appender.A1=Log::Dispatch::File log4perl.appender.A1.filename=padiwa_threshold.log log4perl.appender.A1.mode=append diff --git a/thresholds/run_thresh_on_system.pl b/thresholds/run_thresh_on_system.pl index a6ce0a4..2018d0d 100755 --- a/thresholds/run_thresh_on_system.pl +++ b/thresholds/run_thresh_on_system.pl @@ -19,8 +19,10 @@ my $opt_offset = 0; my $opt_polarity = 0; my $opt_32channel = 0; my $opt_finetune = false; +my $opt_sequential = false; my $opt_verb; my $tool = "./thresholds_automatic.pl"; +#my $tool = "./thresholds_automatic_jan.pl"; GetOptions ('h|help' => \$opt_help, 'e|endpoints=s' => \@opt_endpoints, @@ -29,6 +31,7 @@ GetOptions ('h|help' => \$opt_help, 'p|polarity=i' => \$opt_polarity, '32|32channel' => \$opt_32channel, 'f|finetune' => \$opt_finetune, + 's|sequential' => \$opt_sequential, 't|tool=s' => \$tool, 'v|verb' => \$opt_verb); @@ -71,6 +74,14 @@ foreach my $endpoint (@$endpoints) { my $endpoint = sprintf("0x%04x", $endpoint); $command = "$tool -e $endpoint -o $opt_offset -c $chain -p $opt_polarity $opt_32channel $opt_finetune"; print "command: $command\n"; + + if($opt_sequential) { + my $kill_command = "./write_thresholds.pl padiwa_threshold_results_20150625_14_21_all.log -o -10000"; + qx($kill_command); + qx($command); + next; + } + my $pid = fork(); if($pid==0) { #child my $res = qx($command); @@ -145,6 +156,7 @@ example: run_threshold_on_system.pl --endpoints=0x301-0x308,0x310..0x315,0x380 --chains=0..3 --offset=4 --polarity=0 will run for endpoints 0x301-0x308 and 0x310-0x315 and 0x380 for all chains (0..3) +read the code.... EOF diff --git a/thresholds/thresholds_automatic.pl b/thresholds/thresholds_automatic.pl index 58bcb47..8088d18 100755 --- a/thresholds/thresholds_automatic.pl +++ b/thresholds/thresholds_automatic.pl @@ -34,9 +34,9 @@ my @valid_interval = (0x5000, 0xc000); my $interval_step = ($valid_interval[1] - $valid_interval[0])/2; my $start_value = int ( ($valid_interval[1] + $valid_interval[0])/2 ); -my $sleep_time = 0.2; +my $sleep_time = 0.3; my $accepted_dark_rate = 10; -my $number_of_iterations = 30; # at least 15 are recommended +my $number_of_iterations = 40; # at least 15 are recommended my $endpoint = 0x0303; my $mode = "padiwa"; @@ -468,6 +468,7 @@ currently only mode "padiwa" is implemented. polarity: tells what the status of bit 32 is, when the thresholds are set to 0 32channel: when set the tool assums a TDC with 32 channels, leading and trailing channels use two channels +finetune: tries to optimize the thresholds beginning with the current ones EOF diff --git a/thresholds/thresholds_compare_dirc.pl b/thresholds/thresholds_compare_dirc.pl index e5d5db4..51e0b98 100755 --- a/thresholds/thresholds_compare_dirc.pl +++ b/thresholds/thresholds_compare_dirc.pl @@ -68,6 +68,10 @@ sub readSettings { (my $ep, my $chain, my $channel, my $thresh, my $uid) = $cl =~ /endpoint:\s+(\w+), chain:\s+(\d+), channel:\s+(\d+) threshold:\s+(\w+), uid: (\w+)/; next unless defined $ep; + if( length($thresh) >=8) { + #print $thresh; + $thresh = 0xffffff; + } $thresholds{hex($ep) .":". (int($channel)+ 16* int($chain)+1 )} = hex $thresh; } @@ -373,4 +377,4 @@ sub kilomega { } else { return sprintf("%d",$val); } -} \ No newline at end of file +} diff --git a/users/gsi_dirc/EventBuilderNew.xml b/users/gsi_dirc/EventBuilderNew.xml index c9637a3..d480d15 100644 --- a/users/gsi_dirc/EventBuilderNew.xml +++ b/users/gsi_dirc/EventBuilderNew.xml @@ -60,23 +60,30 @@ When starting analysis from the go4 gui, one should specify stream server with p + + - + - - - + + + - - - + + + - - - + + + + + + + + @@ -90,12 +97,12 @@ When starting analysis from the go4 gui, one should specify stream server with p - + - + diff --git a/users/gsi_dirc/addresses_trb3.db b/users/gsi_dirc/addresses_trb3.db index fe452f4..b5b9d60 100644 --- a/users/gsi_dirc/addresses_trb3.db +++ b/users/gsi_dirc/addresses_trb3.db @@ -55,11 +55,11 @@ 0x8005 97 5 # MCP-TOF-BACK 2 -0x2018 83 0 -0x2019 83 1 -0x201a 83 2 -0x201b 83 3 -0x8006 83 5 +0x2018 59 0 +0x2019 59 1 +0x201a 59 2 +0x201b 59 3 +0x8006 59 5 # HODO 0x201c 89 0 @@ -68,7 +68,9 @@ 0x201f 89 3 0x8007 89 5 -# FLASH + + +# FLASH ,not used 0x2020 111 0 0x2021 111 1 0x2022 111 2 @@ -76,7 +78,7 @@ 0x8008 111 5 -# DISC-DIRC +# DISC-DIRC, not used 0x2024 13 0 0x2025 13 1 @@ -90,9 +92,11 @@ 0x202a 77 2 0x202b 77 3 0x800a 77 5 -#AUX + + +#AUX , not used 0x202c 57 0 0x202d 57 1 0x202e 57 2 0x202f 57 3 -0x800b 57 5 +0x8008 57 5 diff --git a/users/gsi_dirc/dmon_config.pl b/users/gsi_dirc/dmon_config.pl index 4fd8720..89c0b5d 100755 --- a/users/gsi_dirc/dmon_config.pl +++ b/users/gsi_dirc/dmon_config.pl @@ -7,15 +7,16 @@ activeScripts => [['time','ping','-','-','daqop'], ['beamintensity','beammonitors','-','-','-'], ['trgrate','datarate','deadtime','-','-'], ['padiwatemp','padiwaonline','-','-','-'], - ['heatmapdirc','heatmapflash','heatmapdiscdirc','-','-'], + ['heatmapdirc','-','-','-','-'], +# ['heatmapdirc','heatmapdirc_zoom','-','-','-'], ['evtbnetmem','eb2','eb3','-','-'], ], #Names to be shown in left column of Overview (max 4 letters!) qaNames => ['sys','main','beam','rate','Pdwa','Heat','EB'], -#Expected number of FPGAs in system -NumberOfFpga => 58, +#Expected number of FPGAs in system (50 minus two switchport blocks of MCP-TOF 1/2 +NumberOfFpga => 48, NumberOfPadiwa => 87, #The address of the individual boards @@ -25,20 +26,20 @@ PadiwaBroadcastAddress => 0xfe4c, PadiwaTrbAddresses => [0x2000,0x2001,0x2002,0x2003,0x2004,0x2005,0x2006,0x2007, 0x2008,0x2009,0x200a,0x200b,0x200c,0x200d,0x200e,0x200f, 0x2010,0x2011,0x2012,0x2013,0x2014,0x2015,0x2016,0x2018, - 0x2019,0x201a,0x201c,0x2024,0x2025,0x2026,0x2027,0x2028], + 0x2019,0x201a,0x201c,0x201d], PadiwaChainMask => [0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007, - 0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007, + 0x0006,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007, 0x0007,0x0007,0x0007,0x0007,0x0001,0x0003,0x0003,0x0001, - 0x0003,0x0003,0x0003,0x0007,0x0007,0x0007,0x0007,0x0007], + 0x0003,0x0003,0x0001,0x0003], #0x2020,0x2023, no padiwa #,0x201d,0x201e,0x201f off #0x2029,0x202a,0x202b,0x202c,0x202d,0x202e,0x202f -OtherTrbAddresses => [0x7999,0x2020,0x2023,0x202c,0x202d], +OtherTrbAddresses => [0x7999,0x202c,0x202d], -HubTrbAddresses => [0x8100,0x8101,0x8102,0x8103,0x8000,0X8001,0x8002,0x8003,0x8004,0x8005,0x8006,0x8007,0x8008,0x8009,0x800a,0x800b], +HubTrbAddresses => [0x8100,0x8101,0x8102,0x8103,0x8000,0X8001,0x8002,0x8003,0x8004,0x8005,0x8006,0x8007,0x8008], #Addresses of all TDCs. Either single or broadcast addresses @@ -52,12 +53,10 @@ TrbIP => [ "192.168.0.74", "192.168.0.104", "192.168.0.97", - "192.168.0.83", + "192.168.0.59", "192.168.0.89", - "192.168.0.111", - "192.168.0.13", - "192.168.0.77", - "192.168.0.56" + "192.168.0.57", + "192.168.10.56" ], #Channel to read spill intensity from. Give limit for off-spill detection @@ -67,7 +66,7 @@ SpillThreshold => 50, #Name detectors BeamDetectorsTrb => [0x202c,0x202c,0x202c,0x2014,0x2018], -BeamDetectorsChan => [0xc001,0xc005,0xc003,0xc001,0xc001], +BeamDetectorsChan => [0xc001,0xc003,0xc002,0xc001,0xc001], BeamDetectorsName => ['Trig1','Trig2','Laser1','MCP1','MCP2'], #BeamDetectorsTrb => [0x0110, 0x0110, 0x0111,0x0110,0x0111,0x0110,0x0113,0x0111,0x0110], #BeamDetectorsChan => [0xc001, 0xc003, 0xc001,0xc009,0xc005,0xc00b,0xc009,0xc009,0xc005], @@ -81,8 +80,9 @@ UserDirectory => '/home/hadaq/trbsoft/daqtools/users/gsi_dirc/', HeatmapDirc => { # upper limit for high end of color scale # max_count_uclamp => 100000000, -# max_count_uclamp =>10000, +# max_count_uclamp =>500, max_count_uclamp => 5000, +# max_count_uclamp => 10000, # lower limit for high end of color scale max_count_lclamp => 10, @@ -94,9 +94,11 @@ HeatmapDirc => { normalization_inertia => 3 }, -HeatmapFlash => { +HeatmapDircZoom => { # upper limit for high end of color scale - max_count_uclamp => 200000, +# max_count_uclamp => 100000000, +# max_count_uclamp =>500, + max_count_uclamp => 5000, # lower limit for high end of color scale max_count_lclamp => 10, @@ -108,22 +110,8 @@ HeatmapFlash => { normalization_inertia => 3 }, -HeatmapDiscDirc => { - # upper limit for high end of color scale - max_count_uclamp => 100000, -## max_count_uclamp => 100, - # lower limit for high end of color scale - max_count_lclamp => 30, - - # when set to 1 normalization of color scale is instantaneous, - # when set to 0, normalization has "inertia" - instant_normalization => 1, - - # the inertia of the adaption of the color scale in the unit of 1/(gliding average weight) - normalization_inertia => 3 -}, - EvtbNetmem => { shm_string => "test" -} +}, +qalog_persistDirectory => '/d/logs/' diff --git a/users/gsi_dirc/first.C b/users/gsi_dirc/first.C index 070a0d3..d306a55 100644 --- a/users/gsi_dirc/first.C +++ b/users/gsi_dirc/first.C @@ -48,7 +48,9 @@ void first() // specify reference channel //tdc->SetRefChannel(0, 0, 0x202c, 20000, 9597E6., 9603E6., true); - tdc->SetRefChannel(0, 0, 0x2001, 20000, -100., 100., true); + if(cnt==0) { + tdc->SetRefChannel(0, 0, 0x2001, 20000, -100., 100., true); + } //tdc->SetRefChannel(3, 1, 0xffff, 20000, -10., 10., true); // continue; @@ -69,15 +71,17 @@ void first() tdc->SetRefChannel(7, 7, 0x2000, 20000, -20., 20., true); } - if (tdc==4) continue; + if (cnt>1) continue; // specify reference channel + + /* tdc->SetRefChannel(0, 0, 0x202d, 20000, -100., 100., true); tdc->SetRefChannel(1, 0, 0xffff, 20000, -800., 800., true); tdc->SetRefChannel(2, 0, 0xffff, 20000, -200., 200., true); tdc->SetRefChannel(3, 0, 0xffff, 20000, -200., 200., true); tdc->SetRefChannel(4, 0, 0xffff, 20000, -200., 200., true); - + */ // for old FPGA code one should have epoch for each hit, no longer necessary // tdc->SetEveryEpoch(true); diff --git a/users/gsi_dirc/padiwa_led_off.pl b/users/gsi_dirc/padiwa_led_off.pl index e53fb20..742e2ec 100755 --- a/users/gsi_dirc/padiwa_led_off.pl +++ b/users/gsi_dirc/padiwa_led_off.pl @@ -7,22 +7,30 @@ use Parallel::ForkManager; my $MAX_PROCESSES=50; my $pm = Parallel::ForkManager->new($MAX_PROCESSES); -my @pad0 =(0x2000,0x2001,0x2004,0x2007,0x2009,0x200a,0x200c,0x200f,0x2011,0x2012,0x2013); -my @pad1 =(0x2000,0x2004,0x2005,0x2006,0x2007,0x2008,0x2009,0x200e); -my @pad2 =(0x2004,0x2006,0x2008,0x2009,0x200a,0x200e,0x2010); +my @pad0 =(0x2000 .. 0x2013); +my @pad1 =(0x2000 .. 0x2013); +my @pad2 =(0x2000 .. 0x2013); + +#my @pad0 =(0x2000,0x2001,0x2004,0x2007,0x2009,0x200a,0x200c,0x200f,0x2011,0x2012,0x2013); +#my @pad1 =(0x2000,0x2004,0x2005,0x2006,0x2007,0x2008,0x2009,0x200e); +#my @pad2 =(0x2004,0x2006,0x2008,0x2009,0x200a,0x200e,0x2010); foreach my $b (@pad0) { my $pid = $pm->start and next; - my $c = sprintf("../../tools/padiwa.pl 0x%04x 0 led 0x10 >/dev/null",$b); + my $c = sprintf("../../tools/padiwa.pl 0x%04x 0 ledoff >/dev/null",$b); + #print "$c\n"; system($c); + #my $r = qx($c); + #print $r; $pm->finish; } $pm->wait_all_children; - +#print "next\n"; foreach my $b (@pad1) { my $pid = $pm->start and next; - my $c = sprintf("../../tools/padiwa.pl 0x%04x 1 led 0x10 >/dev/null",$b); + my $c = sprintf("../../tools/padiwa.pl 0x%04x 1 ledoff >/dev/null",$b); + #print $c; system($c); $pm->finish; } @@ -30,7 +38,7 @@ $pm->wait_all_children; foreach my $b (@pad2) { my $pid = $pm->start and next; - my $c = sprintf("../../tools/padiwa.pl 0x%04x 2 led 0x10 >/dev/null",$b); + my $c = sprintf("../../tools/padiwa.pl 0x%04x 2 ledoff >/dev/null",$b); system($c); $pm->finish; } diff --git a/users/gsi_dirc/prepare_padiwas_invert_leds.pl b/users/gsi_dirc/prepare_padiwas_invert_leds.pl index db0fc1e..3d9291d 100755 --- a/users/gsi_dirc/prepare_padiwas_invert_leds.pl +++ b/users/gsi_dirc/prepare_padiwas_invert_leds.pl @@ -5,6 +5,7 @@ use warnings; use Parallel::ForkManager; use Getopt::Long; +use Data::Dumper; my $help; my $opt_invert; @@ -34,7 +35,7 @@ my $endpoints = get_ranges(\@opt_endpoints); my $chains = get_ranges(\@opt_chains); -my $MAX_PROCESSES = 100; +my $MAX_PROCESSES = 40; my $pm = Parallel::ForkManager->new($MAX_PROCESSES); #my $padiwa_invert_setting = "0xffff"; @@ -43,11 +44,13 @@ my $str_endpoints= join " ", @opt_endpoints; print "current padiwa range: $str_endpoints\n"; -print "\tsetting padiwa invert-setting to $opt_invert "; +print "\tsetting padiwa invert-setting to $opt_invert: "; + execute_command("invert $opt_invert"); $pm->wait_all_children; print "\n"; + #print "result of invert\n"; #execute_command("invert", "verbose"); #exit @@ -71,13 +74,18 @@ if($opt_stretch) { print "\n"; } - +#sleep 2; exit; sub execute_command { (my $padiwa_command, my $verbosity) = @_; + #print Dumper $endpoints; + if(!@$endpoints) { + print "\nattention: no enpoints selected. Not doing anything!\n"; + die; + } foreach my $cur_endpoint (@$endpoints) { my $pid = $pm->start and next; $cur_endpoint = sprintf "0x%4x", $cur_endpoint; @@ -87,6 +95,8 @@ sub execute_command { my $c="/home/hadaq/trbsoft/daqtools/padiwa.pl $cur_endpoint $chain $padiwa_command"; if (!$verbosity) { $c.= " >/dev/null" }; #print $c . "\n"; + #$c="/home/hadaq/trbsoft/daqtools/padiwa.pl $cur_endpoint $chain temp"; + #print "$c\n"; my $res = qx($c); die "could not execute command $c" if $?; if($verbosity) { print "$res"; } } diff --git a/users/gsi_dirc/register_config_tdc.db b/users/gsi_dirc/register_config_tdc.db index 8a78e0c..aa79059 100644 --- a/users/gsi_dirc/register_config_tdc.db +++ b/users/gsi_dirc/register_config_tdc.db @@ -10,35 +10,38 @@ # Hub # Type # lower 32 channels # upper 32 channels # ################################################################# +# Broken (lost config) Padiwa + 0x2008 0 0xffff0000 0x0000ffff + # FLASH - 0x2021 0 0x00000000 0x00000000 - 0x2022 0 0x00000000 0x00000000 +# 0x2021 0 0x00000000 0x00000000 +# 0x2022 0 0x00000000 0x00000000 # TOF1 0x2014 0 0x0000ffff 0x00000000 0x2015 0 0xffffffff 0x00000000 0x2016 0 0xffffffff 0x00000000 - 0x2017 0 0x0000ffff 0x00000000 +# 0x2017 0 0x0000ffff 0x00000000 # TOF2 0x2018 0 0x0000ffff 0x00000000 0x2019 0 0xffffffff 0x00000000 0x201a 0 0xffffffff 0x00000000 - 0x201b 0 0x00000000 0x00000000 +# 0x201b 0 0x00000000 0x00000000 # #Hodo - 0x201c 0 0xffffffff 0x00000000 - 0x201d 0 0x00000000 0x00000000 + 0x201c 0 0x0000005f 0x00000000 + 0x201d 0 0xffffffff 0x00000000 0x201e 0 0x00000000 0x00000000 0x201f 0 0x00000000 0x00000000 # EDD - 0x202b 0 0x00000000 0x00000000 +# 0x202b 0 0x00000000 0x00000000 #DISC-DIRC - 0x2026 0 0xfffffff 0x0000ffff +# 0x2026 0 0xffffffff 0x0000ffff # AUX 0x202c 0 0xffffffff 0x00000000 diff --git a/users/gsi_dirc/register_configgbe.db b/users/gsi_dirc/register_configgbe.db index 5589179..9e3e766 100755 --- a/users/gsi_dirc/register_configgbe.db +++ b/users/gsi_dirc/register_configgbe.db @@ -21,9 +21,9 @@ 0x8006 0 0x8006 0x00020001 0x00030064 0x1DE8 0x578 1 1 1 1 0x0 0x8007 0 0x8007 0x00020001 0x00030064 0x1DE8 0x578 1 1 1 1 0x0 0x8008 0 0x8008 0x00020001 0x00030064 0x1DE8 0x578 1 1 1 1 0x0 - 0x8009 0 0x8009 0x00020001 0x00030064 0x1DE8 0x578 1 1 1 1 0x0 - 0x800a 0 0x800a 0x00020001 0x00030064 0x1DE8 0x578 1 1 1 1 0x0 - 0x800b 0 0x800b 0x00020001 0x00030064 0x1DE8 0x578 1 1 1 1 0x0 +# 0x8009 0 0x8009 0x00020001 0x00030064 0x1DE8 0x578 1 1 1 1 0x0 +# 0x800a 0 0x800a 0x00020001 0x00030064 0x1DE8 0x578 1 1 1 1 0x0 +# 0x800b 0 0x800b 0x00020001 0x00030064 0x1DE8 0x578 1 1 1 1 0x0 # 0x8012 0 0x8012 0x00020001 0x00030064 0x1DE8 0x578 1 0 1 1 0x0 # 0x8013 0 0x8013 0x00020001 0x00030064 0x1DE8 0x578 1 0 1 1 0x0 # 0x8014 0 0x8014 0x00020001 0x00030064 0x1DE8 0x578 1 0 1 1 0x0 diff --git a/users/gsi_dirc/register_configgbe_ip.db b/users/gsi_dirc/register_configgbe_ip.db index e665b27..5906c4e 100755 --- a/users/gsi_dirc/register_configgbe_ip.db +++ b/users/gsi_dirc/register_configgbe_ip.db @@ -28,7 +28,7 @@ # Hub # Type # C0 # C1 # C2 # C3 # C4 # C5 # C6 # C7 # C8 # ######################################################################################################################################## - 0x7999 0 0x1e04f330 0x000e 0xc0a80003 0xc34f 0xdead7fff 0x001b 0xc0a80000 0xc350 0x0578 + 0x7999 0 0x7a0b83ca 0x0cc4 0xc0a80a03 0xc34f 0xdead7fff 0x001b 0xc0a80000 0xc350 0x0578 0x8000 0 0x1e04f330 0x000e 0xc0a80003 0xc350 0xdead8000 0x001b 0xc0a80001 0xc351 0x0578 0x8001 0 0x1e04f330 0x000e 0xc0a80003 0xc351 0xdead8001 0x001b 0xc0a80002 0xc352 0x0578 0x8002 0 0x1e04f330 0x000e 0xc0a80003 0xc352 0xdead8002 0x001b 0xc0a80003 0xc353 0x0578 @@ -38,9 +38,9 @@ 0x8006 0 0x1e04f330 0x000e 0xc0a80003 0xc356 0xdead8006 0x001b 0xc0a80007 0xc357 0x0578 0x8007 0 0x1e04f330 0x000e 0xc0a80003 0xc357 0xdead8007 0x001b 0xc0a80008 0xc358 0x0578 0x8008 0 0x1e04f330 0x000e 0xc0a80003 0xc358 0xdead8008 0x001b 0xc0a80009 0xc359 0x0578 - 0x8009 0 0x1e04f330 0x000e 0xc0a80003 0xc359 0xdead8009 0x001b 0xc0a8000a 0xc35a 0x0578 - 0x800a 0 0x1e04f330 0x000e 0xc0a80003 0xc35a 0xdead800a 0x001b 0xc0a8000b 0xc35b 0x0578 - 0x800b 0 0x1e04f330 0x000e 0xc0a80003 0xc35b 0xdead800b 0x001b 0xc0a8000c 0xc35c 0x0578 +# 0x8009 0 0x1e04f330 0x000e 0xc0a80003 0xc359 0xdead8009 0x001b 0xc0a8000a 0xc35a 0x0578 +# 0x800a 0 0x1e04f330 0x000e 0xc0a80003 0xc35a 0xdead800a 0x001b 0xc0a8000b 0xc35b 0x0578 +# 0x800b 0 0x1e04f330 0x000e 0xc0a80003 0xc35b 0xdead800b 0x001b 0xc0a8000c 0xc35c 0x0578 # 0x7999 0 0x1e04f330 0x000e 0xc0a80002 0xc350 0xdead8000 0x001b 0xc0a80000 0xc350 0x0578 # 0x8000 0 0x1e04f330 0x000e 0xc0a80002 0xc351 0xdead8001 0x001b 0xc0a80001 0xc351 0x0578 diff --git a/users/gsi_dirc/start_readout.pl b/users/gsi_dirc/start_readout.pl deleted file mode 100755 index b415dcd..0000000 --- a/users/gsi_dirc/start_readout.pl +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/perl -use warnings; -use strict; -use Getopt::Long; - -my $help = ""; -my $dataPath = "/d/may2015/"; -my $label = "test"; -my $time = -1; -my $name = "cc"; -my $dabc; -my $c; - -my $result = GetOptions ( - "h|help" => \$help, - "d|dabc" => \$dabc, - "t|time=i" => \$time, - "l|label=s" => \$label, - "n|filename=s" => \$name, - "p|path=s" => \$dataPath - ); - -if($help) { - print "Usage: start_readout.pl