Running with SE-Readout, E7 crashed after 10^5 ev., trigger tag differing.

diff --git a/hadaq/hwtip.c b/hadaq/hwtip.c
index 80fcbae5819930213f417e080d598308c207031e..804f7d655e3eda40b5dd1e851a4d95726f9e27fa 100644 (file)
--- a/hadaq/hwtip.c
+++ b/hadaq/hwtip.c
@@ -51,10 +51,10 @@ int conHwTip(HwTip * my, const char *name, const Param *param)
   }
   my->currAddr = 0xffffffff; /* start at the end */
   my->bankRequested = 1;     /* of the empty bank */
-  my->pipeFull = 1;
-  my->daqRq = 0;
-  my->daqGr = 2;
-  my->fifo = 0x01000000;
+  my->pipeFull = 2;
+  my->daqRq = 1;
+  my->daqGr = 13;
+  my->fifo = LVL2_PIPE2_BASE;
 
   return 0;
 }
@@ -66,7 +66,7 @@ void desHwTip(HwTip * my)
 
 void HwTip_requestBuffer(HwTip *my) {
   LVme_clrBitL(my->lvme, EXT_DAQ, my->daqRq);
-  while (LVme_tstBitL(my->lvme, EXT_DAQ, my->daqGr)) {
+  while (LVme_tstBitL(my->lvme, EXT_STATUS, my->daqGr)) {
 #if 1
                        struct timespec tS, *t = &tS;
                        t->tv_sec = 0;
@@ -78,14 +78,14 @@ void HwTip_requestBuffer(HwTip *my) {
        my->bankRequested = 1;
        my->pipeFull = 2;
        my->daqRq = 1;
-       my->daqGr = 3;
-       my->fifo = 0x01000800;
+       my->daqGr = 13;
+       my->fifo = LVL2_PIPE2_BASE;
   } else {
        my->bankRequested = 0;
        my->pipeFull = 1;
        my->daqRq = 0;
-       my->daqGr = 2;
-       my->fifo = 0x01000000;
+       my->daqGr = 12;
+       my->fifo =LVL2_PIPE1_BASE;
   }
   msglog(LOG_DEBUG, "wait for data\n");
   while (!LVme_tstBitL(my->lvme, EXT_STATUS, my->pipeFull)) {
@@ -99,11 +99,11 @@ void HwTip_requestBuffer(HwTip *my) {
   msglog(LOG_DEBUG, "data available\n");
   LVme_setBitL(my->lvme, EXT_DAQ, my->daqRq);
 
-  my->currAddr = my->fifo + 0x4;
+  my->currAddr = my->fifo + 0x8;
 }
 
 int HwTip_isBusy(HwTip *my) {
-  return !LVme_tstBitL(my->lvme, EXT_DAQ, my->daqGr);
+  return !LVme_tstBitL(my->lvme, EXT_STATUS, my->daqGr);
 }
 
 int HwTip_isEmpty(HwTip *my) {
@@ -116,7 +116,7 @@ int HwTip_readSubEvt(HwTip *my, void *subEvt) {
   size_t size;
   UInt1 trigTag;
 
-#if 0
+#if 1
   size = LVme_getL(my->lvme, my->currAddr);
 
   /* copy one sub evt from RC to memory */

diff --git a/hadaq/tof_defs.h b/hadaq/tof_defs.h
index 88d7d2850dd022e06400f7d81fca06d5f2127430..a096733acc248e7ac0a4856bb5abe7398d458bb4 100644 (file)
--- a/hadaq/tof_defs.h
+++ b/hadaq/tof_defs.h
@@ -1,6 +1,9 @@
 /****  Headerfile for TOF-RTU registers */
 /****  E.Lins 13-Jan-2000 */
 
+/* $Id: tof_defs.h,v 1.2 2000-05-09 13:36:08 hades Exp $ */
+/* $Source: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/tof_defs.h,v $ */
+
 
 /* Onboard components base addresses... */
 
@@ -17,6 +20,8 @@
 #define SHARC5BASE     0x00800000
 #define SHARC6BASE     0x00a00000
 
+#define LVL2_PIPE1_BASE 0x01000000
+#define LVL2_PIPE2_BASE 0x01008000
 
 /* registers in external memory */
 
@@ -38,12 +43,13 @@
 #define LVL2_DAQ1_BSY      0x00000100U
 #define LVL2_DAQ2_BSY      0x00000200U
 
+#define LVL2_DAQ1_GR       0x00001000U
+#define LVL2_DAQ2_GR       0x00002000U
+
 /* bits in the daq register */
 
 #define LVL2_DAQ1_RQ       0x00000001U
 #define LVL2_DAQ2_RQ       0x00000002U
-#define LVL2_DAQ1_GR       0x00000004U
-#define LVL2_DAQ2_GR       0x00000008U
 
 
 /* TUNDRA internal registers */