Changeset 15465 for trunk/FACT++/src

Timestamp:

05/01/13 09:48:15 (12 years ago)

Author:

tbretz

Message:

Removed some obsolete structure members; renamed some for easier understanding their meaning in the code

File:

• trunk/FACT++/src/FAD.h (modified) (7 diffs)

trunk/FACT++/src/FAD.h

@@ -162 +162 @@
 //---------------------------------------------------------------
 
-
 typedef struct _RUN_TAIL {
-  uint32_t nEventsOk ;  //how many events were written
+/*  uint32_t nEventsOk ;  //how many events were written
   uint32_t nEventsRej;  //how many events were rejected by SW-trig
   uint32_t nEventsBad;  //how many events were rejected by Error
@@ -171 +170 @@
   uint32_t PCtimeX ;    //time when last  event received
 
- 
+*/
 //probably more to come ...
 } __attribute__((__packed__)) RUN_TAIL ;
@@ -186 +185 @@
 typedef struct {
   uint32_t runId ;       //run number
-  uint32_t firstTime ;   //epoch of first event received
-  uint32_t firstUsec ;   //epoch of first event received
+//  uint32_t firstTime ;   //epoch of first event received
+//  uint32_t firstUsec ;   //epoch of first event received
   uint32_t lastTime ;    //time when last event written so far
   uint32_t closeTime ;   //time when run should be closed
@@ -194 +193 @@
   uint32_t procEvt ;     //actual number of events processed so far
    int32_t lastEvt ;     //last event of this run read so far
-  uint32_t nextEvt ;     //next event number to be written
-  uint32_t waitEvt ;     //event that would be ready to be written
+//  uint32_t nextEvt ;     //next event number to be written
+//  uint32_t waitEvt ;     //event that would be ready to be written
    int16_t fileId  ;     //<0 never opened, 0=open, >0 closed
    int16_t procId  ;     //processing <0 never opened, 0=open, >0 closed
@@ -223 +222 @@
   int16_t  nRoiTM ;
   uint32_t pcTime[2] ;
-  int32_t  evtLen ;
+//  int32_t  evtLen ;
   uint8_t  Errors[4] ;
+
+  uint32_t evtCtrl_idx;
+
   EVENT   *fEvent ;
   PEVNT_HEADER *FADhead; //
-  int8_t  *buffer ;
+//  int8_t  *buffer ;
 
 } WRK_DATA ;             //internal to eventbuilder
@@ -236 +238 @@
 
 typedef struct {
-  int frstPtr ;             //first used index
-  int lastPtr ;             //last  used index 
-  int evtBuf[MAX_EVT*MAX_RUN] ;     //index of event in mBuffer
-  int evtStat[MAX_EVT*MAX_RUN] ;    //status of event:
+//  int frstPtr ;             //first used index
+//  int lastPtr ;             //last  used index
+    int mBuffer_idx;//[MAX_EVT*MAX_RUN] ;     //index of event in mBuffer
+  int evtStat;//[MAX_EVT*MAX_RUN] ;    //status of event:
                                       // -1=empty
                                       //  1..NBoards reading #Boards
@@ -251 +253 @@
                                 //(TO BE REVISED)
 
-  uint32_t pcTime[MAX_EVT*MAX_RUN] ;     //time when last action happened
+//  uint32_t lastRecv;//[MAX_EVT*MAX_RUN] ;     //time when last action happened
 } EVT_CTRL ;     //internal to eventbuilder