Changeset 85 for drsdaq

Timestamp:

07/09/09 16:24:10 (15 years ago)

Author:

ogrimm

Message:

Small change in slow data format

Location:

drsdaq

Files:

• RawDataCTX.h (modified) (6 diffs)
• SlowData.cc (modified) (1 diff)

drsdaq/RawDataCTX.h

@@ -12 +12 @@
   using the gcc attribute __attribute__((__packed__)) is incompatible with root.
 
-
   The convention for the header structure is that exisitng structure entries
   should never be deleted. New items may only be added at the end.
-  Items named _res are introduced for compatibility with the MAGIC data format and are set to zero. 
 */
 
@@ -26 +24 @@
 #define DATA_FORMAT 1
 #define IDENTIFICATION 1    // Raw data file identification
-
 
 typedef char I8;
@@ -55 +52 @@
   I32 SoftwareRevision; // Subversion revision number (negative for modified working copy)
 
-  //U32 _res1[2];
   U32 Identification;
   U32 Type;             // Run type: 0=data, 1=pedestal, 3=test
   U32 RunNumber;
   U32 FileNumber;
-
   I8  Description[100];
-  //I8  _res2[140];
-  //U32 _res3[6];
        
   U32 NBoards;          // Number of used mezzanine boards
@@ -73 +66 @@
 
   U32 Events;           // Number of events in the file
-  //U32  _res4;
   U32 NBytes;           // Bytes per sample
-  //I8  _res5[20];
   
   U32 StartSecond;      // Opening and closing time of the file
@@ -85 +76 @@
 // Board structure
 typedef struct {
-  //I8  _res[17];
   I32 SerialNo;     // Board serial number
   F32 NomFreq;      // Nominal sampling frequency [GHz]
@@ -97 +87 @@
   U32 Second;          // Event time stamp (result of gettimeofday())
   U32 Microsecond;
-  //U32 _res[4];
   U32 TriggerType;
   U32 EventSize;        // Size of following data in bytes

drsdaq/SlowData.cc

@@ -58 +58 @@
   gettimeofday(&Time, NULL);
   InternalCall = true;
-  NewEntryCalled = AddToEntry("\n%s %s %d %d %d %d %d %d %d %lu %lu", Issuer, Variable, TM->tm_year+1900,TM->tm_mon+1,TM->tm_mday,TM->tm_hour,TM->tm_min,TM->tm_sec, Time.tv_usec/1000, Time.tv_sec, Time.tv_usec);
+  NewEntryCalled = AddToEntry("\n%s %s %d %d %d %d %d %d %d %lu ", Issuer, Variable, TM->tm_year+1900,TM->tm_mon+1,TM->tm_mday,TM->tm_hour,TM->tm_min,TM->tm_sec, Time.tv_usec/1000, Time.tv_sec);
   InternalCall = false;
   return NewEntryCalled;