From: hades <hades>
Date: Wed, 8 Nov 2000 12:07:42 +0000 (+0000)
Subject: Shower adjustments
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=aa6e741209c6362fec8f9ea1a9f89c3cfe04c0c8;p=daqdata.git

Shower adjustments
BUGFIX write to stdout didn't work any more
---

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index a0ce820..4a1ed1c 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.20 2000-11-08 08:27:14 hades Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.21 2000-11-08 12:07:42 hades Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 
@@ -321,11 +321,9 @@ int main(int argc, char *argv[])
 		evt = appendFile(evt, theArgs->slowCtrlFiles[i]);
 	}
 	if (outFile != NULL) {
-		if (strcmp(theArgs->outDev, "file") == 0) {
-			fwrite(evt, 1, Evt_paddedSize(evt), outFile);
-		} else if (strcmp(theArgs->outDev, "tape") == 0) {
-			writeAnsiTape(outTape, evt, Evt_paddedSize(evt));
-		}
+		fwrite(evt, 1, Evt_paddedSize(evt), outFile);
+	} else if (outTape != NULL) {
+		writeAnsiTape(outTape, evt, Evt_paddedSize(evt));
 	}
 	deleteEvt(evt);
 
@@ -388,11 +386,9 @@ int main(int argc, char *argv[])
 		}
 		if (currNrOfSubEvts == nrOfSubEvts) {
 			if (outFile != NULL) {
-				if (strcmp(theArgs->outDev, "file") == 0) {
-					fwrite(evt, 1, Evt_paddedSize(evt), outFile);
-				} else if (strcmp(theArgs->outDev, "tape") == 0) {
-					writeAnsiTape(outTape, evt, Evt_paddedSize(evt));
-				}
+				fwrite(evt, 1, Evt_paddedSize(evt), outFile);
+			} else if (outTape != NULL) {
+				writeAnsiTape(outTape, evt, Evt_paddedSize(evt));
 			}
 			Evt_online(evt);
 			(*evtsComplete)++;
@@ -409,11 +405,9 @@ int main(int argc, char *argv[])
 		evt = appendFile(evt, theArgs->slowCtrlFiles[i]);
 	}
 	if (outFile != NULL) {
-		if (strcmp(theArgs->outDev, "file") == 0) {
-			fwrite(evt, 1, Evt_paddedSize(evt), outFile);
-		} else if (strcmp(theArgs->outDev, "tape") == 0) {
-			writeAnsiTape(outTape, evt, Evt_paddedSize(evt));
-		}
+		fwrite(evt, 1, Evt_paddedSize(evt), outFile);
+	} else if (outTape != NULL) {
+		writeAnsiTape(outTape, evt, Evt_paddedSize(evt));
 	}
 	deleteEvt(evt);
 
diff --git a/hadaq/hwship.c b/hadaq/hwship.c
index 9e55f22..85dc765 100644
--- a/hadaq/hwship.c
+++ b/hadaq/hwship.c
@@ -11,7 +11,7 @@
 #include "hwship.h"
 
 /* set this to 8 for zero supp on, 0 for off */
-#define ZEROSUP 0
+#define ZEROSUP 8
 
 static int bankRequested(HwShip *my) {
 	UInt2 val;
diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c
index e0b7c0c..51459c0 100644
--- a/hadaq/hwshow.c
+++ b/hadaq/hwshow.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.9 2000-11-08 07:53:23 hades Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.10 2000-11-08 12:07:42 hades Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -13,7 +13,7 @@ static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/had
 #include "hwship.h"
 
 /* Set number of RCs here */
-#define NSHIPS 1
+#define NSHIPS 8
 
 struct HardwareS {
 	size_t maxSubEvtSize;
diff --git a/hadaq/makeenv b/hadaq/makeenv
index bae2a75..bd38b80 100644
--- a/hadaq/makeenv
+++ b/hadaq/makeenv
@@ -47,8 +47,8 @@ elif test $HADAQ_CONF = "LYNXOS"
 then
 	export CC="gcc"
 	export RPCGEN="rpcgen"
-	export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltcl -lm -lrpc -lnetinet -L$HOME/ATM/lib -latm -L/lib/ces -lvme -lbma -luio"
-	export INCLUDES="-I/usr/local/include -I$HOME/include"
+	export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltclParam -ltcl -lm -lrpc -lnetinet -L$HOME/ATM/lib -latm -L/lib/ces -lvme -lbma -luio"
+	export INCLUDES="-I/usr/local/include -I$HOME/include -I$HOME/include/tcl"
 	export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT"
 elif test $HADAQ_CONF = "LYNXOS_E7"
 then
diff --git a/hadaq/param.tcl b/hadaq/param.tcl
index 5a1d918..1db4a17 100644
--- a/hadaq/param.tcl
+++ b/hadaq/param.tcl
@@ -1,24 +1,15 @@
-set evtbuild(file) ./daq_evtbuild
-set evtbuild(stndln) 0
-#set evtbuild(nrofmsgs) 1
-set netmem(file) ./daq_netmem
-set netmem(stndln) 0
-set netmem(nrofmsgs) 1
-set netmem(inpath0) UDP:0.0.0.0:3000
-set memnet(file) ./daq_memnet
-set memnet(stndln) 0
-set memnet(outpath) UDP:140.181.110.27:3000
-set readout(file) ./daq_readout
-set readout(stndln) 0
-
-set sam0(cardbase) 0x9C000000
-set soft(size) 10240
+set soft(size) 1024
 
 set dtu(cardbase) 0x44100000
 
-set ship0(cardbase) 0x200000
-set ship1(cardbase) 0x100000
+set ship0(cardbase) 0x100000
+set ship1(cardbase) 0x200000
 set ship2(cardbase) 0x300000
+set ship3(cardbase) 0x400000
+set ship4(cardbase) 0x500000
+set ship5(cardbase) 0x600000
+set ship6(cardbase) 0x700000
+set ship7(cardbase) 0x800000
 set race0(cardbase) 0x00000000
 set race1(cardbase) 0x10000000
 set race2(cardbase) 0x20000000