From: hadaq <hadaq>
Date: Wed, 23 Oct 2002 15:24:49 +0000 (+0000)
Subject: BUGFIXES -- mm
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=de5edf3863ac4e1aa5438c4abefec1bba23cc5af;p=daqdata.git

BUGFIXES -- mm
---

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index 2bab2f8..66ef9a9 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.47 2002-10-23 15:10:03 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.48 2002-10-23 15:24:49 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
 
 			if (i == 0) {
 				currTrigNr = SubEvt_trigNr(subEvt) >> 8;
-				currId = SubEvt_id(subEvt);
+				currId = SubEvt_pureId(subEvt);
 				Evt_setId(evt, currId);
 #ifndef NDEBUG
 			syslog(LOG_DEBUG,
diff --git a/hadaq/hwsoft.c b/hadaq/hwsoft.c
index 0d7e4f5..dd60074 100644
--- a/hadaq/hwsoft.c
+++ b/hadaq/hwsoft.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.24 2002-10-23 14:56:47 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwsoft.c,v 6.25 2002-10-23 15:24:49 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -142,13 +142,13 @@ void Hardware_readout(Hardware *my, void *partEvt)
 	static uint32_t trigNr;
 	static uint8_t trigTag;
 	uint8_t trigCode;
+	int err = 0;
 
 	SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts);
-	SubEvt_setId(partEvt, trigCode);
 
 	readoutTrig(subEvt);
 	if (SubEvt_dataError(subEvt)) {
-		SubEvt_setDataError(partEvt);
+		err = 1;
 	}
 	if (trigTag > SubEvt_trigNr(subEvt)) {
 		trigNr++;
@@ -159,10 +159,14 @@ void Hardware_readout(Hardware *my, void *partEvt)
 
 	readoutSoft(subEvt);
 	if (SubEvt_dataError(subEvt)) {
-		SubEvt_setDataError(partEvt);
+		err = 1;
 	}
 	subEvt = SubEvt_next(partEvt, subEvt);
 
+	SubEvt_setId(partEvt, trigCode);
+	if (err) {
+		SubEvt_setDataError(partEvt);
+	}
 	SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt);
 	SubEvt_setTrigNr(partEvt, (trigNr << 8) | trigTag);
 	syslog(LOG_DEBUG, "partEvt: %s", SubEvt_2charP(partEvt));