ALIROOT-5433 Transition to CDHv3 in HLT

[u/mrichter/AliRoot.git] / HLT / rec / AliHLTOUTHomerCollection.h

diff --git a/HLT/rec/AliHLTOUTHomerCollection.h b/HLT/rec/AliHLTOUTHomerCollection.h
index f00cb067bc2700985af64cfc2d89be2d47803425..a81efaaa1f96d3b88c77cccef45078d50122fd94 100644 (file)
--- a/HLT/rec/AliHLTOUTHomerCollection.h
+++ b/HLT/rec/AliHLTOUTHomerCollection.h
@@ -3,19 +3,19 @@
 
 #ifndef ALIHLTOUTHOMERCOLLECTION_H
 #define ALIHLTOUTHOMERCOLLECTION_H
-//* This file is property of and copyright by the ALICE HLT Project        * 
+//* This file is property of and copyright by the                          * 
 //* ALICE Experiment at CERN, All rights reserved.                         *
 //* See cxx source for full Copyright notice                               *
 
-/** @file   AliHLTOUTHomerCollection.h
-    @author Matthias Richter
-    @date   
-    @brief  General collection for HLTOUT data in DDL format.
-*/
+/// @file   AliHLTOUTHomerCollection.h
+/// @author Matthias Richter
+/// @date   
+/// @brief  General collection for HLTOUT data in DDL format.
+///
 #include "AliHLTOUTHomerBuffer.h"
+#include "AliHLTCDHWrapper.h"
 
 class AliHLTHOMERReader;
-class AliRawDataHeader;
 class AliHLTEsdManager;
 
 /**
@@ -58,7 +58,7 @@ class AliHLTOUTHomerCollection : public AliHLTOUTHomerBuffer {
   /**
    * Get the header of the current data block
    */
-  virtual const AliRawDataHeader* GetDataHeader()=0;
+  virtual AliHLTCDHWrapper GetDataHeader()=0;
 
   /**
    * Select equipment for data readout.
@@ -84,6 +84,11 @@ class AliHLTOUTHomerCollection : public AliHLTOUTHomerBuffer {
   // interface function of AliHLTOUT
   int WriteESD(const AliHLTUInt8_t* pBuffer, AliHLTUInt32_t size, AliHLTComponentDataType dt, AliESDEvent* tgtesd=NULL) const;
 
+  /** current event no */
+  int fEvent; //!transient
+
+private:
+
  private:
   /** copy constructor prohibited */
   AliHLTOUTHomerCollection(const AliHLTOUTHomerCollection&);
@@ -97,9 +102,10 @@ class AliHLTOUTHomerCollection : public AliHLTOUTHomerBuffer {
 
   /**
    * Get the data buffer
-   * @param index   [in]  index of the block
-   * @param pBuffer [out] buffer of the selected data block
-   * @param size    [out] size of the selected data block
+   * Overloaded from AliHLTOUT
+   * @param [in]  index   index of the block
+   * @param [out] pBuffer buffer of the selected data block
+   * @param [out] size    size of the selected data block
    */
   int GetDataBuffer(AliHLTUInt32_t index, const AliHLTUInt8_t* &pBuffer, 
                    AliHLTUInt32_t& size);
@@ -118,11 +124,6 @@ class AliHLTOUTHomerCollection : public AliHLTOUTHomerBuffer {
   /** current instance of the HOMER reader */
   AliHLTHOMERReader* fpCurrent;  //!transient
 
-protected:
-  /** current event no */
-  int fEvent; //!transient
-
-private:
   /** instance of the ESD manager for writing and merging */
   AliHLTEsdManager* fpEsdManager; //!transient