Changeset 10963 for trunk/FACT++/src/FAD.h

Timestamp:

06/09/11 21:15:53 (13 years ago)

Author:

tbretz

Message:

Some new version -- now chnagelog informations available.

File:

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

trunk/FACT++/src/FAD.h

@@ -29 +29 @@
 // Data structures
 //
+
+typedef struct{
+  int hardID ;       //hardware ID
+  int pos_i ;        //geometrical positon row 
+  int pos_j ;        //                    column
+  int G_APD ;        //G-APD identifier
+  double V_op ;      //operation voltage
+  int HV_B ;         //HV Board
+  int HV_C ;         //HV Channel
+  double pos_X ;     //geometrical position in pixel units
+  double pos_Y ;     //
+} PIX_MAP ;
+
+
 typedef struct {
 
@@ -76 +90 @@
 #define NBOARDS      40      // max. number of boards
 #define NPIX       1440      // max. number of pixels
-#define NTMARK      180      // max. number of timeMarker signals
+#define NTMARK      160      // max. number of timeMarker signals
 #define MAX_SOCK    280      // NBOARDS * 7
 
@@ -101 +115 @@
 
 typedef struct {
+  uint16_t Roi ;            // #slices per pixel (same for all pixels and tmarks)
   uint32_t EventNum ;       // EventNumber as from FTM
   uint16_t TriggerType ;    // Trigger Type from FTM
-  uint16_t Roi ;            // #slices per pixel (same for all pixels and tmarks)
 
   uint32_t SoftTrig ;       // SoftTrigger Info (TBD)
   uint32_t PCTime ;         // when did event start to arrive at PC
 
-   int16_t *StartPix ;      //First Channel per Pixel (Pixels sorted according Software ID)  ; -1 if not filled
-
-   int16_t *StartTM  ;      //First Channel for TimeMark (sorted Hardware ID) ; -1 if not filled
-
-  uint16_t *Adc_Data ;      // [ NPixels ] [ ROI ]  sorted softID
-
-  uint16_t *Adc_Tmark ;     // [ NTmark ] [ ROI ]   sorted hardID
-
-//this is highly redundant and should be reduced to usefull info [if any]
-  PEVNT_HEADER *FADhead;    // [ NBoards ] sorted Board Headers (according Hardware ID)
+  uint32_t BoardTime[NBOARDS];//
+
+   int16_t StartPix[NPIX];  // First Channel per Pixel (Pixels sorted according Software ID)  ; -1 if not filled
+
+   int16_t StartTM[NTMARK]; // First Channel for TimeMark (sorted Hardware ID) ; -1 if not filled
+
+  uint16_t Adc_Data[1];     // final length defined by malloc ....
 
 } EVENT ;
@@ -162 +173 @@
 //---------------------------------------------------------------
 
-#define MAX_RUN   64
-#define MAX_EVT   131072
+#define MAX_RUN   256
+#define MAX_EVT   32768  //don't worry, for events is MAX_RUN*MAX_EVT
+
+typedef void* FileHandle_t ;
 
 typedef struct {
   uint32_t runId ;       //run number
   uint32_t lastTime ;    //time when last event written so far
+  uint32_t closeTime ;   //time when run should be closed
   uint32_t nextEvt ;     //next event number to be written
   uint32_t waitEvt ;     //event that would be ready to be written
-   int32_t fileId ;      //id of open file
+   int32_t fileId  ;     //<0 never opened, 0=open, >0 closed
+  FileHandle_t fileHd ;   //fileHandle (NULL if not open)
    int16_t ctrlId[MAX_EVT] ; //index to buffId (sorted list; -1 =end)
   uint16_t buffId[MAX_EVT] ; //index to mBuffer(buffered raw data)
@@ -188 +203 @@
   int32_t nRoi   ;
   int32_t pcTime ;
+  int32_t evtLen ;
   EVENT   *fEvent  ;
+  PEVNT_HEADER *FADhead; //
 
 } WRK_DATA ;             //internal to eventbuilder
@@ -197 +214 @@
 
 typedef struct {
-  int readPtr ;             //index of reading
-  int writePtr ;            //index of writing
+  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:
@@ -215 +232 @@
 } EVT_CTRL ;
 
+//---------------------------------------------------------------
+
+
+typedef struct {
+   struct sockaddr_in sockAddr ;
+   int    sockDef ; //<0 not defined/ ==0 not to be used/ >0 used
+} FACT_SOCK ;