Coding violations

[u/mrichter/AliRoot.git] / HLT / TPCLib / tracking-ca / AliHLTTPCCAMergerOutput.h

diff --git a/HLT/TPCLib/tracking-ca/AliHLTTPCCAMergerOutput.h b/HLT/TPCLib/tracking-ca/AliHLTTPCCAMergerOutput.h
index 81a905418a31e39d4b894525675368b8f58f1ef2..1bb36135e6491989b18ae6ef0b3aaffd94d5a4c4 100644 (file)
--- a/HLT/TPCLib/tracking-ca/AliHLTTPCCAMergerOutput.h
+++ b/HLT/TPCLib/tracking-ca/AliHLTTPCCAMergerOutput.h
@@ -29,14 +29,7 @@ class AliHLTTPCCAMergerOutput
   public:
 
     AliHLTTPCCAMergerOutput()
-        : fNTracks( 0 ), fNTrackClusters( 0 ), fTracks( 0 ), fClusterIDsrc( 0 ), fClusterPackedAmp( 0 ) {}
-
-    AliHLTTPCCAMergerOutput( const AliHLTTPCCAMergerOutput & )
-        : fNTracks( 0 ), fNTrackClusters( 0 ), fTracks( 0 ), fClusterIDsrc( 0 ), fClusterPackedAmp( 0 ) {}
-
-    const AliHLTTPCCAMergerOutput& operator=( const AliHLTTPCCAMergerOutput &/*v*/ ) const {
-      return *this;
-    }
+        : fNTracks( 0 ), fNTrackClusters( 0 ), fTracks( 0 ), fClusterId( 0 ), fClusterPackedAmp( 0 ) {}
 
     ~AliHLTTPCCAMergerOutput() {}
 
@@ -45,8 +38,7 @@ class AliHLTTPCCAMergerOutput
     GPUhd() int NTrackClusters()             const { return fNTrackClusters;       }
 
     GPUhd() const AliHLTTPCCAMergedTrack &Track( int i ) const { return fTracks[i]; }
-    GPUhd() unsigned int   ClusterIDsrc     ( int i )  const { return fClusterIDsrc[i]; }
-    GPUhd()  int   ClusterHltID     ( int i )  const { return fClusterHltID[i]; }
+    GPUhd()  int   ClusterId     ( int i )  const { return fClusterId[i]; }
     GPUhd() UChar_t  ClusterPackedAmp( int i )  const { return fClusterPackedAmp[i]; }
 
     GPUhd() static int EstimateSize( int nOfTracks, int nOfTrackClusters );
@@ -56,19 +48,23 @@ class AliHLTTPCCAMergerOutput
     GPUhd() void SetNTrackClusters( int v )  { fNTrackClusters = v; }
 
     GPUhd() void SetTrack( int i, const AliHLTTPCCAMergedTrack &v ) {  fTracks[i] = v; }
-    GPUhd() void SetClusterIDsrc( int i, unsigned int v ) {  fClusterIDsrc[i] = v; }
-    GPUhd() void SetClusterHltID( int i,  int v ) {  fClusterHltID[i] = v; }
+    GPUhd() void SetClusterId( int i,  int v ) {  fClusterId[i] = v; }
     GPUhd() void SetClusterPackedAmp( int i, UChar_t v ) {  fClusterPackedAmp[i] = v; }
 
   private:
 
+    AliHLTTPCCAMergerOutput( const AliHLTTPCCAMergerOutput & )
+        : fNTracks( 0 ), fNTrackClusters( 0 ), fTracks( 0 ), fClusterId( 0 ), fClusterPackedAmp( 0 ) {}
+
+    const AliHLTTPCCAMergerOutput& operator=( const AliHLTTPCCAMergerOutput &/*v*/ ) const {
+      return *this;
+    }
+
     int fNTracks;                 // number of reconstructed tracks
     int fNTrackClusters;          // total number of track clusters
     AliHLTTPCCAMergedTrack *fTracks; // pointer to reconstructed tracks
-    unsigned int   *fClusterIDsrc;         // pointer to cluster IDs ( packed IRow and ICluster)
-    int   *fClusterHltID;         // pointer to cluster IDs ( packed IRow and ICluster)
+    int   *fClusterId;         // pointer to cluster IDs ( packed slice, patch, cluster )
     UChar_t  *fClusterPackedAmp;    // pointer to packed cluster amplitudes
-
 };
 
 
@@ -77,7 +73,7 @@ GPUhd() inline int AliHLTTPCCAMergerOutput::EstimateSize( int nOfTracks, int nOf
 {
   // calculate the amount of memory [bytes] needed for the event
 
-  const int kClusterDataSize = sizeof( unsigned int ) + sizeof( int ) + sizeof( UChar_t );
+  const int kClusterDataSize = sizeof( int ) + sizeof( UChar_t );
 
   return sizeof( AliHLTTPCCAMergerOutput ) + sizeof( AliHLTTPCCAMergedTrack )*nOfTracks + kClusterDataSize*nOfTrackClusters;
 }
@@ -88,9 +84,8 @@ GPUhd() inline void AliHLTTPCCAMergerOutput::SetPointers()
   // set all pointers
 
   fTracks            = ( AliHLTTPCCAMergedTrack* )( ( &fClusterPackedAmp ) + 1 );
-  fClusterIDsrc      = ( unsigned int* )  ( fTracks            + fNTracks );
-  fClusterHltID      = ( int* )  ( fClusterIDsrc + fNTrackClusters );
-  fClusterPackedAmp  = ( UChar_t* ) ( fClusterHltID + fNTrackClusters );
+  fClusterId         = ( int* )  ( fTracks            + fNTracks );
+  fClusterPackedAmp  = ( UChar_t* ) ( fClusterId + fNTrackClusters );
 }
 
-#endif
+#endif //ALIHLTTPCCAMERGEROUTPUT_H