Changeset 14233 for trunk/FACT++/src/Fits.cc

Timestamp:

06/26/12 12:37:25 (12 years ago)

Author:

lyard

Message:

replaced DimServiceInfoListImp with EventImps. Warning, currently the logger only subscribes to services that exist when it is launched

File:

• trunk/FACT++/src/Fits.cc (modified) (3 diffs)

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, void* dataPointer, MessageImp* out)
+void Fits::InitDataColumns(const vector<Description> &desc, const vector<string>& dataFormat, const void* dataPointer, MessageImp* out)
 {
     fDataFormats = dataFormat;
-    fDataPointer = dataPointer;
+//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))
@@ -314 +315 @@
 //! @param conv the converter corresponding to the service being logged
 //
-bool Fits::Write(const Converter &conv)
+bool Fits::Write(const Converter &conv, const void* data)
 {
     //first copy the standard variables to the copy buffer
@@ -328 +329 @@
     {
         //now take care of the DIM data. The Converter is here for that purpose
-        conv.ToFits(fCopyBuffer.data()+shift, fDataPointer, fCopyBuffer.size()-shift);
+        conv.ToFits(fCopyBuffer.data()+shift, data, fCopyBuffer.size()-shift);
     }
     catch (const runtime_error &e)