Major changes in the AliL3Transform class. The class has been made completely

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

diff --git a/HLT/src/AliL3TrackMerger.cxx b/HLT/src/AliL3TrackMerger.cxx
index 54bf977447be7e5ab9969ebdcbb829845209b22b..d8bbb470c9ed9531006e9bb2bcf7f7bbda50c99e 100644 (file)
--- a/HLT/src/AliL3TrackMerger.cxx
+++ b/HLT/src/AliL3TrackMerger.cxx
@@ -1,6 +1,5 @@
-
-//Author:        Uli Frankenfeld
-//Last Modified: 06.12.2000
+// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
+//*-- Copyright &copy ULI
 
 #include <math.h>
 #include <iostream.h>
@@ -12,6 +11,7 @@
 #include "AliL3TrackArray.h"
 
 //_____________________________________________________________
+// AliL3TrackMerger
 //
 // The L3 track segment merger
 //
@@ -23,8 +23,8 @@ AliL3TrackMerger::AliL3TrackMerger(){
   Is2Global(kFALSE);
   fSlow = kFALSE;
   SetParameter();
-//  fRowMin = 0;
-//  fRowMax = 0;
+  fRowMin = 0;
+  fRowMax = 0;
 }
 
 
@@ -34,8 +34,8 @@ AliL3TrackMerger::AliL3TrackMerger(Int_t nsubsectors):AliL3Merger(nsubsectors){
   Is2Global(kFALSE);
   fSlow = kFALSE;
   SetParameter();
-  //fRowMin = new Int_t(nsubsectors);
-  //fRowMax = new Int_t(nsubsectors);
+  fRowMin = new Int_t[nsubsectors];
+  fRowMax = new Int_t[nsubsectors];
 }
 
 AliL3TrackMerger::~AliL3TrackMerger(){
@@ -120,7 +120,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];
@@ -176,8 +176,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);