Coding violation fixes.

diff --git a/HLT/src/AliL3TrackMerger.cxx b/HLT/src/AliL3TrackMerger.cxx
index 8f3f91233d3ecda2163673625f2b8264b2c6ef01..29671ddb83712200319c3b77c1e83779ee52e614 100644 (file)
--- a/HLT/src/AliL3TrackMerger.cxx
+++ b/HLT/src/AliL3TrackMerger.cxx
@@ -3,15 +3,6 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ALICE HLT Group
 
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy ALICE HLT Group
 

-#include "AliL3StandardIncludes.h"
-
-#include "AliL3Logging.h"
-#include "AliL3TrackMerger.h"
-#include "AliL3Track.h"
-#include "AliL3TrackSegmentData.h"
-#include "AliL3Transform.h"
-#include "AliL3TrackArray.h"
-

 /** \class AliL3TrackMerger
 <pre>
 //_____________________________________________________________
 /** \class AliL3TrackMerger
 <pre>
 //_____________________________________________________________


@@ -22,6 +13,15 @@
 </pre
 */
 
 </pre
 */
 

+#include "AliL3StandardIncludes.h"
+
+#include "AliL3Logging.h"
+#include "AliL3TrackMerger.h"
+#include "AliL3Track.h"
+#include "AliL3TrackSegmentData.h"
+#include "AliL3Transform.h"
+#include "AliL3TrackArray.h"
+

 ClassImp(AliL3TrackMerger)
 
 AliL3TrackMerger::AliL3TrackMerger(){
 ClassImp(AliL3TrackMerger)
 
 AliL3TrackMerger::AliL3TrackMerger(){


@@ -52,6 +52,9 @@ AliL3TrackMerger::~AliL3TrackMerger(){
 }
 
 void AliL3TrackMerger::SetRows(Int_t *row){
 }
 
 void AliL3TrackMerger::SetRows(Int_t *row){

+  //Set the indeces of the first and last
+  //TPC padrows
+  //

   for(Int_t i=0;i<fNSubSector;i++){
     fRowMin[i]=*(row+(2*i));
     fRowMax[i]=*(row+(2*i+1));
   for(Int_t i=0;i<fNSubSector;i++){
     fRowMin[i]=*(row+(2*i));
     fRowMax[i]=*(row+(2*i+1));


@@ -69,6 +72,10 @@ void AliL3TrackMerger::InitSector(Int_t slice,Int_t subsector){
 }
 
 void AliL3TrackMerger::SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout,Double_t xval){
 }
 
 void AliL3TrackMerger::SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout,Double_t xval){

+  // 
+  // Slow merging of two AliL3TrackArrays
+  // at reference plane x=xval
+  //

   void *ntuple=GetNtuple();
   const Int_t  kNOut=tracksout->GetNTracks();
   const Int_t  kNIn =tracksin->GetNTracks();
   void *ntuple=GetNtuple();
   const Int_t  kNOut=tracksout->GetNTracks();
   const Int_t  kNIn =tracksin->GetNTracks();


@@ -126,7 +133,10 @@ void AliL3TrackMerger::SlowMerge(){
 }
 
 void AliL3TrackMerger::InterMerge(){
 }
 
 void AliL3TrackMerger::InterMerge(){

-
+  // 
+  // Merging of the tracks
+  // between readout patches
+  //

   for(Int_t patch=0;patch< GetNIn();patch++){
     AliL3TrackArray * tracks = GetInTracks(patch);
     Double_t xval = AliL3Transform::Row2X((fRowMax[patch]+fRowMin[patch])/2);
   for(Int_t patch=0;patch< GetNIn();patch++){
     AliL3TrackArray * tracks = GetInTracks(patch);
     Double_t xval = AliL3Transform::Row2X((fRowMax[patch]+fRowMin[patch])/2);

diff --git a/HLT/src/AliL3TrackMerger.h b/HLT/src/AliL3TrackMerger.h
index 3c8240d40e45f8fa52e74c760c0216c51c697e5d..be66669ff8599d9c18e77b245336329d22b4638d 100644 (file)
--- a/HLT/src/AliL3TrackMerger.h
+++ b/HLT/src/AliL3TrackMerger.h
@@ -3,6 +3,12 @@
 #ifndef ALIL3TRACKMERGER_H
 #define ALIL3TRACKMERGER_H
 
 #ifndef ALIL3TRACKMERGER_H
 #define ALIL3TRACKMERGER_H
 

+//-------------------------------------------------------------------------
+//                Class AliL3TrackMerger
+//   This class is responsible for the merging of the HLT tracks
+//   between TPC sectors and readout patches
+//-------------------------------------------------------------------------
+

 #ifndef __CINT__ 
 #include "AliL3Merger.h"
 #endif
 #ifndef __CINT__ 
 #include "AliL3Merger.h"
 #endif


@@ -13,15 +19,6 @@ class AliL3Merger;
 
 class AliL3TrackMerger : public AliL3Merger {
 
 
 class AliL3TrackMerger : public AliL3Merger {
 

- private:
-
-  Int_t fSubSector;
-  Int_t fNSubSector;
-  Int_t *fRowMin;//!
-  Int_t *fRowMax;//!
-  Bool_t fSlow;
-  void SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout,Double_t xval);
-  Int_t Merge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout);

  public:
   AliL3TrackMerger();
   AliL3TrackMerger(Int_t nsubsectors);
  public:
   AliL3TrackMerger();
   AliL3TrackMerger(Int_t nsubsectors);


@@ -32,6 +29,15 @@ class AliL3TrackMerger : public AliL3Merger {
   void SlowMerge();
   void Merge();  //Loop over tracks from different subsectors
   void InterMerge();
   void SlowMerge();
   void Merge();  //Loop over tracks from different subsectors
   void InterMerge();

+
+ private:
+  Int_t fSubSector;//Index of the readout patch inside given TPC sector
+  Int_t fNSubSector;//Number of readout patches inside given TPC sector
+  Int_t *fRowMin;//!
+  Int_t *fRowMax;//!
+  Bool_t fSlow;//Slow or fast merging
+  void SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout,Double_t xval);
+  Int_t Merge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout);

   
   ClassDef(AliL3TrackMerger,1) //Track merging class 
 };
   
   ClassDef(AliL3TrackMerger,1) //Track merging class 
 };