From: hades <hades>
Date: Thu, 9 Nov 2000 16:04:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=9f3354cb56aa82238f63134faef3b501280f7ace;p=daqdata.git

*** empty log message ***
---

diff --git a/hadaq/makeenv b/hadaq/makeenv
index bd38b80..7dd89a6 100644
--- a/hadaq/makeenv
+++ b/hadaq/makeenv
@@ -27,7 +27,7 @@ then
 	export CC="gcc"
 	export RPCGEN="rpcgen"
 	export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl -latm"
-	export INCLUDES="-I$HOME/include -I$HOME/include/tcl"
+	export INCLUDES="-I$HOME/include -I$HOME/include/tcl -I/usr/local/include/tcl"
 	export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT"
 elif test $HADAQ_CONF = "LINUX_NOATM"
 then
diff --git a/hadaq/trig_shw.tcl b/hadaq/trig_shw.tcl
index 3228963..c5119b4 100644
--- a/hadaq/trig_shw.tcl
+++ b/hadaq/trig_shw.tcl
@@ -1,42 +1,42 @@
-agent create hades05 root /home/hades/tt00/eb/hadaq
-agent create r2-14 hades /hades/usr/hades/tt00/shw/hadaq
-agent create r2-18 hades /hades/usr/hades/tt00/trig/hadaq
+agent create hades05 hades /home/hades/nov00/eb/hadaq
+agent create r2-14 hades /hades/usr/hades/nov00/shw/hadaq
+agent create r2-13 hades /hades/usr/hades/nov00/trig/hadaq
 worker create hades05:evtbuild -a -p -2 -s 2 -m 2
 worker create hades05:netmem -a -p -1 -m 2 -i ATM:0:50 -i ATM:0:51
 worker create r2-14:memnet -a -p -1 -w 68000 -o ATM:0:50
 worker create r2-14:readout -a -p -2
-worker create r2-18:memnet -a -p -1 -w 68000 -o ATM:0:51
-worker create r2-18:readout -a -p -2
+worker create r2-13:memnet -a -p -1 -w 68000 -o ATM:0:51
+worker create r2-13:readout -a -p -2
 group create acquisition
 group create run
 group add acquisition r2-14:memnet
 group add acquisition r2-14:readout
-group add acquisition r2-18:memnet
-group add acquisition r2-18:readout
+group add acquisition r2-13:memnet
+group add acquisition r2-13:readout
 group add run hades05:evtbuild
 group add run hades05:netmem
 
 set duringInit {
-	{rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./shw init'} </dev/null }
-	{rsh r2-18 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./trig init'} </dev/null }
+	{rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./shw init'} </dev/null }
+	{rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./trig init'} </dev/null }
 }
 
 set beforeStartAcq {
-	{rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./shw reset'} </dev/null >>&hadaq.log}
-	{rsh r2-18 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./trig reset'} </dev/null >>&hadaq.log}
-	{rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./shw start'} </dev/null >>&hadaq.log}
-	{rsh r2-18 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./trig start'} </dev/null >>&hadaq.log}
+	{rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./shw reset'} </dev/null >>&hadaq.log}
+	{rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./trig reset'} </dev/null >>&hadaq.log}
+	{rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./shw start'} </dev/null >>&hadaq.log}
+	{rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./trig start'} </dev/null >>&hadaq.log}
 }
 
 set afterStartAcq {
-	{rsh r2-18 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; dtuctrl -t ctu start'} </dev/null >>&hadaq.log}
+	{rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; dtuctrl -t ctu start'} </dev/null >>&hadaq.log}
 }
 
 set beforeStopAcq {
-	{rsh r2-18 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; dtuctrl -t ctu stop'} </dev/null >>&hadaq.log}
+	{rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; dtuctrl -t ctu stop'} </dev/null >>&hadaq.log}
 }
 
 set afterStopAcq {
-	{rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./shw stop'} </dev/null >>&hadaq.log}
-	{rsh r2-18 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./trig stop'} </dev/null >>&hadaq.log}
+	{rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./shw stop'} </dev/null >>&hadaq.log}
+	{rsh r2-13 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd nov00/slow; ./trig stop'} </dev/null >>&hadaq.log}
 }