remove AliHLTTPCCalibrationComponent from the AliHLTTPCAgent

[u/mrichter/AliRoot.git] / HLT / TPCLib / AliHLTTPCGlobalMergerComponent.h

diff --git a/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.h b/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.h
index 0a09d0b50a42fe0607c4a1d8ab3a46ef7b70c58a..208ed67948ea364390fda2261433e78d35b3e94c 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.h
+++ b/HLT/TPCLib/AliHLTTPCGlobalMergerComponent.h
@@ -3,8 +3,9 @@
 
 #ifndef ALIHLTTPCGLOBALMERGERCOMPONENT_H
 #define ALIHLTTPCGLOBALMERGERCOMPONENT_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
+//* This file is property of and copyright by the ALICE HLT Project        * 
+//* ALICE Experiment at CERN, All rights reserved.                         *
+//* See cxx source for full Copyright notice                               *
 
 /** @file   AliHLTTPCGlobalMergerComponent.h
     @author Timm Steinbeck, Matthias Richter
@@ -22,35 +23,33 @@ class AliHLTTPCVertex;
  * The TPC global merger component
  * The component is the interface to the AliHLTGlobalMerger processing
  * class.
+ *
+ * @ingroup alihlt_tpc_components
  */
 class AliHLTTPCGlobalMergerComponent : public AliHLTProcessor
     {
     public:
       /** standard constructor */
       AliHLTTPCGlobalMergerComponent();
-      /** not a valid copy constructor, defined according to effective C++ style */
-      AliHLTTPCGlobalMergerComponent(const AliHLTTPCGlobalMergerComponent&);
-      /** not a valid assignment op, but defined according to effective C++ style */
-      AliHLTTPCGlobalMergerComponent& operator=(const AliHLTTPCGlobalMergerComponent&);
       /** standard destructor */
       virtual ~AliHLTTPCGlobalMergerComponent();
 
        // Public functions to implement AliHLTComponent's interface.
        // These functions are required for the registration process
 
-      /** @see component interface @ref AliHLTComponent::GetComponentID */
+      /** @see component interface AliHLTComponent::GetComponentID */
        const char* GetComponentID();
       
-      /** @see component interface @ref AliHLTComponent::GetInputDataTypes */
-       void GetInputDataTypes( vector<AliHLTComponentDataType>& list);
+      /** @see component interface AliHLTComponent::GetInputDataTypes */
+       void GetInputDataTypes(AliHLTComponentDataTypeList& list);
 
-      /** @see component interface @ref AliHLTComponent::GetOutputDataType */
+      /** @see component interface AliHLTComponent::GetOutputDataType */
        AliHLTComponentDataType GetOutputDataType();
 
-      /** @see component interface @ref AliHLTComponent::GetOutputDataSize */
+      /** @see component interface AliHLTComponent::GetOutputDataSize */
        virtual void GetOutputDataSize( unsigned long& constBase, double& inputMultiplier );
 
-      /** @see component interface @ref AliHLTComponent::Spawn */
+      /** @see component interface AliHLTComponent::Spawn */
        AliHLTComponent* Spawn();
 
     protected:
@@ -66,18 +65,24 @@ class AliHLTTPCGlobalMergerComponent : public AliHLTProcessor
        // capabilities of the component. 
 
 
-      /** @see component interface @ref AliHLTComponent::DoInit */
+      /** @see component interface AliHLTComponent::DoInit */
        int DoInit( int argc, const char** argv );
 
-      /** @see component interface @ref AliHLTComponent::DoDeinit */
+      /** @see component interface AliHLTComponent::DoDeinit */
        int DoDeinit();
 
       /** @see component interface @ref AliHLTProcessor::DoEvent */
        int DoEvent( const AliHLTComponentEventData& evtData, const AliHLTComponentBlockData* blocks, 
                     AliHLTComponentTriggerData& trigData, AliHLTUInt8_t* outputPtr, 
-                    AliHLTUInt32_t& size, vector<AliHLTComponentBlockData>& outputBlocks );
+                    AliHLTUInt32_t& size, AliHLTComponentBlockDataList& outputBlocks );
+
+       using AliHLTProcessor::DoEvent;
        
     private:
+      /** copy constructor prohibited */
+      AliHLTTPCGlobalMergerComponent(const AliHLTTPCGlobalMergerComponent&);
+      /** assignment operator prohibited */
+      AliHLTTPCGlobalMergerComponent& operator=(const AliHLTTPCGlobalMergerComponent&);
 
       /** the global merger object */
       AliHLTTPCGlobalMerger* fGlobalMerger; //!