From: Hades DAQ Date: Tue, 26 Nov 2013 13:24:31 +0000 (+0100) Subject: someone somehow changed some files X-Git-Tag: pre2018~120 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7cec7678df57d4ee1574823e644e66ec66e0d90c;p=hadesdaq.git someone somehow changed some files --- diff --git a/.gitignore b/.gitignore index 8ba1c62..829891f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ hmon/qa hmon/logs hmon/vertex +*~ +*.bak +*.log diff --git a/control/ctsmon/mon_cts.pl b/control/ctsmon/mon_cts.pl index 07ea2c0..4194be7 100755 --- a/control/ctsmon/mon_cts.pl +++ b/control/ctsmon/mon_cts.pl @@ -1934,7 +1934,9 @@ sub readRegs_trbcmd() sub set_window() { if( $opt_mode eq "mon" ){ - system("/home/hadaq/trbsoft/daq/evtbuild/mon_cts.pl -m set -e $opt_etrax -a $opt_access &"); + print "/home/hadaq/trbsoft/hadesdaq/control/ctsmon/mon_cts.pl -m set -e $opt_etrax -a +$opt_access 2>/dev/null /dev/null >/dev/null 1 Renewing tunnels and environment..." pgrep -f 'hmon_ssh -R 8888' >/dev/null if [ $? -eq 1 ]; then echo " No tunnel found, digging new one"; -./hmon_ssh -R 8888:hades33.gsi.de:80 cerberus.x-matter.uni-frankfurt.de -N & +./hmon_ssh -fR 8888:hades33.gsi.de:80 cerberus.x-matter.uni-frankfurt.de -N & fi killall speakdaemon.pl diff --git a/main/data_sources.db b/main/data_sources.db index 7e2234b..ced37dd 100644 --- a/main/data_sources.db +++ b/main/data_sources.db @@ -6,12 +6,12 @@ 0x8000 0 Central low #off 0x8100 0 innerMDC low #off 0x8110 0 outerMDC low #off -0x8300 1 RICH12 mid -0x8310 1 RICH34 mid -0x8320 1 RICH56 mid +0x8300 0 RICH12 mid +0x8310 0 RICH34 mid +0x8320 0 RICH56 mid 0x8400 0 RPC123 mid 0x8410 0 RPC456 mid -0x8600 0 TOF low +0x8600 1 TOF low 0x8700 0 FW low 0x1000 0 MDC12sec1 high 0x1010 0 MDC12sec2 high diff --git a/main/startup.pl b/main/startup.pl index a8ec24d..d5ec5a8 100755 --- a/main/startup.pl +++ b/main/startup.pl @@ -267,6 +267,7 @@ EOF my $txt = "\nError! Could not open file \"$expect_script\" for output. Exit.\n"; print STDERR $txt; print $txt; + die; exit(128); } @@ -719,6 +720,7 @@ sub isItDefined() my $txt = "\nError! Could not open file \'$name\'. Exit.\n"; print STDERR $txt; print $txt; + die; exit(128); } @@ -914,6 +916,7 @@ sub connectCmdServer() my $txt = "\nError! Could not open file \"$log\" for output. Exit.\n"; print STDERR $txt; print $txt; + die; exit(128); } @@ -1218,7 +1221,7 @@ sub makeRegisterConf() my $outConf_register = $var_dir . "/tmp/" . $outConf; my $ret_register = "/home/hadaq/tmp/" . $outConf; - $fh = new FileHandle(">$outConf_register"); + $fh = new FileHandle(">$outConf_register") || die "could not open $outConf_register"; foreach my $addr ( sort keys %{$reg_href} ){ foreach my $ref (@{$reg_href->{$addr}}){ diff --git a/rich/peds/current b/rich/peds/current index f94eec8..19df77b 120000 --- a/rich/peds/current +++ b/rich/peds/current @@ -1 +1 @@ -ri1324616114601 \ No newline at end of file +ri1332909181501 \ No newline at end of file diff --git a/rich/register_thresholds.db b/rich/register_thresholds.db index cbc0438..fa5cca7 120000 --- a/rich/register_thresholds.db +++ b/rich/register_thresholds.db @@ -1 +1 @@ -/home/hadaq/trbsoft/daq/rich/peds/ri1324616114601/register_thresholds.db \ No newline at end of file +/home/hadaq/trbsoft/daq/rich/peds/ri1332909181501/register_thresholds.db \ No newline at end of file diff --git a/utils/chat_push b/utils/chat_push index e812a18..440afb2 100755 --- a/utils/chat_push +++ b/utils/chat_push @@ -9,7 +9,7 @@ use Data::Dumper; use Fcntl qq(SEEK_SET); use Getopt::Long; -my $chat_fn = $ENV{'HOME'} . "/trbsoft/hadesdaq/tools/chat.log"; +my $chat_fn = $ENV{'HOME'} . "/trbsoft/hadesdaq/utils/chat.log"; my $opt_help; my $opt_device; diff --git a/utils/hades_chat b/utils/hades_chat index ffd580d..67c8055 100755 --- a/utils/hades_chat +++ b/utils/hades_chat @@ -11,7 +11,7 @@ GetOptions ( 'h|help' => \$opt_help, ); -my $c = qq|tmux new-session -n chat "tail -n 200 -f ~/trbsoft/hadesdaq/tools/chat.log" \\; split-window -t chat -l3 "PERL_RL=' o=0' ~/bin/chat_push" \\; attach|; +my $c = qq|tmux new-session -n chat "tail -n 200 -f ~/trbsoft/hadesdaq/utils/chat.log" \\; split-window -t chat -l3 "PERL_RL=' o=0' ~/bin/chat_push" \\; attach|; #print "command: $c\n"; system($c);