Since there is no PID in HT TPC tracking, assume all the tracks are pions.

[u/mrichter/AliRoot.git] / HLT / hough / AliL3HoughMerger.cxx

diff --git a/HLT/hough/AliL3HoughMerger.cxx b/HLT/hough/AliL3HoughMerger.cxx
index ce8dfd6742ba4dbc8bab2514a3a3cbcdc2504472..010c45deb25e302794e33f14d0f3596b4ee65818 100644 (file)
--- a/HLT/hough/AliL3HoughMerger.cxx
+++ b/HLT/hough/AliL3HoughMerger.cxx
@@ -1,5 +1,7 @@
+// @(#) $Id$
+
 // Author: Anders Vestbo <mailto:vestbo@fi.uib.no>
-//*-- Copyright &copy ASV 
+//*-- Copyright &copy ALICE HLT Group
 
 #include "AliL3StandardIncludes.h"
 
@@ -10,7 +12,7 @@
 #include "AliL3HoughMerger.h"
 #include "AliL3HoughTransformer.h"
 
-#if GCCVERSION == 3
+#if __GNUC__ == 3
 using namespace std;
 #endif
 
@@ -28,9 +30,10 @@ AliL3HoughMerger::AliL3HoughMerger()
 }
 
 
-AliL3HoughMerger::AliL3HoughMerger(Int_t nsubsectors) : AliL3Merger(nsubsectors,"AliL3HoughTrack")
+AliL3HoughMerger::AliL3HoughMerger(Int_t nsubsectors) 
 {
   //Constructor
+  InitMerger(nsubsectors,"AliL3HoughTrack");
   Is2Global(kFALSE);
   SetParameters(0.001,0.1,0.05);
 }
@@ -38,11 +41,12 @@ AliL3HoughMerger::AliL3HoughMerger(Int_t nsubsectors) : AliL3Merger(nsubsectors,
 
 AliL3HoughMerger::~AliL3HoughMerger()
 {
- 
+  //dtor 
 }
 
 void AliL3HoughMerger::FillTracks(AliL3TrackArray *tracks,Int_t patch)
 {
+  //Fills tracks into merger
   if(tracks->GetNTracks()==0)
     LOG(AliL3Log::kWarning,"AliL3HoughMerger::FillTracks","Track Array")
       <<"Adding empty track array"<<ENDLOG;
@@ -53,6 +57,7 @@ void AliL3HoughMerger::FillTracks(AliL3TrackArray *tracks,Int_t patch)
 
 void AliL3HoughMerger::SetParameters(Double_t maxkappa,Double_t maxpsi,Double_t maxphi0)
 {
+  //Set merger params
   fMaxKappa = maxkappa;
   fMaxPsi = maxpsi;
   fMaxPhi0 = maxphi0;
@@ -85,6 +90,7 @@ Bool_t AliL3HoughMerger::IsTrack(AliL3Track *innertrack,AliL3Track *outertrack)
 
 void AliL3HoughMerger::AddTrack(AliL3TrackArray *mergedtrack,AliL3Track *track)
 {
+  //Adds track to an already merged one
   AliL3Track *t[1];
   t[0] = track;
   MultiMerge(mergedtrack,t,1);
@@ -142,8 +148,9 @@ void AliL3HoughMerger::MergePatches(Bool_t slow)
 
 void AliL3HoughMerger::Merge()
 {
-  Double_t edge0 = PI/18.;
-  Double_t edge1 = 2*PI - edge0;
+  //Merging of tracks
+  Double_t edge0 = AliL3Transform::Pi()/18;
+  //Double_t edge1 = 2*PI - edge0;
   AliL3TrackArray *ttt = GetOutTracks();
   
   Int_t subsec = GetNIn() - 2; 
@@ -152,7 +159,7 @@ void AliL3HoughMerger::Merge()
     if(i==subsec) tout = GetInTracks(subsec+1);
     AliL3TrackArray *tin = GetInTracks(i);
     Double_t xval = AliL3Transform::Row2X(AliL3Transform::GetLastRow(i));
-    Double_t xmax = AliL3Transform::Row2X(AliL3Transform::GetLastRow(i+1));
+    //Double_t xmax = AliL3Transform::Row2X(AliL3Transform::GetLastRow(i+1));
     Double_t ymax = xval*tan(edge0);
     for(Int_t out=0;out<tout->GetNTracks();out++){
       AliL3Track *outtrack=tout->GetCheckedTrack(out);
@@ -202,7 +209,7 @@ void AliL3HoughMerger::Merge()
 
 Int_t AliL3HoughMerger::Merge(AliL3TrackArray* mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout)
 {
-  
+  //Merging of tracks  
   AliL3Track *tracks[2];
   const Int_t  kNOut=tracksout->GetNTracks();
   const Int_t  kNIn =tracksin->GetNTracks();
@@ -249,6 +256,7 @@ Int_t AliL3HoughMerger::Merge(AliL3TrackArray* mergedtrack,AliL3TrackArray *trac
 
 void AliL3HoughMerger::SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *tracksin,AliL3TrackArray *tracksout,Double_t xval)
 {
+  //Slow merging of tracks??
   void *ntuple=GetNtuple();
   const Int_t  kNOut=tracksout->GetNTracks();
   const Int_t  kNIn =tracksin->GetNTracks();
@@ -302,6 +310,7 @@ void AliL3HoughMerger::SlowMerge(AliL3TrackArray *mergedtrack,AliL3TrackArray *t
 
 void AliL3HoughMerger::Print(AliL3Track **tracks)
 {
+  //Print merging results
   AliL3HoughTrack *tr1 = (AliL3HoughTrack*)tracks[0];
   AliL3HoughTrack *tr2 = (AliL3HoughTrack*)tracks[1];
   Double_t kappadiff = fabs(tr1->GetKappa()-tr2->GetKappa());