Changeset 14238

Timestamp:

06/26/12 18:51:40 (13 years ago)

Author:

tbretz

Message:

Removed the obsolete data pointer argument from InitDataColumns

Location:

trunk/FACT++/src

Files:

• Fits.cc (modified) (1 diff)
• Fits.h (modified) (3 diffs)
• datalogger.cc (modified) (1 diff)

trunk/FACT++/src/Fits.cc

@@ -60 +60 @@
 //! @param out Message object to use for propagating messages
 //      
-void Fits::InitDataColumns(const vector<Description> &desc, const vector<string>& dataFormat, const void* dataPointer, MessageImp* out)
+void Fits::InitDataColumns(const vector<Description> &desc, const vector<string>& dataFormat, MessageImp* out)
 {
     fDataFormats = dataFormat;
-//FIXME I removed the static assignment of the data pointer because it changes from event to event now. Remove the arg of this function
-//    fDataPointer = dataPointer;
 
     if ((desc.size() == 0) && (dataFormat.size() == 0))

trunk/FACT++/src/Fits.h

@@ -2 +2 @@
 #define FACT_Fits
 
-//#include <CCfits/CCfits>
-//#include <vector>
-
 #include "Description.h"
-//#include "MessageImp.h"
-//#include "Time.h"
 #include "FitsFile.h"
 
@@ -38 +33 @@
     vector<string> fDataFormats;
 
-    ///the pointer to the contiguous memory location where the data is stored (i.e. the dim data pointer)
-//    void* fDataPointer;
     ///the copy buffer. Required to put the standard and data variable in contguous memory
     vector<char> fCopyBuffer;
@@ -79 +72 @@
 
     ///Adds columns specific to the service being logged.
-    void InitDataColumns(const vector<Description> &desc, const vector<string>& dataFormat, const void* dataPointer, MessageImp* out);
+    void InitDataColumns(const vector<Description> &desc, const vector<string>& dataFormat, MessageImp* out);
 
     ///Opens a FITS file

trunk/FACT++/src/datalogger.cc

@@ -1653 +1653 @@
     str << "Initializing data columns for service " << sub.server << "/" << sub.service;
     Info(str);
-    sub.nightlyFile.InitDataColumns(Description::SplitDescription(evt.GetDescription()), dataFormatsLocal, evt.GetData(), this);
+    sub.nightlyFile.InitDataColumns(Description::SplitDescription(evt.GetDescription()), dataFormatsLocal, this);
 
     sub.fitsBufferAllocated = true;