*** empty log message ***

diff --git a/hadaq/hadaq_init.tcl b/hadaq/hadaq_init.tcl
index 13edd37e48f42deb58915cb1dcd1b1a7109908fa..8ad00ffd105fe213c4f19f595c991ecc2d732892 100644 (file)
--- a/hadaq/hadaq_init.tcl
+++ b/hadaq/hadaq_init.tcl
@@ -9,8 +9,8 @@ foreach i [agent cat] {
 
        puts $host 
        set hostType [ exec rsh $host uname ]
-       if {[string match "LynxOS" $hostType]} {
-               set psCmd {ps -ax | awk '{ print $1, $NF }'}
+       if {[string match "LynxOS" $hostType] || [string match "Linux" $hostType]} {
+               set psCmd {ps ax | awk '{ print $1, $NF }'}
        } else {
                set psCmd {export UNIX95=XPG4; ps -e -o pid -o comm}
        }

diff --git a/hadaq/makeenv b/hadaq/makeenv
index 293d237c2b6d03a05d98b15c4abfa6940e3d628f..7f3d47b16fcbd1a1c86b236b849d68136b5a1a33 100644 (file)
--- a/hadaq/makeenv
+++ b/hadaq/makeenv
@@ -33,7 +33,7 @@ elif test $HADAQ_CONF = "LINUX_NOATM"
 then
        export CC="gcc"
        export RPCGEN="rpcgen"
-       export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llvme -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl"
+       export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl"
        export INCLUDES="-I$HOME/include"
        export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM"
 elif test $HADAQ_CONF = "LYNXOS"

diff --git a/hadaq/soft.tcl b/hadaq/soft.tcl
index 307eabdd00f0360d9785fbe1ccc629fdaffd3de2..76df3b0046f934aa2094ee92b77f0fe19a9cb8a3 100644 (file)
--- a/hadaq/soft.tcl
+++ b/hadaq/soft.tcl
@@ -1,12 +1,12 @@
-agent create acheron muench /home/muench/hdev/daq/hadaq
-agent create mimas muench /home/muench/hdev/daq/hadaq
-worker create acheron:evtbuild -a -p -2 -s 2 -m 1
-worker create acheron:netmem -a -p -1 -m 1 -i UDP:0.0.0.0:3000
-worker create mimas:memnet -a -p -1 -w 2500 -o UDP:129.187.154.22:3000
-worker create mimas:readout -a -p -2
+agent create localhost muench /home/muench/hdev/daq/hadaq
+agent create localhost muench /home/muench/hdev/daq/hadaq
+worker create localhost:evtbuild -a -p -2 -s 2 -m 1
+worker create localhost:netmem -a -p -1 -m 1 -i UDP:127.0.0.1:3000
+worker create localhost:memnet -a -p -1 -w 2500 -o UDP:127.0.0.1:3000
+worker create localhost:readout -a -p -2
 group create acquisition
 group create run
-group add acquisition mimas:memnet
-group add acquisition mimas:readout
-group add run acheron:evtbuild
-group add run acheron:netmem
+group add acquisition localhost:memnet
+group add acquisition localhost:readout
+group add run localhost:evtbuild
+group add run localhost:netmem