From: hades <hades>
Date: Thu, 12 Apr 2001 12:28:05 +0000 (+0000)
Subject: BUGFIX
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0e7aae7efa0ff7e07c6bd370180cfdf4fd1e510f;p=daqdata.git

BUGFIX
---

diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c
index 319c407..fb80b93 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.16 2001-04-11 12:56:18 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.17 2001-04-12 12:28:05 hades Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -15,7 +15,7 @@ static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hada
 #include "hwship.h"
 
 /* Set number of RCs here */
-#define NSHIPS 8
+#define NSHIPS 12
 
 struct HardwareS {
 	size_t maxSubEvtSize;
@@ -118,9 +118,9 @@ void Hardware_readout(Hardware *my, void *partEvt)
 	for (i = 0; i < NSHIPS; i++) {
 		HwShip_readSubEvt(my->ship[i], subEvt);
 		if (i == 0) {
-			trigTag = SubEvt_trigNr(subEvt);
+			trigTag = SubEvt_trigNr(subEvt) & 0xff;
 		} else {
-			if (trigTag != SubEvt_trigNr(subEvt)) {
+			if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
 				msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n",
 					my->ship[i]->name,trigTag, SubEvt_trigNr(subEvt));
 			}
diff --git a/hadaq/param.tcl b/hadaq/param.tcl
index 55da14c..4ab745e 100644
--- a/hadaq/param.tcl
+++ b/hadaq/param.tcl
@@ -44,6 +44,8 @@ set ipc6(ipc_vmebase) 0x700000
 set ipc7(ipc_vmebase) 0x800000
 set ipc8(ipc_vmebase) 0x900000
 set ipc9(ipc_vmebase) 0xa00000
+set ipc10(ipc_vmebase) 0xb00000
+set ipc11(ipc_vmebase) 0xc00000
 
 set race0(cardbase) 0x00000000
 set race1(cardbase) 0x10000000