Avoid to create the link inside a module pointing to the module itself

[u/mrichter/AliRoot.git] / HLT / src / AliL3TrackMerger.cxx

diff --git a/HLT/src/AliL3TrackMerger.cxx b/HLT/src/AliL3TrackMerger.cxx
index 734a7479866f3967726e27b83e8fe14cb5044400..8f3f91233d3ecda2163673625f2b8264b2c6ef01 100644 (file)
--- a/HLT/src/AliL3TrackMerger.cxx
+++ b/HLT/src/AliL3TrackMerger.cxx
@@ -1,8 +1,10 @@
+// @(#) $Id$
+
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
-//*-- Copyright &copy ULI
+//*-- Copyright &copy ALICE HLT Group
+
+#include "AliL3StandardIncludes.h"
 
-#include <math.h>
-#include <iostream.h>
 #include "AliL3Logging.h"
 #include "AliL3TrackMerger.h"
 #include "AliL3Track.h"
@@ -10,11 +12,15 @@
 #include "AliL3Transform.h"
 #include "AliL3TrackArray.h"
 
+/** \class AliL3TrackMerger
+<pre>
 //_____________________________________________________________
 // AliL3TrackMerger
 //
 // The L3 track segment merger
 //
+</pre
+*/
 
 ClassImp(AliL3TrackMerger)
 
@@ -28,14 +34,17 @@ AliL3TrackMerger::AliL3TrackMerger(){
 }
 
 
-AliL3TrackMerger::AliL3TrackMerger(Int_t nsubsectors):AliL3Merger(nsubsectors){
+AliL3TrackMerger::AliL3TrackMerger(Int_t nsubsectors) : AliL3Merger()
+{
   //Constructor.
+  InitMerger(nsubsectors);
   fNSubSector = nsubsectors;
   Is2Global(kFALSE);
   fSlow = kFALSE;
   SetParameter();
   fRowMin = new Int_t[nsubsectors];
   fRowMax = new Int_t[nsubsectors];
+  
 }
 
 AliL3TrackMerger::~AliL3TrackMerger(){
@@ -43,7 +52,7 @@ AliL3TrackMerger::~AliL3TrackMerger(){
 }
 
 void AliL3TrackMerger::SetRows(Int_t *row){
-  for(Int_t i =0;i<fNSubSector;i++){
+  for(Int_t i=0;i<fNSubSector;i++){
     fRowMin[i]=*(row+(2*i));
     fRowMax[i]=*(row+(2*i+1));
   }
@@ -93,7 +102,7 @@ void AliL3TrackMerger::SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *t
       outertrack->CalculatePoint(xval);
       innertrack->CalculatePoint(xval);
       PrintDiff(innertrack,outertrack);
-      FillNtuple(ntuple,innertrack,outertrack);
+      //FillNtuple(ntuple,innertrack,outertrack);
       tracksout->Remove(outmin);
       tracksin->Remove(inmin);
 //      tracksout->Compress();
@@ -120,7 +129,7 @@ void AliL3TrackMerger::InterMerge(){
 
   for(Int_t patch=0;patch< GetNIn();patch++){
     AliL3TrackArray * tracks = GetInTracks(patch);
-    Double_t xval = fTransformer->Row2X((fRowMax[patch]+fRowMin[patch])/2);
+    Double_t xval = AliL3Transform::Row2X((fRowMax[patch]+fRowMin[patch])/2);
     Int_t nrow= fRowMax[patch]-fRowMin[patch]+1;
     const Int_t  kNIn =tracks->GetNTracks();
     AliL3Track *tr[2];
@@ -161,8 +170,8 @@ void AliL3TrackMerger::InterMerge(){
 
 void AliL3TrackMerger::Merge(){
   //Loop over tracks and pass them to the track merger.
-  Double_t edge0 = PI/18.;
-  Double_t edge1 = 2*PI - edge0;
+  Double_t edge0 = AliL3Transform::Pi()/18;
+  Double_t edge1 = AliL3Transform::TwoPi() - edge0;
   AliL3TrackArray *ttt = GetOutTracks();
   if(fNSubSector==1) {
     GetOutTracks()->AddTracks(GetInTracks(0)); 
@@ -176,8 +185,8 @@ void AliL3TrackMerger::Merge(){
     AliL3TrackArray *tout = GetOutTracks();
     if(i==subsec) tout = GetInTracks(subsec+1);
     AliL3TrackArray *tin = GetInTracks(i);
-    Double_t xval = fTransformer->Row2X(fRowMax[i]);
-    Double_t xmax = fTransformer->Row2X(fRowMax[i+1]);
+    Double_t xval = AliL3Transform::Row2X(fRowMax[i]);
+    Double_t xmax = AliL3Transform::Row2X(fRowMax[i+1]);
     Double_t ymax = xval*tan(edge0);
     for(Int_t out=0;out<tout->GetNTracks();out++){
       AliL3Track *outtrack=tout->GetCheckedTrack(out);