coding conventions and compilation warnings

diff --git a/HLT/BASE/util/AliHLTRawReaderPublisherComponent.cxx b/HLT/BASE/util/AliHLTRawReaderPublisherComponent.cxx
index 53d9860050e55e89fc377414669b1ae5f69d419f..ed8bcfcf76a798aab434c9e4c04f6daabddd01a5 100644 (file)
--- a/HLT/BASE/util/AliHLTRawReaderPublisherComponent.cxx
+++ b/HLT/BASE/util/AliHLTRawReaderPublisherComponent.cxx
@@ -206,7 +206,7 @@ int AliHLTRawReaderPublisherComponent::GetEvent(const AliHLTComponentEventData&
 {
   // see header file for class documentation
   int iResult=0;
-  int offset=0;
+  unsigned int offset=0;
   AliHLTUInt8_t* pTgt=outputPtr;
   assert(outputPtr!=NULL || size==0);
   AliRawReader* pRawReader=GetRawReader();
@@ -218,7 +218,7 @@ int AliHLTRawReaderPublisherComponent::GetEvent(const AliHLTComponentEventData&
       const AliRawDataHeader* pHeader=pRawReader->GetDataHeader();
       assert(pHeader!=NULL);
       if (pHeader==NULL) continue;
-      int readSize=pRawReader->GetDataSize()+sizeof(AliRawDataHeader);
+      unsigned int readSize=pRawReader->GetDataSize()+sizeof(AliRawDataHeader);
       int id=pRawReader->GetEquipmentId();
       AliInfo(Form("got header for id %d, size %d", id, readSize));
       if (fMinEquId>id || fMaxEquId<id) {

diff --git a/HLT/TPCLib/AliHLTTPCClusterFinder.cxx b/HLT/TPCLib/AliHLTTPCClusterFinder.cxx
index cfbec76d5570c552caf3aec3f2599f3d20f6bc04..98d4cc8b98e694bcca6c43901f28864f595c71e9 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusterFinder.cxx
+++ b/HLT/TPCLib/AliHLTTPCClusterFinder.cxx
@@ -749,7 +749,7 @@ void AliHLTTPCClusterFinder::FindClusters(){
   fPadArray->FindClusters(fMatch);
 
   AliClusterData * clusterlist = new AliClusterData[fPadArray->fClusters.size()]; //Clusterlist
-  for(int i=0;i<fPadArray->fClusters.size();i++){
+  for(unsigned int i=0;i<fPadArray->fClusters.size();i++){
     clusterlist[i].fTotalCharge = fPadArray->fClusters[i].fTotalCharge;
     clusterlist[i].fPad = fPadArray->fClusters[i].fPad;
     clusterlist[i].fPad2 = fPadArray->fClusters[i].fPad2;

diff --git a/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx b/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx
index f9049381eff58fd2bfeb2bc6a494390f342402f9..9cf8b4ab09648c74c7de86e4477f5077ba8bef1d 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx
@@ -64,8 +64,8 @@ AliHLTTPCClusterFinderComponent::AliHLTTPCClusterFinderComponent(bool packed)
   fXYClusterError(-1),
   fZClusterError(-1),
   fPackedSwitch(packed),
-  fPatch(0),
   fUnsorted(0),
+  fPatch(0),
   fPadArray(NULL)
 {
   // see header file for class documentation
@@ -75,29 +75,6 @@ AliHLTTPCClusterFinderComponent::AliHLTTPCClusterFinderComponent(bool packed)
   // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
 }
 
-AliHLTTPCClusterFinderComponent::AliHLTTPCClusterFinderComponent(const AliHLTTPCClusterFinderComponent&)
-  :
-  fClusterFinder(NULL),
-  fReader(NULL),
-  fClusterDeconv(true),
-  fXYClusterError(-1),
-  fZClusterError(-1),
-  fPackedSwitch(0),
-  fPatch(0),
-  fUnsorted(0),
-  fPadArray(NULL)
-{
-  // see header file for class documentation
-  HLTFatal("copy constructor untested");
-}
-
-AliHLTTPCClusterFinderComponent& AliHLTTPCClusterFinderComponent::operator=(const AliHLTTPCClusterFinderComponent&)
-{ 
-  // see header file for class documentation
-  HLTFatal("assignment operator untested");
-  return *this;
-}
-
 AliHLTTPCClusterFinderComponent::~AliHLTTPCClusterFinderComponent()
 {
   // see header file for class documentation

diff --git a/HLT/TPCLib/AliHLTTPCClusterFinderComponent.h b/HLT/TPCLib/AliHLTTPCClusterFinderComponent.h
index 36e9f0eed5bb602b23c232ffd0ae27aba2afedee..86e9a3b8734a7e9a5101a1a04eeaee5ccb06cbc5 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusterFinderComponent.h
+++ b/HLT/TPCLib/AliHLTTPCClusterFinderComponent.h
@@ -55,10 +55,6 @@ class AliHLTTPCClusterFinderComponent : public AliHLTProcessor
          * @param packed    whether to use the packed or unpacked reader 
          */
        AliHLTTPCClusterFinderComponent(bool packed);
-       /** not a valid copy constructor, defined according to effective C++ style */
-       AliHLTTPCClusterFinderComponent(const AliHLTTPCClusterFinderComponent&);
-       /** not a valid assignment op, but defined according to effective C++ style */
-       AliHLTTPCClusterFinderComponent& operator=(const AliHLTTPCClusterFinderComponent&);
        /** destructor */
        virtual ~AliHLTTPCClusterFinderComponent();
 
@@ -89,6 +85,10 @@ class AliHLTTPCClusterFinderComponent : public AliHLTProcessor
                     AliHLTUInt32_t& size, vector<AliHLTComponentBlockData>& outputBlocks );
        
     private:
+       /** copy constructor prohibited */
+       AliHLTTPCClusterFinderComponent(const AliHLTTPCClusterFinderComponent&);
+       /** assignment operator prohibited */
+       AliHLTTPCClusterFinderComponent& operator=(const AliHLTTPCClusterFinderComponent&);
        /** the cluster finder object */
        AliHLTTPCClusterFinder* fClusterFinder;                                      //!transient
        /** the reader object for data decoding */

diff --git a/HLT/TPCLib/AliHLTTPCClusters.cxx b/HLT/TPCLib/AliHLTTPCClusters.cxx
index b71673ad0b8b2c4dda241972b8b9e73b890574c5..e682c053a66440f19ef9187e705b69230aaf05b5 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusters.cxx
+++ b/HLT/TPCLib/AliHLTTPCClusters.cxx
@@ -2,16 +2,23 @@
 using namespace std;
 #endif
 
-#include <cerrno>
-#include "AliHLTTPCPadArray.h"
-#include "AliHLTTPCPad.h"
-#include "AliHLTStdIncludes.h"
-#include "AliHLTTPCTransform.h"
-#include "AliTPCRawStream.h"
-#include "AliRawReaderMemory.h"
-#include "AliHLTTPCDigitReader.h"
-#include <vector>
+// see header file for class documentation
+// or
+// refer to README to build package
+// or
+// visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
+
+//#include <cerrno>
+//#include "AliHLTTPCPadArray.h"
+//#include "AliHLTTPCPad.h"
+//#include "AliHLTStdIncludes.h"
+//#include "AliHLTTPCTransform.h"
+//#include "AliTPCRawStream.h"
+//#include "AliRawReaderMemory.h"
+//#include "AliHLTTPCDigitReader.h"
+//#include <vector>
 #include "AliHLTTPCClusters.h"
+
 /** ROOT macro for the implementation of ROOT specific class methods */
 //ClassImp(AliHLTTPCClusters)
 
@@ -27,12 +34,17 @@ AliHLTTPCClusters::AliHLTTPCClusters()
   fChargeFalling(0),
   fLastCharge(0),
   fLastMergedPad(0),
+  fRowNumber(0),
   fFirstPad(0),
-  fLastPad(0),
-  fRowNumber(0)
+  fLastPad(0)
 {
-
+  // see header file for class documentation
+  // or
+  // refer to README to build package
+  // or
+  // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
 }
+
 AliHLTTPCClusters::AliHLTTPCClusters(const AliHLTTPCClusters& src)
   :
   fTotalCharge(src.fTotalCharge),
@@ -45,13 +57,17 @@ AliHLTTPCClusters::AliHLTTPCClusters(const AliHLTTPCClusters& src)
   fChargeFalling(src.fChargeFalling),
   fLastCharge(src.fLastCharge),
   fLastMergedPad(src.fLastMergedPad),
+  fRowNumber(src.fRowNumber),
   fFirstPad(src.fFirstPad),
-  fLastPad(src.fLastPad),
-  fRowNumber(src.fRowNumber)
+  fLastPad(src.fLastPad)
 {
+  // see header file for class documentation
   //HLTInfo("Copy constructor called");
 }
-AliHLTTPCClusters& AliHLTTPCClusters::operator=(const AliHLTTPCClusters& src){
+
+AliHLTTPCClusters& AliHLTTPCClusters::operator=(const AliHLTTPCClusters& src)
+{
+  // see header file for class documentation
   fTotalCharge=src.fTotalCharge;
   fPad = src.fPad;
   fTime = src.fTime;
@@ -61,8 +77,8 @@ AliHLTTPCClusters& AliHLTTPCClusters::operator=(const AliHLTTPCClusters& src){
   fFlags = src.fFlags;
   fChargeFalling = src.fChargeFalling;
   fLastCharge = src.fLastCharge;
+  fRowNumber= src.fRowNumber;
   fLastMergedPad = src.fLastMergedPad;
   fFirstPad = src.fFirstPad;
-  fRowNumber= src.fRowNumber;
   return (*this);
 }

diff --git a/HLT/TPCLib/AliHLTTPCClusters.h b/HLT/TPCLib/AliHLTTPCClusters.h
index 1d5659778702913a0a0dd653b3d7f9157dee2a55..614ec0808024757ae757284121f76edaa4552aa9 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusters.h
+++ b/HLT/TPCLib/AliHLTTPCClusters.h
@@ -1,5 +1,5 @@
-#ifndef ALIHLTTPCCLUSTERS
-#define ALIHLTTPCCLUSTERS
+#ifndef ALIHLTTPCCLUSTERS_H
+#define ALIHLTTPCCLUSTERS_H
 
 #include "AliHLTLogging.h"
 
@@ -8,7 +8,7 @@ class AliHLTTPCClusters : public AliHLTLogging {
  public:
   AliHLTTPCClusters();
   AliHLTTPCClusters(const AliHLTTPCClusters& src);
-  AliHLTTPCClusters& operator=(const AliHLTTPCClusters&);
+  AliHLTTPCClusters& operator=(const AliHLTTPCClusters& src);
 
   UInt_t fTotalCharge;   //tot charge of cluster
   UInt_t fPad;           //pad value
@@ -20,9 +20,9 @@ class AliHLTTPCClusters : public AliHLTLogging {
   UInt_t fChargeFalling; //for deconvolution
   UInt_t fLastCharge;    //for deconvolution
   UInt_t fLastMergedPad; //dont merge twice per pad
-  UInt_t fRowNumber;
-  Int_t fFirstPad;
-  UInt_t fLastPad;
+  UInt_t fRowNumber;     //row number
+  Int_t fFirstPad;       //first pad
+  UInt_t fLastPad;       //last pad (aha!!!)
   ClassDef(AliHLTTPCClusters,0) //Fast cluster finder
     };
-#endif
+#endif //ALIHLTTPCCLUSTERS_H

diff --git a/HLT/TPCLib/AliHLTTPCPad.cxx b/HLT/TPCLib/AliHLTTPCPad.cxx
index 0d49c603c7c03a43957d2300b85f273ca711efe7..560d2edb47ccdab373e5f91f9b0939e2726e54c0 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCPad.cxx
+++ b/HLT/TPCLib/AliHLTTPCPad.cxx
@@ -23,6 +23,12 @@
     @brief  Container Class for TPC Pads.
 */
 
+// see header file for class documentation
+// or
+// refer to README to build package
+// or
+// visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
+
 #if __GNUC__>= 3
 using namespace std;
 #endif
@@ -46,6 +52,8 @@ ClassImp(AliHLTTPCPad)
 
 AliHLTTPCPad::AliHLTTPCPad()
   :
+  fClusterCandidates(),
+  fUsedClusterCandidates(),
   fRowNo(-1),
   fPadNo(-1),
   fThreshold(0),
@@ -62,8 +70,6 @@ AliHLTTPCPad::AliHLTTPCPad()
   fNofBins(0),
   fReadPos(0),
   fpRawData(NULL),
-  fClusterCandidates(),
-  fUsedClusterCandidates(0),
   fDataSignals(NULL),
   fSignalPositionArray(NULL),
   fSizeOfSignalPositionArray(0)
@@ -84,6 +90,8 @@ AliHLTTPCPad::AliHLTTPCPad()
 
 AliHLTTPCPad::AliHLTTPCPad(Int_t offset, Int_t nofBins)
   :
+  fClusterCandidates(),
+  fUsedClusterCandidates(),
   fRowNo(-1),
   fPadNo(-1),
   fThreshold(0),
@@ -100,8 +108,6 @@ AliHLTTPCPad::AliHLTTPCPad(Int_t offset, Int_t nofBins)
   fNofBins(nofBins),
   fReadPos(0),
   fpRawData(NULL),
-  fClusterCandidates(),
-  fUsedClusterCandidates(0),
   fDataSignals(NULL),
   fSignalPositionArray(NULL),
   fSizeOfSignalPositionArray(0)
@@ -109,41 +115,6 @@ AliHLTTPCPad::AliHLTTPCPad(Int_t offset, Int_t nofBins)
   // see header file for class documentation
 }
 
-AliHLTTPCPad::AliHLTTPCPad(const AliHLTTPCPad& srcPad)
-  :
-  fRowNo(srcPad.fRowNo),
-  fPadNo(srcPad.fPadNo),
-  fThreshold(0),
-  fAverage(-1),
-  fNofEvents(0),
-  fSum(0),
-  fCount(0),
-  fTotal(0),
-  fBLMax(-1),
-  fBLMaxBin(-1),
-  fBLMin(-1),
-  fBLMinBin(-1),
-  fFirstBLBin(0),
-  fNofBins(0),
-  fReadPos(0),
-  fpRawData(NULL),
-  fClusterCandidates(),
-  fUsedClusterCandidates(0),
-  fDataSignals(NULL),
-  fSignalPositionArray(NULL),
-  fSizeOfSignalPositionArray(0)
-{
-  // see header file for class documentation
-  HLTFatal("copy constructor not implemented");
-}
-
-AliHLTTPCPad& AliHLTTPCPad::operator=(const AliHLTTPCPad&)
-{
-  // see header file for class documentation
-  HLTFatal("assignment operator not implemented");
-  return (*this);
-}
-
 AliHLTTPCPad::~AliHLTTPCPad()
 {
   // see header file for class documentation
@@ -464,7 +435,9 @@ Float_t AliHLTTPCPad::GetAveragedOccupancy() const
   // history is not yet implemented
   return GetOccupancy();
 }
-void AliHLTTPCPad::PrintRawData(){
+void AliHLTTPCPad::PrintRawData()
+{
+  // see header file for class documentation
   for(Int_t bin=0;bin<AliHLTTPCTransform::GetNTimeBins();bin++){
     if(GetDataSignal(bin)>0)
       cout<<fRowNo<<"\t"<<fPadNo<<"\t"<<bin<<"\t"<<GetDataSignal(bin)<<endl;;
@@ -472,22 +445,33 @@ void AliHLTTPCPad::PrintRawData(){
   cout<<"bins: "<<AliHLTTPCTransform::GetNTimeBins()<<endl;
 }
 
-void AliHLTTPCPad::SetDataToDefault(){
+void AliHLTTPCPad::SetDataToDefault()
+{
+  // see header file for class documentation
   if(fpRawData){
     memset( fDataSignals, 0xFF, sizeof(Int_t)*(AliHLTTPCTransform::GetNTimeBins()));
     memset( fSignalPositionArray, 0xFF, sizeof(Int_t)*(AliHLTTPCTransform::GetNTimeBins()));
     fSizeOfSignalPositionArray=0;
   }
 }
-void AliHLTTPCPad::SetDataSignal(Int_t bin,Int_t signal){
+
+void AliHLTTPCPad::SetDataSignal(Int_t bin,Int_t signal)
+{
+  // see header file for class documentation
   fDataSignals[bin]=signal;
   fSignalPositionArray[fSizeOfSignalPositionArray]=bin;
   fSizeOfSignalPositionArray++;
 }
-Int_t AliHLTTPCPad::GetDataSignal(Int_t bin){
+
+Int_t AliHLTTPCPad::GetDataSignal(Int_t bin) const
+{
+  // see header file for class documentation
   return fDataSignals[bin];
 }
-void AliHLTTPCPad::FindClusterCandidates(){
+
+void AliHLTTPCPad::FindClusterCandidates()
+{
+  // see header file for class documentation
   UInt_t seqcharge=0;
   UInt_t seqaverage=0;
   UInt_t seqerror=0;

diff --git a/HLT/TPCLib/AliHLTTPCPad.h b/HLT/TPCLib/AliHLTTPCPad.h
index 82b264edfdbeec0fa2a9292870f7aeddc540c548..3e4baff83fddbffbce86acaf6eb8540df54bd123 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCPad.h
+++ b/HLT/TPCLib/AliHLTTPCPad.h
@@ -1,8 +1,8 @@
 // -*- Mode: C++ -*-
 // @(#) $Id$
 
-#ifndef ALIHLTPAD_H
-#define ALIHLTPAD_H
+#ifndef ALIHLTTPCPAD_H
+#define ALIHLTTPCPAD_H
 /* 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                               */
@@ -13,6 +13,12 @@
     @brief  Container Class for TPC Pads.
 */
 
+// see below for class documentation
+// or
+// refer to README to build package
+// or
+// visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
+
 #include "AliHLTLogging.h"
 #include "AliHLTTPCClusters.h"
 #include <vector>
@@ -44,10 +50,6 @@ public:
    */
   AliHLTTPCPad(Int_t offset, Int_t nofBins);
 
-  /** not a valid copy constructor, defined according to effective C++ style */
-  AliHLTTPCPad(const AliHLTTPCPad&);
-  /** not a valid assignment op, but defined according to effective C++ style */
-  AliHLTTPCPad& operator=(const AliHLTTPCPad&);
   /** standard destructor */
   virtual ~AliHLTTPCPad();
 
@@ -259,7 +261,8 @@ public:
   /**
    * Returns the signal in the specified bin
    */
-  Int_t GetDataSignal(Int_t bin);
+  Int_t GetDataSignal(Int_t bin) const;
+
   /**
    * Finds the cluster candidate. If atleast two signals in the data array are neighbours
    * they are stored in a cluster candidate vector.
@@ -273,14 +276,19 @@ public:
   /**
    * Vector of cluster candidates
    */
-  vector<AliHLTTPCClusters> fClusterCandidates;
+  vector<AliHLTTPCClusters> fClusterCandidates;                    //! transient
 
   /**
    * Vector of used clustercandidates, used so one do not use candidates multiple times
    */
-  vector<Int_t> fUsedClusterCandidates;
+  vector<Int_t> fUsedClusterCandidates;                            //! transient
 
  private:
+  /** copy constructor prohibited */
+  AliHLTTPCPad(const AliHLTTPCPad&);
+  /** assignment operator prohibited */
+  AliHLTTPCPad& operator=(const AliHLTTPCPad&);
+
   /**
    * Add a value to the base line calculation.
    * The value is been added to the sum if it exceeds the current base line
@@ -328,14 +336,14 @@ public:
   /**
    * Array containing the data
    */
-  AliHLTTPCSignal_t* fDataSignals;
+  AliHLTTPCSignal_t* fDataSignals;                                 //! transient
 
   /**
    * Array containing info on which bins have signals
    */
-  Int_t *fSignalPositionArray;
-  Int_t fSizeOfSignalPositionArray;
+  Int_t *fSignalPositionArray;                                     //! transient
+  Int_t fSizeOfSignalPositionArray;                                //! transient
 
-  ClassDef(AliHLTTPCPad, 0)
+  ClassDef(AliHLTTPCPad, 1)
 };
-#endif
+#endif // ALIHLTTPCPAD_H

diff --git a/HLT/TPCLib/AliHLTTPCPadArray.cxx b/HLT/TPCLib/AliHLTTPCPadArray.cxx
index 8fe6341f96292a84443969365fdda472afc4aa01..620abdd71471057053d399d33a80c3d6dd1ae492 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCPadArray.cxx
+++ b/HLT/TPCLib/AliHLTTPCPadArray.cxx
@@ -22,6 +22,12 @@
     @brief  Class containing TPC Pad objects.
 */
 
+// see header file for class documentation
+// or
+// refer to README to build package
+// or
+// visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
+
 #if __GNUC__>= 3
 using namespace std;
 #endif
@@ -41,15 +47,15 @@ ClassImp(AliHLTTPCPadArray)
 
 AliHLTTPCPadArray::AliHLTTPCPadArray()
   :
+  fRowPadVector(),
+  fClusters(),
   fPatch(-1),
   fFirstRow(-1),
   fLastRow(-1),
   fThreshold(10),
-  fNumberOfRows(0),
   fNumberOfPadsInRow(NULL),
-  fDigitReader(NULL),
-  fRowPadVector(0),
-  fClusters(0)
+  fNumberOfRows(0),
+  fDigitReader(NULL)
 {
   // see header file for class documentation
   // or
@@ -60,40 +66,17 @@ AliHLTTPCPadArray::AliHLTTPCPadArray()
 
 AliHLTTPCPadArray::AliHLTTPCPadArray(Int_t patch)
   :
+  fRowPadVector(),
+  fClusters(),
   fPatch(patch),
   fFirstRow(-1),
   fLastRow(-1),
   fThreshold(10),
-  fNumberOfRows(0),
   fNumberOfPadsInRow(NULL),
-  fDigitReader(NULL),
-  fRowPadVector(0),
-  fClusters(0)
-{
-  // see header file for class documentation
-}
-
-AliHLTTPCPadArray::AliHLTTPCPadArray(const AliHLTTPCPadArray& srcPadArray)
-  :
-  fPatch(srcPadArray.fPatch),
-  fFirstRow(srcPadArray.fFirstRow),
-  fLastRow(srcPadArray.fLastRow),
-  fThreshold(srcPadArray.fThreshold),
-  fNumberOfRows(srcPadArray.fNumberOfRows),
-  fNumberOfPadsInRow(srcPadArray.fNumberOfPadsInRow),
-  fDigitReader(srcPadArray.fDigitReader),
-  fRowPadVector(srcPadArray.fRowPadVector),
-  fClusters(srcPadArray.fClusters)
-{
-  // see header file for class documentation
-  HLTFatal("copy constructor not implemented");
-}
-
-AliHLTTPCPadArray& AliHLTTPCPadArray::operator=(const AliHLTTPCPadArray&)
+  fNumberOfRows(0),
+  fDigitReader(NULL)
 {
   // see header file for class documentation
-  HLTFatal("assignment operator not implemented");
-  return (*this);
 }
 
 AliHLTTPCPadArray::~AliHLTTPCPadArray()
@@ -101,7 +84,8 @@ AliHLTTPCPadArray::~AliHLTTPCPadArray()
   // see header file for class documentation
 }
 
-Int_t AliHLTTPCPadArray::InitializeVector(){
+Int_t AliHLTTPCPadArray::InitializeVector()
+{
   // see header file for class documentation
 
   if(fPatch>5||fPatch<0){
@@ -119,7 +103,7 @@ Int_t AliHLTTPCPadArray::InitializeVector(){
 
   for(Int_t i=0;i<fNumberOfRows;i++){
     fNumberOfPadsInRow[i]=AliHLTTPCTransform::GetNPads(i+fFirstRow);
-    fPadVector tmpRow;
+    AliHLTTPCPadVector tmpRow;
     for(Int_t j=0;j<fNumberOfPadsInRow[i];j++){
       AliHLTTPCPad *tmpPad = new AliHLTTPCPad();
       tmpPad->SetID(i,j);
@@ -127,9 +111,12 @@ Int_t AliHLTTPCPadArray::InitializeVector(){
     }
     fRowPadVector.push_back(tmpRow);
   }
+  return 0;
 }
 
-Int_t AliHLTTPCPadArray::DeInitializeVector(){
+Int_t AliHLTTPCPadArray::DeInitializeVector()
+{
+  // see header file for class documentation
   for(Int_t i=0;i<fNumberOfRows;i++){
     for(Int_t j=0;j<fNumberOfPadsInRow[i];j++){
       delete fRowPadVector[i][j];
@@ -139,14 +126,22 @@ Int_t AliHLTTPCPadArray::DeInitializeVector(){
   fRowPadVector.clear();
   return 1;
 } 
-void AliHLTTPCPadArray::SetPatch(Int_t patch){
+
+void AliHLTTPCPadArray::SetPatch(Int_t patch)
+{
+  // see header file for class documentation
   fPatch=patch;
 }
 
-void AliHLTTPCPadArray::SetDigitReader(AliHLTTPCDigitReader* digitReader){
+void AliHLTTPCPadArray::SetDigitReader(AliHLTTPCDigitReader* digitReader)
+{
+  // see header file for class documentation
   fDigitReader=digitReader;
 }
-Int_t AliHLTTPCPadArray::ReadData(){
+
+Int_t AliHLTTPCPadArray::ReadData()
+{
+  // see header file for class documentation
 
   switch (fPatch){
   case 0:
@@ -182,7 +177,9 @@ Int_t AliHLTTPCPadArray::ReadData(){
   }
   return 0;
 }
-void AliHLTTPCPadArray::FindClusters(Int_t match){
+
+void AliHLTTPCPadArray::FindClusters(Int_t match)
+{
   //see header file for documentation
   Int_t nClusters=0;
   Int_t totalChargeOfPreviousCandidate=0;
@@ -394,7 +391,10 @@ void AliHLTTPCPadArray::FindClusters(Int_t match){
   HLTInfo("Found %d clusters.",nClusters);
   // PrintClusters();
 }
-void AliHLTTPCPadArray::PrintClusters(){
+
+void AliHLTTPCPadArray::PrintClusters()
+{
+  // see header file for class documentation
   for(int i=0;i<fClusters.size();i++){
     cout<<"Cluster number: "<<i<<endl;
     cout<<"Row: "<<fClusters[i].fRowNumber<<" Pad: "<<fClusters[i].fFirstPad<<endl;
@@ -406,3 +406,21 @@ void AliHLTTPCPadArray::PrintClusters(){
     cout<<endl;
   }
 }
+
+void AliHLTTPCPadArray::DataToDefault()
+{
+  for(Int_t i=0;i<fNumberOfRows;i++){
+    for(Int_t j=0;j<fNumberOfPadsInRow[i];j++){
+       fRowPadVector[i][j]->SetDataToDefault();
+    }
+  }
+}
+
+void AliHLTTPCPadArray::FindClusterCandidates()
+{
+  for(Int_t row=0;row<fNumberOfRows;row++){
+    for(Int_t pad=0;pad<fNumberOfPadsInRow[row];pad++){
+       fRowPadVector[row][pad]->FindClusterCandidates();
+    }
+  }
+}

diff --git a/HLT/TPCLib/AliHLTTPCPadArray.h b/HLT/TPCLib/AliHLTTPCPadArray.h
index 4811dbdd0030c5e0803317e9f492418ab4ec267b..9f4ccf0f24106631e05ac2d65c004bc48cb01c36 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCPadArray.h
+++ b/HLT/TPCLib/AliHLTTPCPadArray.h
@@ -1,8 +1,8 @@
 // -*- Mode: C++ -*-
 // @(#) $Id$
 
-#ifndef ALIHLTPADARRAY_H
-#define ALIHLTPADARRAY_H
+#ifndef ALIHLTTPCPADARRAY_H
+#define ALIHLTTPCPADARRAY_H
 /* 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                               */
@@ -13,14 +13,20 @@
     @brief  Class containing arrays of TPC Pads.
 */
 
+// see below for class documentation
+// or
+// refer to README to build package
+// or
+// visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
+
 #include "AliHLTLogging.h"
 #include "AliHLTTPCTransform.h"
-#include "AliHLTTPCPad.h"
 #include "AliHLTTPCClusters.h"
 #include <vector>
 
 typedef Int_t AliHLTTPCSignal_t;
 class AliHLTTPCDigitReader;
+class AliHLTTPCPad;
 
 /**
  * @class AliHLTTPCPadArray
@@ -42,10 +48,6 @@ public:
    */
   AliHLTTPCPadArray(Int_t patch);
 
-  /** not a valid copy constructor, defined according to effective C++ style */
-  AliHLTTPCPadArray(const AliHLTTPCPadArray&);
-  /** not a valid assignment op, but defined according to effective C++ style */
-  AliHLTTPCPadArray& operator=(const AliHLTTPCPadArray&);
   /** standard destructor */
   virtual ~AliHLTTPCPadArray();
 
@@ -62,13 +64,7 @@ public:
   /**
    * Loop over all pads setting their data array to -1.
    */
-  void DataToDefault(){
-    for(Int_t i=0;i<fNumberOfRows;i++){
-      for(Int_t j=0;j<fNumberOfPadsInRow[i];j++){
-       fRowPadVector[i][j]->SetDataToDefault();
-      }
-    }
-  }
+  void DataToDefault();
   
   /**
    * Set the patch number.
@@ -88,18 +84,12 @@ public:
   /**
    * Retuns number of pads in this row.
    */
-  Int_t GetNumberOfPads(Int_t row){return fNumberOfPadsInRow[row];}
+  Int_t GetNumberOfPads(Int_t row) const {return fNumberOfPadsInRow[row];}
 
   /**
    * Loop over all pads, checking for clustercandidates.
    */
-  void FindClusterCandidates(){
-    for(Int_t row=0;row<fNumberOfRows;row++){
-      for(Int_t pad=0;pad<fNumberOfPadsInRow[row];pad++){
-       fRowPadVector[row][pad]->FindClusterCandidates();
-      }
-    }
-  }
+  void FindClusterCandidates();
   
   /**
    *
@@ -114,16 +104,20 @@ public:
    */
   void PrintClusters();
 
-  typedef vector<AliHLTTPCPad*> fPadVector;
+  typedef vector<AliHLTTPCPad*> AliHLTTPCPadVector;
 
-  vector<fPadVector> fRowPadVector;                                //! transient
+  vector<AliHLTTPCPadVector> fRowPadVector;                        //! transient
 
   vector<AliHLTTPCClusters> fClusters;                             //! transient
 
 private:
+  /** copy constructor prohibited */
+  AliHLTTPCPadArray(const AliHLTTPCPadArray&);
+  /** assignment operator prohibited */
+  AliHLTTPCPadArray& operator=(const AliHLTTPCPadArray&);
 
   /** The patch number */
-  Int_t fPatch;
+  Int_t fPatch;                                                    //! transient
 
   Int_t fFirstRow;                                                 //! transient
 
@@ -139,4 +133,4 @@ private:
 
   ClassDef(AliHLTTPCPadArray, 0);
 };
-#endif
+#endif // ALIHLTTPCPADARRAY_H

diff --git a/HLT/TPCLib/offline/AliHLTTPCDigitPublisherComponent.h b/HLT/TPCLib/offline/AliHLTTPCDigitPublisherComponent.h
index f981a6ad65c0b2166a2dbefc8dce9a1de3c7e0b2..28a47b89566062a3fcff0126734317fe897c0794 100644 (file)
--- a/HLT/TPCLib/offline/AliHLTTPCDigitPublisherComponent.h
+++ b/HLT/TPCLib/offline/AliHLTTPCDigitPublisherComponent.h
@@ -110,7 +110,7 @@ class AliHLTTPCDigitPublisherComponent : public AliHLTOfflineDataSource {
   AliHLTTPCDigitPublisherComponent& operator=(const AliHLTTPCDigitPublisherComponent&);
 
   /** max output block size, estimate during DoInit */
-  Int_t                   fMaxSize;                                //!transient
+  UInt_t                  fMaxSize;                                //!transient
 
   /** first slice (range of slices currently not implemented) */
   int                     fMinSlice;                               //!transient