Changeset 68 for drsdaq/DAQReadout.cc

Timestamp:

06/19/09 08:55:28 (15 years ago)

Author:

ogrimm

Message:

Introduced dummy, zero initialized items in raw data format to align with MAGIC format ordering, changed date rollover to 13:00 UTC

File:

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

drsdaq/DAQReadout.cc

@@ -15 +15 @@
 
 static const char* daq_state_str[] = {"active", "stopped"};
-static const char* daq_runtype_str[] = {"data", "pedestal", "test"};
+static const char* daq_runtype_str[] = {"data", "pedestal", "reserved", "test"};
 
 static const struct CL_Struct { const char *Name;    
@@ -121 +121 @@
   drs->InitialScan();
 
+  // Allocate headers and initialise to zero
   RHeader = new RunHeader;
+  memset(RHeader, 0, sizeof(RunHeader));
   EHeader = new EventHeader;
+  memset(EHeader, 0, sizeof(EventHeader));
+  
+  // Scan for DRS boards
   DRSFreq = new float [drs->GetNumberOfBoards()];
-
-  // Scan for DRS boards
   if (drs->GetNumberOfBoards()==0) PrintMessage("No DRS boards found - check VME crate and configuration file!\n");
 
@@ -139 +142 @@
   }
   BStruct  = new BoardStructure [NumBoards == 0 ? 1:drs->GetNumberOfBoards()];
+  memset(BStruct, 0, sizeof(BoardStructure)*(NumBoards == 0 ? 1:drs->GetNumberOfBoards()));
+
   WaveForm = new short [NumBoards == 0 ? 1:NumBoards][kNumberOfChips][kNumberOfChannels][kNumberOfBins];
   TriggerCell = new int [NumBoards == 0 ? 1:NumBoards][kNumberOfChips] ();  // Zero initialised
@@ -877 +882 @@
   char RunDate[MAX_COM_SIZE], Buffer[MAX_COM_SIZE];
   
-  // Write run date to status structure
-  time(&rawtime);   timeinfo = localtime(&rawtime);
-  snprintf(RunDate,sizeof(RunDate), "%d%02d%02d",timeinfo->tm_year+1900,timeinfo->tm_mon + 1,timeinfo->tm_mday);
+  // Write run date to status structure (if after 13:00, use next day)
+  time(&rawtime);
+  timeinfo = gmtime(&rawtime);
+  if(timeinfo->tm_hour>=13) rawtime += 12*60*60;
+  timeinfo = gmtime(&rawtime);
+  snprintf(RunDate,sizeof(RunDate),"%d%02d%02d",timeinfo->tm_year+1900,timeinfo->tm_mon + 1,timeinfo->tm_mday);
 
   // Create direcory if not existing (ignore error if already existing) and change to it
@@ -889 +897 @@
   
   // Generate filename
-  snprintf(FileName,sizeof(FileName),"%s/%s/%s_%.8u_%s_%c_%d.raw", fRawDataPath, RunDate,
-    RunDate,RunNumber,RHeader->Description,daq_runtype_str[daq_runtype][0],FileNumber);
+  snprintf(FileName,sizeof(FileName),"%s/%s/%s_D1_%.8u.%.3u_%c_%s.raw", fRawDataPath, RunDate,
+    RunDate,RunNumber,FileNumber,toupper(daq_runtype_str[daq_runtype][0]),RHeader->Description);
  
   //  Open file with rwx right for owner and group, never overwrite file
@@ -914 +922 @@
   RHeader->BoardStructureSize = sizeof(BoardStructure);
 
+  RHeader->Identification = IDENTIFICATION;
   RHeader->Type = daq_runtype;
   RHeader->RunNumber  = RunNumber;
@@ -925 +934 @@
   RHeader->NChips    = kNumberOfChips;
   RHeader->NChannels = kNumberOfChannels;
+  RHeader->NBytes    = sizeof(short);
 
   RHeader->Offset  = fFirstSample;
@@ -1257 +1267 @@
 
     m->FileNumber += 1; 
-  } while(m->NumEvents<m->NumEventsRequested && !m->Stop && !WriteError);
+  } while((m->NumEvents<m->NumEventsRequested || m->NumEventsRequested==0) && !m->Stop && !WriteError);
 
   // Print run summary to slow data file and to screen