]> jspc29.x-matter.uni-frankfurt.de Git - daqdata.git/commitdiff
BUGFIX
authorhades <hades>
Thu, 12 Apr 2001 12:28:05 +0000 (12:28 +0000)
committerhades <hades>
Thu, 12 Apr 2001 12:28:05 +0000 (12:28 +0000)
hadaq/hwshow.c
hadaq/param.tcl

index 319c40784aa9f13eeb0a13074feb66317dd324d0..fb80b93366bcabd8c328e8bbccca62e072f3441b 100644 (file)
@@ -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));
                        }
index 55da14cabf1422fe9ee85aef68a82be1fa3091ed..4ab745e6f6dac6edb92faa80abae9176f1c1ba40 100644 (file)
@@ -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