Changeset 79 for drsdaq


Ignore:
Timestamp:
07/01/09 08:51:02 (15 years ago)
Author:
ogrimm
Message:
Removed padding bytes in headers
Location:
drsdaq
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • drsdaq/History.txt

    r68 r79  
    393916/6/2009   Data is not rotated by copying in memory, but by saving to disk in
    4040            correct order using writev() (10% gain in rate)
    41 18/6/2009   Introduced dummy, zero-initialized elements in raw data format to
    42             align ordering to MAGIC format. Run date is now calculated with a
    43             change to the next date on 13:00 UTC.
     4118/6/2009   Run date is now calculated with a change to the next date on 13:00 UTC.
    4442           

  • drsdaq/RawDataCTX.h

    r68 r79  
    3333typedef float F32;
    3434
    35 #define MAGICNUM_OPEN 0xc0c1    // Magic number for run header while file open
    36 #define MAGICNUM_CLOSED 0xc0c0  //    ... and when file is closed
    37 #define MAGICNUM_ERROR 0xc0c2   //    ... and when an error occurred
     35#define MAGICNUM_OPEN 0xe0e1    // Magic number for run header while file open
     36#define MAGICNUM_CLOSED 0xe0e0  //    ... and when file is closed
     37#define MAGICNUM_ERROR 0xe0e2   //    ... and when an error occurred
    3838
    3939// Error codes
    … …  
    5555  I32 SoftwareRevision; // Subversion revision number (negative for modified working copy)
    5656
    57   U32 _res1[2];
     57  //U32 _res1[2];
    5858  U32 Identification;
    5959  U32 Type;             // Run type: 0=data, 1=pedestal, 3=test
    … …  
    6262
    6363  I8  Description[100];
    64   I8  _res2[140];
    65   U32 _res3[6];
     64  //I8  _res2[140];
     65  //U32 _res3[6];
    6666       
    6767  U32 NBoards;          // Number of used mezzanine boards
    … …  
    7373
    7474  U32 Events;           // Number of events in the file
    75   U32  _res4;
    76   U32 NBytes;
    77   I8  _res5[20];
     75  //U32  _res4;
     76  U32 NBytes;           // Bytes per sample
     77  //I8  _res5[20];
    7878 
    7979  U32 StartSecond;      // Opening and closing time of the file
    … …  
    8585// Board structure
    8686typedef struct {
    87   I8  _res[17];
     87  //I8  _res[17];
    8888  I32 SerialNo;     // Board serial number
    8989  F32 NomFreq;      // Nominal sampling frequency [GHz]
    … …  
    9797  U32 Second;          // Event time stamp (result of gettimeofday())
    9898  U32 Microsecond;
    99   U32 _res[4];
     99  //U32 _res[4];
    100100  U32 TriggerType;
    101101  U32 EventSize;        // Size of following data in bytes
Note: See TracChangeset for help on using the changeset viewer.