Changeset 49 for drsdaq/RawDataCTX.cc

Timestamp:

05/28/09 10:35:43 (15 years ago)

Author:

ogrimm

Message:

Small change to data format

File:

• drsdaq/RawDataCTX.cc (modified) (8 diffs)

drsdaq/RawDataCTX.cc

@@ -62 +62 @@
   
   // Read board structures
-  BStruct = new BoardStructure [RHeader->NCMCBoards];
-  for(unsigned int i=0; i<RHeader->NCMCBoards; i++) {
+  BStruct = new BoardStructure [RHeader->NBoards];
+  for(unsigned int i=0; i<RHeader->NBoards; i++) {
     if(fread(&BStruct[i], RHeader->BoardStructureSize, 1, Rawfile) != 1) {
       if(!Silent) printf("Error: Could not read board structure of board number %d\n",i+1);
@@ -72 +72 @@
   }
   // Allocate memory for event data
-  Data = new short[RHeader->NCMCBoards*RHeader->NChips*RHeader->NChannels*RHeader->Samples];
+  Data = new short[RHeader->NBoards*RHeader->NChips*RHeader->NChannels*RHeader->Samples];
   FileOpen = true;
   
@@ -79 +79 @@
     fprintf(fptr, "Magic number          %x (%s)\n", RHeader->MagicNum, RHeader->MagicNum==MAGICNUM_CLOSED?"OK":(RHeader->MagicNum==MAGICNUM_OPEN?"File not closed":"Error"));
     fprintf(fptr, "Data format:          %u\n", RHeader->DataFormat);
-    fprintf(fptr, "Software revision:    %u\n", RHeader->SoftwareRevision);         
+    fprintf(fptr, "Software revision:    %d\n", RHeader->SoftwareRevision);         
 
     fprintf(fptr, "Run header size:      %d\n", RHeader->RunHeaderSize);
@@ -91 +91 @@
     
     fprintf(fptr, "Events:           %u\n", RHeader->Events);
-    fprintf(fptr, "CMC Boards:       %u\n", RHeader->NCMCBoards);
+    fprintf(fptr, "Boards:           %u\n", RHeader->NBoards);
     fprintf(fptr, "DRS chips:        %u\n", RHeader->NChips);
     fprintf(fptr, "Channels/chip:    %u\n", RHeader->NChannels);
@@ -102 +102 @@
     fprintf(fptr, "  microsecond:    %u\n", RHeader->EndMicrosecond);
 
-    for (unsigned int i=0; i<RHeader->NCMCBoards; i++) {
+    for (unsigned int i=0; i<RHeader->NBoards; i++) {
       fprintf(fptr, "*** Board %d ***\n", i);
       fprintf(fptr, "Serial number:            %d\n", BStruct[i].SerialNo);
@@ -139 +139 @@
   
 /*   // Move file pointer to desired event header (if zero read next event)
-  if(EventNo!=0 && fseek(Rawfile, RHeader->RunHeaderSize+RHeader->BoardStructureSize*RHeader->NCMCBoards+(EventNo-1)*(RHeader->EventHeaderSize+RHeader->NCMCBoards*RHeader->NChips*
+  if(EventNo!=0 && fseek(Rawfile, RHeader->RunHeaderSize+RHeader->BoardStructureSize*RHeader->NBoards+(EventNo-1)*(RHeader->EventHeaderSize+RHeader->NBoards*RHeader->NChips*
       RHeader->NChannels*RHeader->Samples*sizeof(short)), SEEK_SET)!=0) {
     if(!Silent) printf("Error: Could not move to requested event\n");
@@ -149 +149 @@
   if (EventNo != 0) {
     bool SEEK_OK=true;
-    if (fseek(Rawfile, RHeader->RunHeaderSize+RHeader->BoardStructureSize*RHeader->NCMCBoards, SEEK_SET) != 0) SEEK_OK=false;
+    if (fseek(Rawfile, RHeader->RunHeaderSize+RHeader->BoardStructureSize*RHeader->NBoards, SEEK_SET) != 0) SEEK_OK=false;
     while(SEEK_OK) {
       if (fread(EHeader, RHeader->EventHeaderSize, 1, Rawfile) != 0) SEEK_OK = false;
@@ -178 +178 @@
   if(fptr != NULL) {
     fprintf(fptr, "Event number:    %u\n",        EHeader->EventNumber);
-    fprintf(fptr, "Time [sec]:      %u - UTC %s", EHeader->Seconds, asctime(gmtime((time_t *) &EHeader->Seconds)));
-    fprintf(fptr, "Time [usec]:     %u\n",        EHeader->Microseconds);
+    fprintf(fptr, "Time [sec]:      %u - UTC %s", EHeader->Second, asctime(gmtime((time_t *) &EHeader->Second)));
+    fprintf(fptr, "Time [usec]:     %u\n",        EHeader->Microsecond);
     fprintf(fptr, "Trigger type:    0x%0X\n",     EHeader->TriggerType);
     fprintf(fptr, "Size [byte]:     %u\n",        EHeader->EventSize);