From 646d656c8ca8da54e065d1ac2787146f950d1a0d Mon Sep 17 00:00:00 2001 From: hades Date: Sun, 19 Nov 2000 17:41:03 +0000 Subject: [PATCH] Tapehandling quick repair --- hadaq/ansiTape.c | 2 +- hadaq/evtbuild.c | 13 +++++-------- hadaq/param.tcl | 8 +++++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/hadaq/ansiTape.c b/hadaq/ansiTape.c index f88780b..e3ed213 100644 --- a/hadaq/ansiTape.c +++ b/hadaq/ansiTape.c @@ -58,7 +58,7 @@ AnsiTape *openAnsiTape(const char* filename) { } mtoper->mt_op = MTBSF; - mtoper->mt_count = 3; + mtoper->mt_count = 2; stat = ioctl(tape, MTIOCTOP, mtoper); if (stat == -1) { diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index aede6c7..50eba6a 100644 --- a/hadaq/evtbuild.c +++ b/hadaq/evtbuild.c @@ -1,4 +1,4 @@ -static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.22 2000-11-10 18:00:34 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.23 2000-11-19 17:41:03 hades Exp $"; #define _POSIX_C_SOURCE 199309L @@ -413,13 +413,10 @@ int main(int argc, char *argv[]) deleteEvt(evt); if (outFile != NULL) { - if (strcmp(theArgs->outDev, "tape") == 0) { - if (-1 == closeAnsiTape(outTape)) { - msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); - exit(EXIT_FAILURE); - } - } else if (-1 == fclose(outFile)) { - msglog(LOG_NOTICE, "%s, line %d:\n", __FILE__, __LINE__, strerror(errno)); + fclose(outFile); + } else if (outTape != NULL) { + if (-1 == closeAnsiTape(outTape)) { + msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno)); } } for (i = 0; i < theArgs->nrOfMsgs; i++) { diff --git a/hadaq/param.tcl b/hadaq/param.tcl index a514db1..0481bf7 100644 --- a/hadaq/param.tcl +++ b/hadaq/param.tcl @@ -2,17 +2,19 @@ set evtbuild(file) ./daq_evtbuild set evtbuild(stndln) 0 set evtbuild(priority) -2 set evtbuild(nrofmsgs) 1 +set evtbuild(outdev) file +set evtbuild(outpath) /share/scratch5 set netmem(file) ./daq_netmem set netmem(stndln) 0 set netmem(priority) -1 -set netmem(inpath0) ATM:0:150 +set netmem(inpath0) ATM:0:60 set netmem(nrofmsgs) 1 set netmem(verb) debug set memnet(file) ./daq_memnet set memnet(stndln) 0 set memnet(priority) -1 -set memnet(outpath) ATM:0:150 -set memnet(bandwidth) 1000 +set memnet(outpath) ATM:0:60 +set memnet(bandwidth) 0 set readout(file) ./daq_readout #set readout(wmark) 0 set readout(stndln) 0 -- 2.43.0