From e2cad5f67006af4d2e3cc9c327439c7b390677e1 Mon Sep 17 00:00:00 2001
From: hades <hades>
Date: Fri, 31 Aug 2001 11:21:25 +0000
Subject: [PATCH] Cleanup.  BUGBUG:  trigCode ist fetched from wrong word,
 Michael writes the code to second data word, readout gets it from first.

---
 hadaq/hwtrig.c | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/hadaq/hwtrig.c b/hadaq/hwtrig.c
index 90defe1..af02ee2 100644
--- a/hadaq/hwtrig.c
+++ b/hadaq/hwtrig.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.18 2001-08-31 00:17:01 hades Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtrig.c,v 6.19 2001-08-31 11:21:25 hades Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -208,6 +208,17 @@ void Hardware_readout(Hardware *my, void *partEvt)
 
 	SubEvt_setDecoding(partEvt, SubEvtDecoding_SubEvts);
 
+/*
+* read out MU
+*/
+
+	readoutTrig(my, subEvt);
+
+	trigTag = SubEvt_trigNr(subEvt) & 0xff;
+
+	trigCode = SubEvt_dataValue(subEvt, 0);
+	subEvt = SubEvt_next(partEvt, subEvt);
+
 #ifdef TOF_READOUT
 /*
 * read out CONC
@@ -216,13 +227,10 @@ void Hardware_readout(Hardware *my, void *partEvt)
 
 	for (i = 0; i < NCRATES; i++) {
 		HwTip_readSubEvt(my->tip, subEvt);
-		if (i == 0) {
-			trigTag = SubEvt_trigNr(subEvt) & 0xff;
-		} else {
-			if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
-				msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n",
-					my->tip->name, trigTag, SubEvt_trigNr(subEvt));
-			}
+		if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) {
+			SubEvt_setId(subEvt, SubEvt_id(subEvt) | 0x80000000);
+			msglog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x != 0x%08x\n",
+				my->tip->name, trigTag, SubEvt_trigNr(subEvt));
 		}
 		subEvt = SubEvt_next(partEvt, subEvt);
 	}
@@ -230,24 +238,6 @@ void Hardware_readout(Hardware *my, void *partEvt)
 
 #endif
 
-/*
-* read out MU
-*/
-
-	readoutTrig(my, subEvt);
-
-#ifndef TOF_READOUT
-	trigTag = SubEvt_trigNr(subEvt);
-#else
-	if ( trigTag != SubEvt_trigNr(subEvt) & 0xff) {
-		msglog(LOG_ERR, "(MU)Trigger tag mismatch: 0x%08x != 0x%08x\n",
-			trigTag, SubEvt_trigNr(subEvt));
-	}
-#endif
-
-	trigCode = SubEvt_dataValue(subEvt, 0);
-	subEvt = SubEvt_next(partEvt, subEvt);
-
 	SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt);
 	SubEvt_setId(partEvt, trigCode);
 	SubEvt_setTrigNr(partEvt, (trigNr << 8) | trigTag);
-- 
2.43.0