From 04d7f2f985e3acc7bfdbb079ecbfdecd0f09402f Mon Sep 17 00:00:00 2001
From: hades <hades>
Date: Sat, 11 Nov 2000 19:43:02 +0000
Subject: [PATCH] Removed trigNr from tip BUGFIX in hwtof

---
 hadaq/hwtip.c | 8 --------
 hadaq/hwtip.h | 1 -
 hadaq/hwtof.c | 7 ++++---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/hadaq/hwtip.c b/hadaq/hwtip.c
index 927840c..2d20a09 100644
--- a/hadaq/hwtip.c
+++ b/hadaq/hwtip.c
@@ -123,7 +123,6 @@ int conHwTip(HwTip * my, const char *name, const Param *param)
 		msglog(LOG_ERR, "HwTip on %p not found\n", cardBase);
 		return -1;
 	}
-	my->trigNr = 0;
 
 	my->currAddr = 0xffffffff;	/* start at the end */
 	my->bankRequested = 1;		/* of the empty bank */
@@ -197,7 +196,6 @@ int HwTip_readSubEvt(HwTip * my, void *subEvt)
 	UInt4 *data = (UInt4 *) subEvt;
 	int firstAddr;
 	size_t size;
-	UInt1 trigTag;
 
 	do {
 	  size = berrGetL(my->lvme, my->currAddr);
@@ -213,11 +211,5 @@ int HwTip_readSubEvt(HwTip * my, void *subEvt)
 		*data++ = berrGetL(my->lvme, my->currAddr);
 	}
 
-	trigTag = SubEvt_trigNr(subEvt) & 0xff;
-
-	/* normal extension of trigger tag */
-	SubEvt_setTrigNr(subEvt, my->trigNr << 8 | trigTag);
-	my->trigNr++;
-
 	return 0;
 }
diff --git a/hadaq/hwtip.h b/hadaq/hwtip.h
index 220afec..244ab79 100644
--- a/hadaq/hwtip.h
+++ b/hadaq/hwtip.h
@@ -9,7 +9,6 @@ typedef struct HwTipS {
   char name[16];
   LVme *lvme;
   unsigned long  currAddr;
-  unsigned trigNr;
   unsigned long bankRequested;
   unsigned long pipeFull;
   unsigned long daqRq;
diff --git a/hadaq/hwtof.c b/hadaq/hwtof.c
index 5e2c770..c3ecf7c 100644
--- a/hadaq/hwtof.c
+++ b/hadaq/hwtof.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtof.c,v 1.15 2000-11-11 11:32:54 hades Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwtof.c,v 1.16 2000-11-11 19:43:02 hades Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -104,13 +104,14 @@ void Hardware_readout(Hardware *my, void *partEvt)
 	for (i = 0; i < NCRATES; i++) {
 		HwTip_readSubEvt(my->tip[my->tipToRead], subEvt);
 		if (i == 0) {
-			trigTag == SubEvt_trigNr(subEvt);
+			trigTag = SubEvt_trigNr(subEvt);
 		}
 		subEvt = SubEvt_next(partEvt, subEvt);
 	}
 
 	SubEvt_setSize(partEvt, (char *)subEvt - (char *)partEvt);
-	SubEvt_setTrigNr(partEvt, (trigNr++ << 8) | trigTag);
+	SubEvt_setTrigNr(partEvt, (trigNr << 8) | trigTag);
 	SubEvt_setId(partEvt, 0);
+	trigNr++;
 	msglog(LOG_DEBUG, "partEvt: %s\n", SubEvt_2charP(partEvt));
 }
-- 
2.43.0