Changeset 86

Timestamp:

07/09/09 16:33:34 (15 years ago)

Author:

ogrimm

Message:

Made SlowData class independent

Location:

drsdaq

Files:

• DAQReadout.cc (modified) (2 diffs)
• HVFeedback.cc (modified) (1 diff)
• History.txt (modified) (1 diff)
• SlowData.cc (modified) (8 diffs)
• SlowData.h (modified) (2 diffs)

drsdaq/DAQReadout.cc

@@ -153 +153 @@
   char Filename[MAX_PATH];
   snprintf(Filename,sizeof(Filename),"%s/SlowData/", fRawDataPath);
-  SlowDataClass = new SlowData(this, "DAQ", Filename);
+  SlowDataClass = new SlowData("DAQ", Filename);
+  if(SlowDataClass->ErrorCode != 0) {
+   PrintMessage("Warning: Could not open DAQ slowdata file (%s)\n", strerror(SlowDataClass->ErrorCode));
+  }
 }
 
@@ -1275 +1278 @@
     m->PrintMessage("\rRun #%d (%s) %s, %d events\n",m->RunNumber,daq_runtype_str[m->daq_runtype],(m->NumEvents == m->NumEventsRequested) ? "completed":"stopped",m->NumEvents);
     m->SlowDataClass->NewEntry("Runinfo");
-    m->SlowDataClass->AddToEntry("%d %s %s %d %d",m->RunNumber,daq_runtype_str[m->daq_runtype],m->RHeader->Description,m->NumEvents,m->FileNumber);
+    m->SlowDataClass->AddToEntry("%d %s %s %d %d", m->RunNumber, daq_runtype_str[m->daq_runtype], m->RHeader->Description, m->NumEvents, m->FileNumber);
+    if(m->SlowDataClass->ErrorCode != 0) {
+      m->PrintMessage("SlowData: Error, could not write data to file (%s); closing file\n", strerror(m->SlowDataClass->ErrorCode));
+    }
+
   }
   else m->PrintMessage("\rRun #%d (%s) aborted due to error after %d events\n",m->RunNumber,daq_runtype_str[m->daq_runtype],m->NumEvents);

drsdaq/HVFeedback.cc

@@ -30 +30 @@
 
   snprintf(Filename,sizeof(Filename),"%s/SlowData/", m->fRawDataPath);
-  SlowDataClass = new SlowData(m, "HVFB", Filename);
+  SlowDataClass = new SlowData("HVFB", Filename);
 
   // Initialise with zero content

drsdaq/History.txt

@@ -40 +40 @@
             correct order using writev() (10% gain in rate)
 18/6/2009   Run date is now calculated with a change to the next date on 13:00 UTC.
-            
+9/7/2009    SlowData class is now independet of PrintMessage() method, thus more
+            universal       

drsdaq/SlowData.cc

@@ -16 +16 @@
 // Constructor: Open slow data file (filename generate using current date)
 //
-SlowData::SlowData(DAQReadout* DAQClass, const char* IssuerName, char* Direcory) {
+SlowData::SlowData(const char* IssuerName, const char* Direcory) {
 
   time_t rawtime;
@@ -22 +22 @@
   char Filename[MAX_PATH];
 
-  m = DAQClass;
   Issuer = IssuerName;
   NewEntryCalled = false;
@@ -31 +30 @@
   if(timeinfo->tm_hour>=13) rawtime += 12*60*60;
   timeinfo = gmtime(&rawtime);
-  snprintf(Filename,sizeof(Filename),"%s/%s_%d%02d%02d.slow",Direcory,Issuer,timeinfo->tm_year+1900,timeinfo->tm_mon+1,timeinfo->tm_mday);
+  snprintf(Filename, sizeof(Filename), "%s/%s_%d%02d%02d.slow", Direcory, Issuer, timeinfo->tm_year+1900,timeinfo->tm_mon+1,timeinfo->tm_mday);
 
-  if ((SlowdataFile = fopen(Filename, "a")) == NULL)
-    m->PrintMessage("Warning: Could not open slowdata file '%s' (%s)\n", Filename, strerror(errno));
+  if ((SlowdataFile = fopen(Filename, "a")) == NULL) ErrorCode = errno;
+  else ErrorCode = 0;
 }
 
@@ -41 +40 @@
 //
 SlowData::~SlowData() {
-  if(SlowdataFile!=NULL && fclose(SlowdataFile)==-1)
-    m->PrintMessage("SlowData: Error, could not close slowdata file (%s)\n", strerror(errno));  
+  if(SlowdataFile!=NULL) fclose(SlowdataFile);  
 }
 
@@ -48 +46 @@
 // Add a new entry to slow data file
 //
-bool SlowData::NewEntry(char *Variable) {
+bool SlowData::NewEntry(const char *Variable) {
 
   time_t RawTime;
@@ -66 +64 @@
 // Add data to an open entry
 //
-bool SlowData::AddToEntry(char *Format, ...) {
+bool SlowData::AddToEntry(const char *Format, ...) {
 
   char Textbuffer[MAX_COM_SIZE];
@@ -82 +80 @@
 
   if(fprintf(SlowdataFile, "%s", Textbuffer) == -1) {
-    m->PrintMessage("SlowData: Error, could not write data to file (%s); closing file\n", strerror(errno));
+    ErrorCode = errno;
     fclose(SlowdataFile);
     SlowdataFile = NULL;  
@@ -88 +86 @@
   }
   fflush(SlowdataFile);
+  ErrorCode = 0;
   return true;
 }

drsdaq/SlowData.h

@@ -7 +7 @@
 class SlowData {
 
-    class DAQReadout *m;
     const char *Issuer;
     FILE *SlowdataFile;
@@ -14 +13 @@
                           
   public:
-    SlowData(class DAQReadout*, const char*, char*);
+    SlowData(const char*, const char*);
     ~SlowData();
 
-    bool NewEntry(char*);
-    bool AddToEntry(char*, ...);
+    int ErrorCode;      // Set to errno if an error occured, zero otherwise
+    bool NewEntry(const char*);
+    bool AddToEntry(const char*, ...);
 };