From: hades Date: Wed, 17 May 2000 05:51:52 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=bfe21fdad71e131463a90b769c5f442fb9938226;p=daqdata.git *** empty log message *** --- diff --git a/hadaq/Makefile b/hadaq/Makefile index b3b4ce4..8032ce0 100644 --- a/hadaq/Makefile +++ b/hadaq/Makefile @@ -51,7 +51,7 @@ DAQ_ANAL_OBJS = showevt.o hldread.o evt.o subevt.o hadtu.o mini: daq_readout daq_evtbuild seb: daq_readout daq_memnet daq_agent -eb: daq_netmem daq_evtbuild +eb: daq_netmem daq_evtbuild daq_agent anal: daq_sniff daq_anal manage: daq_manage xmanage: daq_xmanage anal diff --git a/hadaq/atm.tcl b/hadaq/atm.tcl index 7b47cfb..331d3b1 100644 --- a/hadaq/atm.tcl +++ b/hadaq/atm.tcl @@ -1,14 +1,14 @@ agent create hades24 hades /home/hades/tt00/eb/hadaq -agent create hades12 hades /home/hades/tt00/rich/hadaq +agent create hades19 hades /home/hades/tt00/rich/hadaq worker create hades24:evtbuild -a -p -2 -s 2 -m 1 -worker create hades24:netmem -a -p -1 -m 1 -i ATM:0:40 -worker create hades12:memnet -a -p -1 -w 0 -o ATM:0:40 -worker create hades12:readout -a -p -2 -worker create hades12:ctrlctu -a +worker create hades24:netmem -a -p -1 -m 1 -i ATM:0:50 +worker create hades19:memnet -a -p -1 -w 0 -o ATM:0:50 +worker create hades19:readout -a -p -2 +worker create hades19:ctrlctu -a group create acquisition group create run -group add acquisition hades12:memnet -group add acquisition hades12:readout -group add acquisition hades12:ctrlctu +group add acquisition hades19:memnet +group add acquisition hades19:readout +group add acquisition hades19:ctrlctu group add run hades24:evtbuild group add run hades24:netmem diff --git a/hadaq/ctrlctu.c b/hadaq/ctrlctu.c index 1cfe639..a780b99 100644 --- a/hadaq/ctrlctu.c +++ b/hadaq/ctrlctu.c @@ -71,15 +71,15 @@ int main(int argc, char *argv[]) Worker_initEnd(worker); sleep(1); - system("/usr/local/bin/dtuctrl -t ctu reset"); - system("/usr/local/bin/dtuctrl -t ctu rate 1"); - system("/usr/local/bin/dtuctrl -t ctu start"); + system("/home/hades/tt00/slow/dtu/dtuctrl -t ctu reset"); + system("/home/hades/tt00/slow/dtu/dtuctrl -t ctu rate 1"); + system("/home/hades/tt00/slow/dtu/dtuctrl -t ctu start"); (*ctuEnabled) = 1; if (0 == setjmp(terminateJmp)) { pause(); } sleep(3); - system("/usr/local/bin/dtuctrl -t ctu stop"); + system("/home/hades/tt00/slow/dtu/dtuctrl -t ctu stop"); (*ctuEnabled) = 0; Worker_fini(worker);