- code cleanup and starting component documentation

- added SDD clusters as tracker input

diff --git a/HLT/ITS/AliHLTITSClusterFinderSDDComponent.cxx b/HLT/ITS/AliHLTITSClusterFinderSDDComponent.cxx
index a260923a4d86522ba264c8bafd69d2e3aab792bd..42c1d36f9da2bdfde37e06390bf695c9df8f6f64 100644 (file)
--- a/HLT/ITS/AliHLTITSClusterFinderSDDComponent.cxx
+++ b/HLT/ITS/AliHLTITSClusterFinderSDDComponent.cxx
@@ -182,10 +182,6 @@ Int_t AliHLTITSClusterFinderSDDComponent::DoEvent( const AliHLTComponentEventDat
   // -- Iterator over Data Blocks --
   const AliHLTComponentBlockData* iter = NULL;
   
-  if(GetFirstInputBlock( kAliHLTDataTypeSOR ) || GetFirstInputBlock( kAliHLTDataTypeEOR )){
-    return 0;
-  }
-
   if (!IsDataEvent()) return 0;
 
   if ( evtData.fBlockCnt<=0 )

diff --git a/HLT/ITS/AliHLTITSClusterFinderSDDComponent.h b/HLT/ITS/AliHLTITSClusterFinderSDDComponent.h
index b2e4626d5b1910ede8608d91cf94d4efc8a4c178..29a52defb5c0f33deefd96e48f6a7031aa4e4bed 100644 (file)
--- a/HLT/ITS/AliHLTITSClusterFinderSDDComponent.h
+++ b/HLT/ITS/AliHLTITSClusterFinderSDDComponent.h
@@ -25,11 +25,45 @@
 
 /**
  * @class AliHLTITSClusterFinderSDDComponent
- * Component to run the offline clusterfinder.
+ * HLT Component to run the ITS offline clusterfinder for SDD.
+ *
+ * <h2>General properties:</h2>
+ *
+ * Component ID: \b ITSClusterFinderSDD                     <br>
+ * Library: \b libAliHLTITS.so                              <br>
+ * Input Data Types:                                        <br> 
+ *    kAliHLTDataTypeDDLRaw|kAliHLTDataOriginITSSDD         <br>
+ *      
+ * Output Data Types:                                       <br>
+ *    kAliHLTDataTypeClusters|kAliHLTDataOriginITSSDD       <br>
+ *
+ * <h2>Mandatory arguments:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ *
+ * <h2>Optional arguments:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ *
+ * <h2>Configuration:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ * \li -config1      <i> teststring   </i> <br>
+ *      a configuration argument with one parameter
+ * \li -config2                            <br>
+ *      a configuration argument without parameters
+ *
+ * <h2>Default CDB entries:</h2>
+ * TODO
+ *
+ * <h2>Performance:</h2>
+ * TODO
+ *
+ * <h2>Memory consumption:</h2>
+ * TODO
+ *
+ * <h2>Output size:</h2>
+ * TODO
  *
  * @ingroup alihlt_its_components
  */
-
 class AliHLTITSClusterFinderSDDComponent : public AliHLTProcessor
 {
  public:

diff --git a/HLT/ITS/AliHLTITSClusterFinderSPDComponent.cxx b/HLT/ITS/AliHLTITSClusterFinderSPDComponent.cxx
index e20873e08334ee7b9da89c1a1cbbf5598c83d032..1b649325b0da75dc5b4538a2391ac41e3146cf48 100644 (file)
--- a/HLT/ITS/AliHLTITSClusterFinderSPDComponent.cxx
+++ b/HLT/ITS/AliHLTITSClusterFinderSPDComponent.cxx
@@ -185,10 +185,6 @@ Int_t AliHLTITSClusterFinderSPDComponent::DoEvent( const AliHLTComponentEventDat
   // -- Iterator over Data Blocks --
   const AliHLTComponentBlockData* iter = NULL;
   
-  if(GetFirstInputBlock( kAliHLTDataTypeSOR ) || GetFirstInputBlock( kAliHLTDataTypeEOR )){
-    return 0;
-  }
-
   if (!IsDataEvent()) return 0;
 
   if ( evtData.fBlockCnt<=0 )

diff --git a/HLT/ITS/AliHLTITSClusterFinderSPDComponent.h b/HLT/ITS/AliHLTITSClusterFinderSPDComponent.h
index e5c39641aeb7abe6024a213f9ddbb1428dd7fe07..e0c2285783a2419e518d8173f457e3786d91e351 100644 (file)
--- a/HLT/ITS/AliHLTITSClusterFinderSPDComponent.h
+++ b/HLT/ITS/AliHLTITSClusterFinderSPDComponent.h
@@ -25,11 +25,45 @@
 
 /**
  * @class AliHLTITSClusterFinderSPDComponent
- * Component to run the offline clusterfinder.
+ * HLT Component to run the ITS offline clusterfinder for SPD.
+ *
+ * <h2>General properties:</h2>
+ *
+ * Component ID: \b ITSClusterFinderSPD                     <br>
+ * Library: \b libAliHLTITS.so                              <br>
+ * Input Data Types:                                        <br> 
+ *    kAliHLTDataTypeDDLRaw|kAliHLTDataOriginITSSPD         <br>
+ *      
+ * Output Data Types:                                       <br>
+ *    kAliHLTDataTypeClusters|kAliHLTDataOriginITSSPD       <br>
+ *
+ * <h2>Mandatory arguments:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ *
+ * <h2>Optional arguments:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ *
+ * <h2>Configuration:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ * \li -config1      <i> teststring   </i> <br>
+ *      a configuration argument with one parameter
+ * \li -config2                            <br>
+ *      a configuration argument without parameters
+ *
+ * <h2>Default CDB entries:</h2>
+ * TODO
+ *
+ * <h2>Performance:</h2>
+ * TODO
+ *
+ * <h2>Memory consumption:</h2>
+ * TODO
+ *
+ * <h2>Output size:</h2>
+ * TODO
  *
  * @ingroup alihlt_its_components
  */
-
 class AliHLTITSClusterFinderSPDComponent : public AliHLTProcessor
 {
  public:

diff --git a/HLT/ITS/AliHLTITSClusterFinderSSDComponent.cxx b/HLT/ITS/AliHLTITSClusterFinderSSDComponent.cxx
index 35d903a8ce3b5a20b3f680643d8af1a8fc7149a4..ec4ebcffe9994a72e41f992d83450e83270e7c63 100644 (file)
--- a/HLT/ITS/AliHLTITSClusterFinderSSDComponent.cxx
+++ b/HLT/ITS/AliHLTITSClusterFinderSSDComponent.cxx
@@ -187,10 +187,6 @@ Int_t AliHLTITSClusterFinderSSDComponent::DoEvent( const AliHLTComponentEventDat
   // -- Iterator over Data Blocks --
   const AliHLTComponentBlockData* iter = NULL;
   
-  if(GetFirstInputBlock( kAliHLTDataTypeSOR ) || GetFirstInputBlock( kAliHLTDataTypeEOR )){
-    return 0;
-  }
-
   if (!IsDataEvent()) return 0;
 
   if ( evtData.fBlockCnt<=0 )

diff --git a/HLT/ITS/AliHLTITSClusterFinderSSDComponent.h b/HLT/ITS/AliHLTITSClusterFinderSSDComponent.h
index f5be370c3615407f1eee8dcddfe6ec516843086e..5b2a41ed0b99871c6e7081389b8d64835efd012c 100644 (file)
--- a/HLT/ITS/AliHLTITSClusterFinderSSDComponent.h
+++ b/HLT/ITS/AliHLTITSClusterFinderSSDComponent.h
@@ -25,11 +25,45 @@
 
 /**
  * @class AliHLTITSClusterFinderSSDComponent
- * Component to run the offline clusterfinder.
+ * HLT Component to run the ITS offline clusterfinder for SSD.
+ *
+ * <h2>General properties:</h2>
+ *
+ * Component ID: \b ITSClusterFinderSSD                     <br>
+ * Library: \b libAliHLTITS.so                              <br>
+ * Input Data Types:                                        <br> 
+ *    kAliHLTDataTypeDDLRaw|kAliHLTDataOriginITSSSD         <br>
+ *      
+ * Output Data Types:                                       <br>
+ *    kAliHLTDataTypeClusters|kAliHLTDataOriginITSSSD       <br>
+ *
+ * <h2>Mandatory arguments:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ *
+ * <h2>Optional arguments:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ *
+ * <h2>Configuration:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ * \li -config1      <i> teststring   </i> <br>
+ *      a configuration argument with one parameter
+ * \li -config2                            <br>
+ *      a configuration argument without parameters
+ *
+ * <h2>Default CDB entries:</h2>
+ * TODO
+ *
+ * <h2>Performance:</h2>
+ * TODO
+ *
+ * <h2>Memory consumption:</h2>
+ * TODO
+ *
+ * <h2>Output size:</h2>
+ * TODO
  *
  * @ingroup alihlt_its_components
  */
-
 class AliHLTITSClusterFinderSSDComponent : public AliHLTProcessor
 {
  public:

diff --git a/HLT/ITS/tracking/AliHLTITSTrackerComponent.cxx b/HLT/ITS/tracking/AliHLTITSTrackerComponent.cxx
index 6e77047320447e69dc0774ee4b19db906eb09bcd..b0e51b568e602e133449d51277d216dd07f8d17d 100644 (file)
--- a/HLT/ITS/tracking/AliHLTITSTrackerComponent.cxx
+++ b/HLT/ITS/tracking/AliHLTITSTrackerComponent.cxx
@@ -1,4 +1,4 @@
-// @(#) $Id: AliHLTITSTrackerComponent.cxx 32659 2009-06-02 16:08:40Z sgorbuno $
+// $Id: AliHLTITSTrackerComponent.cxx 32659 2009-06-02 16:08:40Z sgorbuno $
 // **************************************************************************
 // This file is property of and copyright by the ALICE HLT Project          *
 // ALICE Experiment at CERN, All rights reserved.                           *
@@ -17,6 +17,11 @@
 //                                                                          *
 //***************************************************************************
 
+///  @file   AliHLTITSTrackerComponent.cxx
+///  @author Sergey Gorbunov <sergey.gorbunov@kip.uni-heidelberg.de>
+///  @date   June 2009
+///  @brief  An ITS tracker processing component for the HLT
+
 
 /////////////////////////////////////////////////////
 //                                                 //
@@ -107,6 +112,7 @@ void AliHLTITSTrackerComponent::GetInputDataTypes( vector<AliHLTComponentDataTyp
   list.push_back( kAliHLTDataTypeTrack|kAliHLTDataOriginTPC );
   list.push_back( kAliHLTDataTypeClusters|kAliHLTDataOriginITSSSD );
   list.push_back( kAliHLTDataTypeClusters|kAliHLTDataOriginITSSPD );
+  list.push_back( kAliHLTDataTypeClusters|kAliHLTDataOriginITSSDD );
 }
 
 AliHLTComponentDataType AliHLTITSTrackerComponent::GetOutputDataType()
@@ -308,9 +314,7 @@ int AliHLTITSTrackerComponent::DoEvent
   AliHLTUInt32_t maxBufferSize = size;
   size = 0; // output size
 
-  if ( GetFirstInputBlock( kAliHLTDataTypeSOR ) || GetFirstInputBlock( kAliHLTDataTypeEOR ) ) {
-    return 0;
-  }
+  if (!IsDataEvent()) return 0;
 
   if ( evtData.fBlockCnt <= 0 ) {
     HLTWarning( "no blocks in event" );
@@ -356,7 +360,8 @@ int AliHLTITSTrackerComponent::DoEvent
     // Read ITS clusters
 
     if ( (iter->fDataType == (kAliHLTDataTypeClusters|kAliHLTDataOriginITSSSD) ) || 
-        (iter->fDataType == (kAliHLTDataTypeClusters|kAliHLTDataOriginITSSPD) ) 
+        (iter->fDataType == (kAliHLTDataTypeClusters|kAliHLTDataOriginITSSPD) ) ||
+        (iter->fDataType == (kAliHLTDataTypeClusters|kAliHLTDataOriginITSSDD) ) 
         ){
 
       AliHLTITSClusterData *inPtr=reinterpret_cast<AliHLTITSClusterData*>( iter->fPtr );

diff --git a/HLT/ITS/tracking/AliHLTITSTrackerComponent.h b/HLT/ITS/tracking/AliHLTITSTrackerComponent.h
index 7ceeee12935c1a7f9f15b4597760a515331ed670..8a894cc852e78f191c5a4e1587d20f400deb9b77 100644 (file)
--- a/HLT/ITS/tracking/AliHLTITSTrackerComponent.h
+++ b/HLT/ITS/tracking/AliHLTITSTrackerComponent.h
@@ -1,3 +1,5 @@
+//-*- Mode: C++ -*-
+// $Id$
 // ************************************************************************
 // This file is property of and copyright by the ALICE HLT Project        *
 // ALICE Experiment at CERN, All rights reserved.                         *
@@ -5,6 +7,11 @@
 //                                                                        *
 //*************************************************************************
 
+///  @file   AliHLTITSTrackerComponent.h
+///  @author Sergey Gorbunov <sergey.gorbunov@kip.uni-heidelberg.de>
+///  @date   June 2009
+///  @brief  An ITS tracker processing component for the HLT
+
 #ifndef ALIHLTITSTRACKERCOMPONENT_H
 #define ALIHLTITSTRACKERCOMPONENT_H
 
@@ -15,7 +22,47 @@ class AliITStrackerHLT;
 
 /**
  * @class AliHLTITSTrackerComponent
- * The ITS tracker component.
+ * The HL ITS tracker component.
+ *
+ * <h2>General properties:</h2>
+ *
+ * Component ID: \b ITSTracker                              <br>
+ * Library: \b libAliHLTITS.so                              <br>
+ * Input Data Types:                                        <br> 
+ *    kAliHLTDataTypeTrack|kAliHLTDataOriginTPC             <br>
+ *    kAliHLTDataTypeClusters|kAliHLTDataOriginITSSSD       <br>
+ *    kAliHLTDataTypeClusters|kAliHLTDataOriginITSSPD       <br>
+ *    kAliHLTDataTypeClusters|kAliHLTDataOriginITSSDD       <br>
+ *      
+ * Output Data Types:                                       <br>
+ *    kAliHLTDataTypeTrack|kAliHLTDataOriginITS             <br>
+ *
+ * <h2>Mandatory arguments:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ *
+ * <h2>Optional arguments:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ *
+ * <h2>Configuration:</h2>
+ * <!-- NOTE: ignore the \li. <i> and </i>: it's just doxygen formatting -->
+ * \li -config1      <i> teststring   </i> <br>
+ *      a configuration argument with one parameter
+ * \li -config2                            <br>
+ *      a configuration argument without parameters
+ *
+ * <h2>Default CDB entries:</h2>
+ * TODO
+ *
+ * <h2>Performance:</h2>
+ * TODO
+ *
+ * <h2>Memory consumption:</h2>
+ * TODO
+ *
+ * <h2>Output size:</h2>
+ * TODO
+ * 
+ * @ingroup alihlt_its_components
  */
 class AliHLTITSTrackerComponent : public AliHLTProcessor
 {