End of TT00

diff --git a/hadaq/atm.tcl b/hadaq/atm.tcl
index bf9b5137f01b334da8826080fe9a1a145331d82d..459ebd3f5928410be6ef64103e042f806f220c0c 100644 (file)
--- a/hadaq/atm.tcl
+++ b/hadaq/atm.tcl
@@ -10,3 +10,7 @@ group add acquisition r2-26:memnet
 group add acquisition r2-26:readout
 group add run hades05:evtbuild
 group add run hades05:netmem
+set beforeStartAcq {rsh r2-26 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./rich reset; ./rich start'} </dev/null >>&hadaq.log}
+set afterStartAcq {rsh r2-26 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; dtuctrl -t ctu start'} </dev/null >>&hadaq.log}
+set beforeStopAcq {rsh r2-26 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; dtuctrl -t ctu stop'} </dev/null >>&hadaq.log}
+set afterStopAcq {rsh r2-26 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./rich stop'} </dev/null >>&hadaq.log}

diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c
index a8870bf903f61435a60a356f206cf1e56eb220f9..b001d4e7fd5cfaf91c957cf15341bee1f4f30d9e 100644 (file)
--- a/hadaq/hwsoft.c
+++ b/hadaq/hwsoft.c
@@ -47,7 +47,7 @@ void deleteHardware(Hardware *my)
 
 void Hardware_waitForTrigger(Hardware *my, void *partEvt)
 {
-#if 0
+#if 1
        struct timespec tS, *t = &tS;
 
        t->tv_sec = 0;

diff --git a/hadaq/shw.tcl b/hadaq/shw.tcl
index a15f1a5a411537e2ac134c0662b14c4729811951..35e908b692de14120634626a2158498c9cff60b3 100644 (file)
--- a/hadaq/shw.tcl
+++ b/hadaq/shw.tcl
@@ -1,15 +1,15 @@
-agent create hades05 hades /home/hades/tt00/eb/hadaq
+agent create hades24 hades /home/hades/tt00/eb/hadaq
 agent create r2-14 hades /hades/usr/hades/tt00/shw/hadaq
-worker create hades05:evtbuild -a -p -2 -s 1 -m 1
-worker create hades05:netmem -a -p -1 -m 1 -i ATM:0:50
-worker create r2-14:memnet -a -p -1 -w 0 -o ATM:0:50
+worker create hades24:evtbuild -a -p -2 -s 1 -m 1
+worker create hades24:netmem -a -p -1 -m 1 -i ATM:0:100
+worker create r2-14:memnet -a -p -1 -w 0 -o ATM:0:100
 worker create r2-14:readout -a -p -2
 group create acquisition
 group create run
 group add acquisition r2-14:memnet
 group add acquisition r2-14:readout
-group add run hades05:evtbuild
-group add run hades05:netmem
+group add run hades24:evtbuild
+group add run hades24:netmem
 
 set duringInit {
        {rsh r2-14 sh -c {'PATH=$PATH:$HOME/bin/POWERPC_LYNXOS_2_5_1; cd tt00/slow; ./shw init'} </dev/null }

diff --git a/hadaq/tof.tcl b/hadaq/tof.tcl
index b17429245dc5f44889e6fce74d001cb23132cef4..14ebb97fdf4cf375d357c7cdb58ed10b0efe26f2 100644 (file)
--- a/hadaq/tof.tcl
+++ b/hadaq/tof.tcl
@@ -1,5 +1,5 @@
 agent create hades24 hades /home/hades/tt00/eb/hadaq
-agent create r2-24 hades /hades/usr/hades/tt00/shw/hadaq
+agent create r2-24 hades /hades/usr/hades/tt00/tof/hadaq
 worker create hades24:evtbuild -a -p -2 -s 1 -m 1
 worker create hades24:netmem -a -p -1 -m 1 -i ATM:0:100
 worker create r2-24:memnet -a -p -1 -w 0 -o ATM:0:100