Some fixes of the coding conventions.

diff --git a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx
index 4a15e5ff6287f706ea357374d367b0e8320f668f..8f6048f28d6b488973e2734b745e7d41efda6d61 100644 (file)
--- a/HLT/TRD/AliHLTTRDCalibrationComponent.cxx
+++ b/HLT/TRD/AliHLTTRDCalibrationComponent.cxx
@@ -48,6 +48,9 @@ ClassImp(AliHLTTRDCalibrationComponent)
     
 AliHLTTRDCalibrationComponent::AliHLTTRDCalibrationComponent()
 {
+  //
+  // default contructor
+  //
   fMCMtrigger = 0;
 
   fOutputPercentage = 100; // By default we copy to the output exactly what we got as input
@@ -62,26 +65,41 @@ AliHLTTRDCalibrationComponent::AliHLTTRDCalibrationComponent()
 
 AliHLTTRDCalibrationComponent::~AliHLTTRDCalibrationComponent()
 {
+  //
+  // default decontructor
+  //
 }
 
 const char* AliHLTTRDCalibrationComponent::GetComponentID()
 {
+  //
+  // return component id
+  //
   return "TRDCalibration"; // The ID of this component
 }
 
 void AliHLTTRDCalibrationComponent::GetInputDataTypes( vector<AliHLTComponent_DataType>& list)
 {
+  //
+  // insert input data type
+  //
   list.clear(); // We do not have any requirements for our input data type(s).
-  list.push_back( AliHLTTRDDefinitions::gkDDLRawDataType );
+  list.push_back( AliHLTTRDDefinitions::fgkDDLRawDataType );
 }
 
 AliHLTComponent_DataType AliHLTTRDCalibrationComponent::GetOutputDataType()
 {
-  return AliHLTTRDDefinitions::gkClusterDataType;
+  //
+  // get the output data type
+  //
+  return AliHLTTRDDefinitions::fgkClusterDataType;
 }
 
 void AliHLTTRDCalibrationComponent::GetOutputDataSize( unsigned long& constBase, double& inputMultiplier )
 {
+  //
+  // get the ouput data size
+  //
   constBase = 0;
   inputMultiplier = ((double)fOutputPercentage)/100.0;
 }
@@ -90,12 +108,17 @@ void AliHLTTRDCalibrationComponent::GetOutputDataSize( unsigned long& constBase,
 // Spawn function, return new instance of this class
 AliHLTComponent* AliHLTTRDCalibrationComponent::Spawn()
 {
+  //
+  // spawn implementation
+  //
   return new AliHLTTRDCalibrationComponent;
 };
 
 int AliHLTTRDCalibrationComponent::DoInit( int argc, const char** argv )
 {
+  //
   // perform initialization. We check whether our relative output size is specified in the arguments.
+  //
   fOutputPercentage = 100;
   int i = 0;
   char* cpErr;
@@ -192,32 +215,32 @@ int AliHLTTRDCalibrationComponent::DoInit( int argc, const char** argv )
       return EINVAL;
     }
 
-  cdb = AliCDBManager::Instance();
-  if (!cdb)
+  fCDB = AliCDBManager::Instance();
+  if (!fCDB)
     {
-      Logging(kHLTLogError, "HLT::TRDCalibration::DoInit", "Could not get CDB instance", "cdb 0x%x", cdb);
+      Logging(kHLTLogError, "HLT::TRDCalibration::DoInit", "Could not get CDB instance", "fCDB 0x%x", fCDB);
     }
   else
     {
-      cdb->SetRun(0); // THIS HAS TO BE RETRIEVED !!!
-      cdb->SetDefaultStorage(fStrorageDBpath.c_str());
-      Logging(kHLTLogDebug, "HLT::TRDCalibration::DoInit", "CDB instance", "cdb 0x%x", cdb);
+      fCDB->SetRun(0); // THIS HAS TO BE RETRIEVED !!!
+      fCDB->SetDefaultStorage(fStrorageDBpath.c_str());
+      Logging(kHLTLogDebug, "HLT::TRDCalibration::DoInit", "CDB instance", "fCDB 0x%x", fCDB);
     }
 
-  calibra = AliHLTTRDCalibra::Instance();
-  if (!calibra) 
+  fCalibra = AliHLTTRDCalibra::Instance();
+  if (!fCalibra) 
     {
-      Logging(kHLTLogError, "HLT::TRDCalibration::DoInit", "Could not get Calibra instance", "calibra 0x%x", calibra);
+      Logging(kHLTLogError, "HLT::TRDCalibration::DoInit", "Could not get Calibra instance", "calibra 0x%x", fCalibra);
     }
   else
     {
       // init the histograms for output!
-      calibra->SetOn();
-      calibra->Init2Dhistos();
-      Logging(kHLTLogDebug, "HLT::TRDCalibration::DoInit", "Calibra instance", "calibra 0x%x", calibra);
+      fCalibra->SetOn();
+      fCalibra->Init2Dhistos();
+      Logging(kHLTLogDebug, "HLT::TRDCalibration::DoInit", "Calibra instance", "calibra 0x%x", fCalibra);
     }  
 
-  rmem = new AliRawReaderMemory;
+  fRmem = new AliRawReaderMemory;
 
   fMCMtriggerParams = new AliTRDtrigParam("TRDMCMtriggerParams", "TRDMCMtriggerParams");
   fMCMtriggerParams->SetDebugLevel(fTriggerParDebugLevel);
@@ -233,11 +256,14 @@ int AliHLTTRDCalibrationComponent::DoInit( int argc, const char** argv )
 
 int AliHLTTRDCalibrationComponent::DoDeinit()
 {
+  //
+  // deinit component
+  //
   Logging( kHLTLogDebug, "HLT::TRDCalibration::DoDeinit", "destruct", "start");
 
-  Logging( kHLTLogDebug, "HLT::TRDCalibration::DoDeinit", "delete", "rmem");
-  delete rmem;
-  rmem = 0;
+  Logging( kHLTLogDebug, "HLT::TRDCalibration::DoDeinit", "delete", "fRmem");
+  delete fRmem;
+  fRmem = 0;
 
   Logging( kHLTLogDebug, "HLT::TRDCalibration::DoDeinit", "delete", "fMCMtriggerParams");
   delete fMCMtriggerParams;
@@ -247,18 +273,18 @@ int AliHLTTRDCalibrationComponent::DoDeinit()
   delete fMCMtrigger;
   fMCMtrigger = 0;
 
-  if (calibra)
+  if (fCalibra)
     {
-      Logging( kHLTLogDebug, "HLT::TRDCalibration::DoDeinit", "destroy", "calibra");
-      calibra->Destroy();
-      calibra = 0;
+      Logging( kHLTLogDebug, "HLT::TRDCalibration::DoDeinit", "destroy", "fCalibra");
+      fCalibra->Destroy();
+      fCalibra = 0;
     }
 
-  if (cdb)
+  if (fCDB)
     {
-      Logging( kHLTLogDebug, "HLT::TRDCalibration::DoDeinit", "destroy", "cdb");
-      cdb->Destroy();
-      cdb = 0;
+      Logging( kHLTLogDebug, "HLT::TRDCalibration::DoDeinit", "destroy", "fCDB");
+      fCDB->Destroy();
+      fCDB = 0;
     }
 
   Logging( kHLTLogDebug, "HLT::TRDCalibration::DoDeinit", "destruct", "all done!");
@@ -269,29 +295,32 @@ int AliHLTTRDCalibrationComponent::DoEvent( const AliHLTComponent_EventData& evt
                                            AliHLTComponent_TriggerData& trigData, AliHLTUInt8_t* outputPtr, 
                                            AliHLTUInt32_t& size, vector<AliHLTComponent_BlockData>& outputBlocks )
 {
+  //
+  // analyze
+  //
   Logging( kHLTLogInfo, "HLT::TRDCalibration::DoEvent", "Output percentage set", "Output percentage set to %lu %%", fOutputPercentage );
   Logging( kHLTLogInfo, "HLT::TRDCalibration::DoEvent", "BLOCKS", "NofBlocks %lu", evtData.fBlockCnt );
   // Process an event
   unsigned long totalSize = 0;
-  AliHLTUInt32_t fDblock_Specification = 0;
+  AliHLTUInt32_t fDblockSpecification = 0;
 
   // Loop over all input blocks in the event
   for ( unsigned long i = 0; i < evtData.fBlockCnt; i++ )
     {
       char tmp1[14], tmp2[14];
       DataType2Text( blocks[i].fDataType, tmp1 );
-      DataType2Text( AliHLTTRDDefinitions::gkDDLRawDataType, tmp2 );      
+      DataType2Text( AliHLTTRDDefinitions::fgkDDLRawDataType, tmp2 );      
       Logging( kHLTLogDebug, "HLT::TRDCalibration::DoEvent", "Event received", 
               "Event 0x%08LX (%Lu) received datatype: %s - required datatype: %s",
               evtData.fEventID, evtData.fEventID, tmp1, tmp2 );
 
-      if ( blocks[i].fDataType != AliHLTTRDDefinitions::gkDDLRawDataType ) 
+      if ( blocks[i].fDataType != AliHLTTRDDefinitions::fgkDDLRawDataType ) 
        {
          Logging (kHLTLogError, "HLT::TRDCalibration::DoEvent", "COMPARE FAILED", "type=%d is type=%d",
-                  blocks[i].fDataType, AliHLTTRDDefinitions::gkDDLRawDataType);
+                  blocks[i].fDataType, AliHLTTRDDefinitions::fgkDDLRawDataType);
          continue;
        }
-      fDblock_Specification = blocks[i].fSpecification;
+      fDblockSpecification = blocks[i].fSpecification;
       unsigned long blockSize = blocks[i].fSize;
       totalSize += blockSize;
     }
@@ -308,7 +337,7 @@ int AliHLTTRDCalibrationComponent::DoEvent( const AliHLTComponent_EventData& evt
   unsigned long copied = 0;
   for ( unsigned long i = 0; i < evtData.fBlockCnt; i++ )
     {
-      if ( blocks[i].fDataType != AliHLTTRDDefinitions::gkDDLRawDataType ) 
+      if ( blocks[i].fDataType != AliHLTTRDDefinitions::fgkDDLRawDataType ) 
        continue;
 
       void *pos = (void*)(pBuf + copied);
@@ -323,10 +352,10 @@ int AliHLTTRDCalibrationComponent::DoEvent( const AliHLTComponent_EventData& evt
 
   Logging( kHLTLogInfo, "HLT::TRDCalibration::DoEvent", "COPY STATS", "total=%lu copied=%lu", totalSize, copied);
 
-  rmem->Reset();
-  rmem->SetMemory((UChar_t*)memBufIn, totalSize);
-  //rmem->Reset();
-  Bool_t ihead = rmem->ReadHeader();
+  fRmem->Reset();
+  fRmem->SetMemory((UChar_t*)memBufIn, totalSize);
+  //fRmem->Reset();
+  Bool_t ihead = fRmem->ReadHeader();
   if (ihead == kTRUE)
     {
       Logging( kHLTLogInfo, "HLT::TRDCalibration::DoEvent", "HEADER", "Header read successfully");
@@ -338,7 +367,7 @@ int AliHLTTRDCalibrationComponent::DoEvent( const AliHLTComponent_EventData& evt
     }
 
   fMCMtrigger->ResetTree();
-  Bool_t ireadD = fMCMtrigger->ReadDigits(rmem);
+  Bool_t ireadD = fMCMtrigger->ReadDigits(fRmem);
   if (ireadD == kTRUE)
     {
       Logging( kHLTLogInfo, "HLT::TRDCalibration::DoEvent", "DIGITS", "Digits read successfully");
@@ -377,7 +406,7 @@ int AliHLTTRDCalibrationComponent::DoEvent( const AliHLTComponent_EventData& evt
       for (Int_t icb = 0; icb < tb->GetEntries(); icb++)
        {
          tb->GetEntry(icb);
-         PushBack(detTracklets, AliHLTTRDDefinitions::gkMCMtrackletDataType, fDblock_Specification);
+         PushBack(detTracklets, AliHLTTRDDefinitions::fgkMCMtrackletDataType, fDblockSpecification);
        }
     }
 
@@ -385,7 +414,7 @@ int AliHLTTRDCalibrationComponent::DoEvent( const AliHLTComponent_EventData& evt
   //gkMCMCalibrationDataType
 
   //AliHLTTRDCalibra *calibra = AliHLTTRDCalibra::Instance();
-  if (!calibra) 
+  if (!fCalibra) 
     {
       Logging( kHLTLogError, "HLT::TRDCalibration::DoEvent", "OUTPUT", "Calibra not valid");
     }
@@ -393,23 +422,23 @@ int AliHLTTRDCalibrationComponent::DoEvent( const AliHLTComponent_EventData& evt
     {
       Logging( kHLTLogDebug, "HLT::TRDCalibration::DoEvent", "OUTPUT", "Here we should put the histos...");
 //       //   TH2I            *GetCH2d();
-//       TH2I *chtmp = calibra->GetCH2d();
+//       TH2I *chtmp = fCalibra->GetCH2d();
 //       if (chtmp)
-//     PushBack(chtmp, AliHLTTRDDefinitions::gkMCMcalibrationDataType, fDblock_Specification);
+//     PushBack(chtmp, AliHLTTRDDefinitions::fgkMCMcalibrationDataType, fDblockSpecification);
 //       else
-//     Logging( kHLTLogError, "HLT::TRDCalibration::DoEvent", "OUTPUT", "Could not calibra->GetCH2d()");
+//     Logging( kHLTLogError, "HLT::TRDCalibration::DoEvent", "OUTPUT", "Could not fCalibra->GetCH2d()");
 //       //   TProfile2D      *GetPH2d();
-//       TProfile2D *phtmp = calibra->GetPH2d();
+//       TProfile2D *phtmp = fCalibra->GetPH2d();
 //       if (phtmp)
-//     PushBack(phtmp, AliHLTTRDDefinitions::gkMCMcalibrationDataType, fDblock_Specification);
+//     PushBack(phtmp, AliHLTTRDDefinitions::fgkMCMcalibrationDataType, fDblockSpecification);
 //       else
-//     Logging( kHLTLogError, "HLT::TRDCalibration::DoEvent", "OUTPUT", "Could not calibra->GetPH2d()");
+//     Logging( kHLTLogError, "HLT::TRDCalibration::DoEvent", "OUTPUT", "Could not fCalibra->GetPH2d()");
 //       //   TProfile2D      *GetPRF2d();
-//       TProfile2D *prf = calibra->GetPRF2d();
+//       TProfile2D *prf = fCalibra->GetPRF2d();
 //       if (prf)
-//     PushBack(prf, AliHLTTRDDefinitions::gkMCMcalibrationDataType, fDblock_Specification);      
+//     PushBack(prf, AliHLTTRDDefinitions::fgkMCMcalibrationDataType, fDblockSpecification);      
 //       else
-//     Logging( kHLTLogError, "HLT::TRDCalibration::DoEvent", "OUTPUT", "Could not calibra->GetPRF2d()");
+//     Logging( kHLTLogError, "HLT::TRDCalibration::DoEvent", "OUTPUT", "Could not fCalibra->GetPRF2d()");
     }
 
   return 0;

diff --git a/HLT/TRD/AliHLTTRDCalibrationComponent.h b/HLT/TRD/AliHLTTRDCalibrationComponent.h
index 10dac57e36f523c48bce76b492d4167d1df949a1..7fceafd9afd401d96bd876363f6f9cd7ca73b551 100644 (file)
--- a/HLT/TRD/AliHLTTRDCalibrationComponent.h
+++ b/HLT/TRD/AliHLTTRDCalibrationComponent.h
@@ -57,20 +57,20 @@ class AliHLTTRDCalibrationComponent : public AliHLTProcessor
 
        // The size of the output data produced, as a percentage of the input data's size.
        // Can be greater than 100 (%)
-       unsigned fOutputPercentage;
+       unsigned fOutputPercentage; // The size of the output data produced in %
 
-       string fStrorageDBpath;
+       string fStrorageDBpath; // Path to DB
 
-       AliHLTTRDCalibra  *calibra; //!
+       AliHLTTRDCalibra  *fCalibra; //! Calibration - Class for TRD tracklets
 
-       AliTRDtriggerHLT *fMCMtrigger; //!
-       AliTRDtrigParam   *fMCMtriggerParams; //!
-       int fTriggerParDebugLevel;
-       double fLTUpTcut;
-       double fBField;
+       AliTRDtriggerHLT *fMCMtrigger; //! Tracklet producer
+       AliTRDtrigParam   *fMCMtriggerParams; //! Trigger parameters
+       int fTriggerParDebugLevel; // Debug level for fMCMtriggerParams
+       double fLTUpTcut; // pT cut of LTU
+       double fBField; // Magnetic field magnitude
 
-       AliCDBManager *cdb; //!
-       AliRawReaderMemory *rmem; //!
+       AliCDBManager *fCDB; //! Pointer to OCDB 
+       AliRawReaderMemory *fRmem; //! Mem reader
        
        ClassDef(AliHLTTRDCalibrationComponent, 0)
 

diff --git a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx
index 692ecd0e7ae29648c9c405c481bfa7f64f008a51..39ecd5f423dc1e9307b1506b11e45a79b1562019 100644 (file)
--- a/HLT/TRD/AliHLTTRDClusterizerComponent.cxx
+++ b/HLT/TRD/AliHLTTRDClusterizerComponent.cxx
@@ -62,12 +62,12 @@ const char* AliHLTTRDClusterizerComponent::GetComponentID()
 void AliHLTTRDClusterizerComponent::GetInputDataTypes( vector<AliHLTComponent_DataType>& list)
 {
   list.clear(); // We do not have any requirements for our input data type(s).
-  list.push_back( AliHLTTRDDefinitions::gkDDLRawDataType );
+  list.push_back( AliHLTTRDDefinitions::fgkDDLRawDataType );
 }
 
 AliHLTComponent_DataType AliHLTTRDClusterizerComponent::GetOutputDataType()
 {
-  return AliHLTTRDDefinitions::gkClusterDataType;
+  return AliHLTTRDDefinitions::fgkClusterDataType;
 }
 
 void AliHLTTRDClusterizerComponent::GetOutputDataSize( unsigned long& constBase, double& inputMultiplier )
@@ -193,15 +193,15 @@ int AliHLTTRDClusterizerComponent::DoEvent( const AliHLTComponent_EventData& evt
     {
       char tmp1[14], tmp2[14];
       DataType2Text( blocks[i].fDataType, tmp1 );
-      DataType2Text( AliHLTTRDDefinitions::gkDDLRawDataType, tmp2 );      
+      DataType2Text( AliHLTTRDDefinitions::fgkDDLRawDataType, tmp2 );      
       Logging( kHLTLogDebug, "HLT::TRDClusterizer::DoEvent", "Event received", 
               "Event 0x%08LX (%Lu) received datatype: %s - required datatype: %s",
               evtData.fEventID, evtData.fEventID, tmp1, tmp2 );
 
-      if ( blocks[i].fDataType != AliHLTTRDDefinitions::gkDDLRawDataType ) 
+      if ( blocks[i].fDataType != AliHLTTRDDefinitions::fgkDDLRawDataType ) 
        {
          Logging (kHLTLogError, "HLT::TRDClusterizer::DoEvent", "COMPARE FAILED", "type=%d is type=%d",
-                  blocks[i].fDataType, AliHLTTRDDefinitions::gkDDLRawDataType);
+                  blocks[i].fDataType, AliHLTTRDDefinitions::fgkDDLRawDataType);
          continue;
        }
       fDblock_Specification = blocks[i].fSpecification;
@@ -221,7 +221,7 @@ int AliHLTTRDClusterizerComponent::DoEvent( const AliHLTComponent_EventData& evt
   unsigned long copied = 0;
   for ( unsigned long i = 0; i < evtData.fBlockCnt; i++ )
     {
-      if ( blocks[i].fDataType != AliHLTTRDDefinitions::gkDDLRawDataType ) 
+      if ( blocks[i].fDataType != AliHLTTRDDefinitions::fgkDDLRawDataType ) 
        continue;
 
       void *pos = (void*)(pBuf + copied);
@@ -293,7 +293,7 @@ int AliHLTTRDClusterizerComponent::DoEvent( const AliHLTComponent_EventData& evt
       for (Int_t icb = 0; icb < tb->GetEntries(); icb++)
        {
          tb->GetEntry(icb);
-         PushBack(clusters, AliHLTTRDDefinitions::gkClusterDataType, fDblock_Specification);
+         PushBack(clusters, AliHLTTRDDefinitions::fgkClusterDataType, fDblock_Specification);
        }
     }
 

diff --git a/HLT/TRD/AliHLTTRDDefinitions.cxx b/HLT/TRD/AliHLTTRDDefinitions.cxx
index dc2d58143527ce8e5786604724c5a4ba3710ed8b..fed4f8e04d45ca8d170910329911a59df55d3a3d 100644 (file)
--- a/HLT/TRD/AliHLTTRDDefinitions.cxx
+++ b/HLT/TRD/AliHLTTRDDefinitions.cxx
@@ -27,13 +27,13 @@
 
 ClassImp(AliHLTTRDDefinitions)
 
-const AliHLTComponentDataType AliHLTTRDDefinitions::gkDDLRawDataType = { sizeof(AliHLTComponentDataType), {'D','D','L','_','R','A','W',' '},{'T','R','D',' '}};;
+const AliHLTComponentDataType AliHLTTRDDefinitions::fgkDDLRawDataType = { sizeof(AliHLTComponentDataType), {'D','D','L','_','R','A','W',' '},{'T','R','D',' '}};;
 
-const AliHLTComponentDataType AliHLTTRDDefinitions::gkClusterDataType = { sizeof(AliHLTComponentDataType), {'C','L','U','S','T','E','R','S'},{'T','R','D',' '}};;
+const AliHLTComponentDataType AliHLTTRDDefinitions::fgkClusterDataType = { sizeof(AliHLTComponentDataType), {'C','L','U','S','T','E','R','S'},{'T','R','D',' '}};;
 
-const AliHLTComponentDataType AliHLTTRDDefinitions::gkTRDSATracksDataType = { sizeof(AliHLTComponentDataType), {'T','R','A','C','K','S','S','A'},{'T','R','D',' '}};;
+const AliHLTComponentDataType AliHLTTRDDefinitions::fgkTRDSATracksDataType = { sizeof(AliHLTComponentDataType), {'T','R','A','C','K','S','S','A'},{'T','R','D',' '}};;
 
-const AliHLTComponentDataType AliHLTTRDDefinitions::gkMCMtrackletDataType = { sizeof(AliHLTComponentDataType), {'M','C','M','T','R','L','E','T'},{'T','R','D',' '}};;
+const AliHLTComponentDataType AliHLTTRDDefinitions::fgkMCMtrackletDataType = { sizeof(AliHLTComponentDataType), {'M','C','M','T','R','L','E','T'},{'T','R','D',' '}};;
 
-const AliHLTComponentDataType AliHLTTRDDefinitions::gkMCMcalibrationDataType = { sizeof(AliHLTComponentDataType), {'M','C','M','C','A','L','I','H'},{'T','R','D',' '}};;
+const AliHLTComponentDataType AliHLTTRDDefinitions::fgkMCMcalibrationDataType = { sizeof(AliHLTComponentDataType), {'M','C','M','C','A','L','I','H'},{'T','R','D',' '}};;
 

diff --git a/HLT/TRD/AliHLTTRDDefinitions.h b/HLT/TRD/AliHLTTRDDefinitions.h
index 2140394fc7ecf3bdae59d63651a4a4ce763bb079..3bdcbfd73e5a1e27835d5d22cba3201a9971c859 100644 (file)
--- a/HLT/TRD/AliHLTTRDDefinitions.h
+++ b/HLT/TRD/AliHLTTRDDefinitions.h
@@ -10,26 +10,28 @@
  */
 
 #include "AliHLTDataTypes.h"
-#include "TObject.h"
+#include "Rtypes.h"
+
+///////////////////////////////////////////////////////////////////////////////
+//                                                                           //
+//  The HLT definitions for TRD                                              //  
+//                                                                           //
+//                                                                           //
+///////////////////////////////////////////////////////////////////////////////
+
 
 class AliHLTTRDDefinitions
-    {
+{
     public:
 
-      static const AliHLTComponentDataType gkDDLRawDataType;
-      static const AliHLTComponentDataType gkClusterDataType;
-      static const AliHLTComponentDataType gkTRDSATracksDataType; // Stand Alone tracks
-      static const AliHLTComponentDataType gkMCMtrackletDataType;
-      static const AliHLTComponentDataType gkMCMcalibrationDataType;
+      static const AliHLTComponentDataType fgkDDLRawDataType;
+      static const AliHLTComponentDataType fgkClusterDataType;
+      static const AliHLTComponentDataType fgkTRDSATracksDataType; // Stand Alone tracks
+      static const AliHLTComponentDataType fgkMCMtrackletDataType;
+      static const AliHLTComponentDataType fgkMCMcalibrationDataType;
       
       ClassDef(AliHLTTRDDefinitions, 0)
 
-    };
-
-typedef struct AliTRDDummyData
-{
-  char str[50];
-  long int val;
 };
 
 #endif

diff --git a/HLT/TRD/AliHLTTRDTrackerComponent.cxx b/HLT/TRD/AliHLTTRDTrackerComponent.cxx
index b7df3e98e516f370e8e0c171d50cf9cfcd0a2b14..04b90ebec1f68f864756d4c98ee61654fb0163f2 100644 (file)
--- a/HLT/TRD/AliHLTTRDTrackerComponent.cxx
+++ b/HLT/TRD/AliHLTTRDTrackerComponent.cxx
@@ -74,12 +74,12 @@ const char* AliHLTTRDTrackerComponent::GetComponentID()
 void AliHLTTRDTrackerComponent::GetInputDataTypes( vector<AliHLTComponent_DataType>& list)
 {
   list.clear(); // We do not have any requirements for our input data type(s).
-  list.push_back( AliHLTTRDDefinitions::gkClusterDataType );
+  list.push_back( AliHLTTRDDefinitions::fgkClusterDataType );
 }
 
 AliHLTComponent_DataType AliHLTTRDTrackerComponent::GetOutputDataType()
 {
-  return AliHLTTRDDefinitions::gkClusterDataType;
+  return AliHLTTRDDefinitions::fgkClusterDataType;
 }
 
 void AliHLTTRDTrackerComponent::GetOutputDataSize( unsigned long& constBase, double& inputMultiplier )
@@ -224,7 +224,7 @@ int AliHLTTRDTrackerComponent::DoEvent( const AliHLTComponentEventData & evtData
 
   AliHLTUInt32_t fDblock_Specification = 0;
 
-  AliHLTComponentBlockData *dblock = (AliHLTComponentBlockData *)GetFirstInputBlock( AliHLTTRDDefinitions::gkClusterDataType );
+  AliHLTComponentBlockData *dblock = (AliHLTComponentBlockData *)GetFirstInputBlock( AliHLTTRDDefinitions::fgkClusterDataType );
   if (dblock != 0)
     {
       fDblock_Specification = dblock->fSpecification;
@@ -236,7 +236,7 @@ int AliHLTTRDTrackerComponent::DoEvent( const AliHLTComponentEventData & evtData
     }
 
   int ibForce = 0;
-  TObject *tobjin = (TObject *)GetFirstInputObject( AliHLTTRDDefinitions::gkClusterDataType, "TObjArray", ibForce);
+  TObject *tobjin = (TObject *)GetFirstInputObject( AliHLTTRDDefinitions::fgkClusterDataType, "TObjArray", ibForce);
   Logging( kHLTLogInfo, "HLT::TRDTracker::DoEvent", "1stBLOCK", "Pointer = 0x%x", tobjin);
 
 //   int iTotalClusterCounter = 0;
@@ -267,7 +267,7 @@ int AliHLTTRDTrackerComponent::DoEvent( const AliHLTComponentEventData & evtData
 //         }
          
          //Pass the data further...
-         //PushBack(clusters, AliHLTTRDDefinitions::gkClusterDataType, fDblock_Specification);
+         //PushBack(clusters, AliHLTTRDDefinitions::fgkClusterDataType, fDblock_Specification);
        }
       else
        {