From: muench <muench>
Date: Tue, 18 Apr 2000 07:26:55 +0000 (+0000)
Subject: allows assembly of sub events and one level sub-sub events
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0e5b261e3489a639b778201dbc1b87a79fbe2797;p=daqdata.git

allows assembly of sub events and one level sub-sub events
---

diff --git a/hadaq/evt.c b/hadaq/evt.c
index ab7468f..2be94d2 100644
--- a/hadaq/evt.c
+++ b/hadaq/evt.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Id: evt.c,v 6.3 1999-09-12 10:43:34 hades Stab $";
+static char rcsId[] = "$Id: evt.c,v 6.4 2000-04-18 07:26:55 muench Stab $";
 
 #define _ANSI_C_SOURCE
 #include <stddef.h>
@@ -188,8 +188,13 @@ int Evt_write(void *my, FILE * file)
 
 void *Evt_appendSubEvt(void *my, void *subEvt)
 {
-	memcpy(Evt_end(my), subEvt, SubEvt_size(subEvt));
-	Evt_setSize(my, Evt_paddedSize(my) + SubEvt_size(subEvt));
+	if (SubEvt_decoding(subEvt) == SubEvtDecoding_SubEvts) {
+		memcpy(Evt_end(my), SubEvt_data(subEvt), SubEvt_dataSize(subEvt));
+		Evt_setSize(my, Evt_paddedSize(my) + SubEvt_dataSize(subEvt));
+	} else {
+		memcpy(Evt_end(my), subEvt, SubEvt_size(subEvt));
+		Evt_setSize(my, Evt_paddedSize(my) + SubEvt_size(subEvt));
+	}
 
 	return my;
 }