someone somehow changed some files

diff --git a/.gitignore b/.gitignore
index 8ba1c6219a48247762c72a30deb777afb5850e32..829891ff13091129ee453a1502633d77d713fb3f 100644 (file)
--- 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 07ea2c08498e5979b0a0568d31b81745ef5d0555..4194be77d9afe0cf994c0d2540dfa2d04c34e6c0 100755 (executable)
--- 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 &\n";
+       system("bash -c \"/home/hadaq/trbsoft/hadesdaq/control/ctsmon/mon_cts.pl -m set -e $opt_etrax -a $opt_access 2>/dev/null >/dev/null 1</dev/null 2</dev/null &\"");
     }
     elsif( $opt_mode eq "set" ){
        $errorType = "";

diff --git a/evtbuild/eb.conf b/evtbuild/eb.conf
index 175fb1c66febf1572ab641a1b9e5babb1374dd9b..38b7df839672f5a39208647f5d28c5f1c4994548 120000 (symlink)
--- a/evtbuild/eb.conf
+++ b/evtbuild/eb.conf
@@ -1 +1 @@
-eb.conf.oct12
\ No newline at end of file
+eb.conf.oct12_noRFIO
\ No newline at end of file

diff --git a/evtbuild/start_eb_gbe.pl b/evtbuild/start_eb_gbe.pl
index 0be037197e4e9e88523099e3a2160b7827a4fd4d..e2bf2537d0de0d4fc8ae85f0e17ac56a9099f9ce 100755 (executable)
--- a/evtbuild/start_eb_gbe.pl
+++ b/evtbuild/start_eb_gbe.pl
@@ -741,7 +741,7 @@ dbLoadDatabase("dbd/ebctrl.dbd")
 ebctrl_registerRecordDeviceDriver(pdbbase)
 
 ## Load record instances
-dbLoadRecords("db/stats.db", "PREFIX=HAD:IOC:,IOC=${HOSTNAME}")
+dbLoadRecords("db/stats.db", "PREFIX=HAD:IOC:,IOC=\${HOSTNAME}")
 dbLoadRecords("db/evtbuild.db","eb=$ebnum")
 dbLoadRecords("db/netmem.db","eb=$ebnum")
 dbLoadRecords("db/errbit1.db","eb=$ebnum")

diff --git a/evtbuild/start_eb_gbe.sh b/evtbuild/start_eb_gbe.sh
index 02a0ba85ba0df5c04625cf333dfdfc17fe13c9c3..625449cff38109f8c065a0ab5d5dae44b6465a03 100755 (executable)
--- a/evtbuild/start_eb_gbe.sh
+++ b/evtbuild/start_eb_gbe.sh
@@ -1 +1 @@
-./start_eb_gbe.pl -v -e restart -n 1-16 -d on -p ri -r off
+./start_eb_gbe.pl -e restart -n 1-16 -d off -p --

diff --git a/hmon/start.sh b/hmon/start.sh
index 59c234a0bdecfe3062084e353b0ba984207106be..fbb85765888658da38cd22d66d2dff8bb66934b2 100755 (executable)
--- a/hmon/start.sh
+++ b/hmon/start.sh
@@ -3,13 +3,14 @@
 #Mount RAM file system
 #mount -t tmpfs none /var/spool/ramdisk  -o size=256m
 
+mkdir /dev/shm/hmon
 #Kill old tunnel, make new one. Better: Check if tunnel still exists, if not restart.
 echo "  <Hmon>     Renewing tunnels and environment..."
 
 pgrep -f 'hmon_ssh -R 8888' >/dev/null
 if [ $? -eq 1 ]; then
 echo "  <Hmon>     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 7e2234bc8424794d2aab73fb21476e70eaf8e55f..ced37dd696d0aace63b6b936877316912ba456f2 100644 (file)
--- 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 a8ec24d373ac1cf50955b349220cc173f654bd44..d5ec5a80ecaeba249afd9d008c93721278357e50 100755 (executable)
--- 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 f94eec84f00dbf91f4d8ce3940a8f99dd1909410..19df77b0b5d9d4fff5e05f65d7f169169619bc65 120000 (symlink)
--- 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 cbc04380b802810a32711479a2e0d427ed5b48b0..fa5cca733b8fa955a42144e1e6127536fe4881b5 120000 (symlink)
--- 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 e812a18a916fefe2d2cb028f8424dc49dfb174a2..440afb2f2451322134a08c8a1faa4e4ce6ae3e52 100755 (executable)
--- 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 ffd580dd8c5a0c06c64a22a7d4d4c04c4c24bbbf..67c8055c9a50e3adf026b620d624713fedbc78ad 100755 (executable)
--- 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);