]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HLT/src/AliL3Merger.cxx
Fix for Mac and gcc 4
[u/mrichter/AliRoot.git] / HLT / src / AliL3Merger.cxx
index 2c5f5e750ef25f179ee1c7f011d9c9237d4beae9..8044694a636f0198837c06a0ef1aa95a26296d0d 100644 (file)
@@ -3,9 +3,9 @@
 // Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
 //*-- Copyright &copy Uli 
 
+#include "AliL3StandardIncludes.h"
+
 #include "AliL3Logging.h"
-#include <math.h>
-#include <iostream.h>
 #include "AliL3Merger.h"
 #include "AliL3Track.h"
 #include "AliL3TrackSegmentData.h"
 #include <TFile.h>
 #endif
 
+/** \class AliL3Merger
+<pre>
 //_____________________________________________________________
 // AliL3Merger
 //
 // The L3 merger base class
 //
+</pre>
+*/
+
+#if __GNUC__ >= 3
+using namespace std;
+#endif
 
 ClassImp(AliL3Merger)
 
-AliL3Merger::AliL3Merger(){
+AliL3Merger::AliL3Merger()
+{
   //Default constructor
-  SetArray(0);
+  fInTrack=0;
+  fOutTrack=0;
+  fCurrentTracks=0;
+  fNIn=0;
 }
 
+AliL3Merger::~AliL3Merger()
+{
+  //Destructor
+  DeleteArray();
+}
 
-AliL3Merger::AliL3Merger(Int_t ntrackarrays,Char_t *tracktype){
-  //Constructor.
+void AliL3Merger::InitMerger(Int_t ntrackarrays,Char_t *tracktype)
+{
+  //Used to setup all arrays
   
   if(strcmp(tracktype,"AliL3Track")==0) fTrackType='t';
   else if(strcmp(tracktype,"AliL3ConfMapTrack")==0) fTrackType='c';
@@ -46,117 +64,145 @@ AliL3Merger::AliL3Merger(Int_t ntrackarrays,Char_t *tracktype){
 
 }
 
-AliL3Merger::~AliL3Merger(){
-  //Destructor
-  DeleteArray();
-}
-
-void AliL3Merger::DeleteArray(){
+void AliL3Merger::DeleteArray()
+{
+  //delete arrays
   for(Int_t i=0; i<fNIn;i++)
-    delete fInTrack[i];
-  delete[] (Byte_t*) fInTrack;
-  delete fOutTrack;
+    {
+      if(!fInTrack[i]) continue;
+      delete fInTrack[i];
+      fInTrack[i]=0;
+    }
+  if(fInTrack)
+    delete[] fInTrack;
+  if(fOutTrack)
+    delete fOutTrack;
+  fInTrack=0;
+  fOutTrack=0;
 }
 
-void AliL3Merger::SetArray(Int_t nin){
+void AliL3Merger::SetArray(Int_t nin)
+{ 
+  //set arrays
+  DeleteArray();//Make sure arrays are cleaned 
+  
   fNIn = nin;
-  fInTrack = (AliL3TrackArray **) new Byte_t[fNIn*sizeof(AliL3TrackArray *)];
-  for(Int_t i=0; i<fNIn;i++){
-    if(fTrackType=='h')
-      fInTrack[i] = new AliL3TrackArray("AliL3HoughTrack");
-    else
-      fInTrack[i] = new AliL3TrackArray("AliL3Track");
-    
-  }
+  fInTrack = new AliL3TrackArray*[fNIn];
+  for(Int_t i=0; i<fNIn;i++)
+    {
+      if(fTrackType=='h')
+       fInTrack[i] = new AliL3TrackArray("AliL3HoughTrack");
+      else
+       fInTrack[i] = new AliL3TrackArray("AliL3Track");
+      
+    }
   if(fTrackType=='h')
     fOutTrack= new AliL3TrackArray("AliL3HoughTrack");
   else
     fOutTrack= new AliL3TrackArray("AliL3Track");
 }
 
-void AliL3Merger::Reset(){
-  for(Int_t i=0; i<fNIn;i++){
-    fInTrack[i]->Reset();
-  }
+void AliL3Merger::Reset()
+{ 
+  //reset
+  for(Int_t i=0; i<fNIn;i++)
+    {
+      fInTrack[i]->Reset();
+    }
   fOutTrack->Reset();
 }
 
-void AliL3Merger::FillTracks(Int_t ntracks, AliL3TrackSegmentData* tr){
+void AliL3Merger::FillTracks(Int_t ntracks, AliL3TrackSegmentData* tr)
+{
   //Read tracks from shared memory (or memory)
   AliL3TrackArray *destination = GetInTracks(fCurrentTracks);
   if(Is2Global())
     destination->FillTracks(ntracks, tr, fSlice);
-    //destination->FillTracks(ntracks, tr, fSlice, fTransformer);
   else
     destination->FillTracks(ntracks, tr);
 }
 
-void AliL3Merger::AddAllTracks(){
-  for(Int_t i=0; i<GetNIn();i++){
-    AliL3TrackArray *in = GetInTracks(i);
-    AliL3TrackArray *out = GetOutTracks();
-    out->AddTracks(in);
-  }
+void AliL3Merger::AddAllTracks()
+{ 
+  //add all tracks
+  for(Int_t i=0; i<GetNIn();i++)
+    {
+      AliL3TrackArray *in = GetInTracks(i);
+      AliL3TrackArray *out = GetOutTracks();
+      out->AddTracks(in);
+    }
 }
 
-void AliL3Merger::SortGlobalTracks(AliL3Track **tracks, Int_t ntrack){
+void AliL3Merger::SortGlobalTracks(AliL3Track **tracks, Int_t ntrack)
+{ 
+  //sort global tracks
   AliL3Track **tmp = new AliL3Track*[ntrack]; 
   for(Int_t i=0;i<ntrack;i++) tmp[i] = tracks[i];
   Int_t *t = new Int_t[ntrack];
   for(Int_t i=0;i<ntrack;i++) t[i]=-1;
-
-  for(Int_t j=0;j<ntrack;j++){
-    Double_t minr=300;
-    Int_t    mini=0;
-    for(Int_t i=0;i<ntrack;i++){
-     if(!tracks[i]) continue;
-       Double_t rr=pow(tracks[i]->GetFirstPointX(),2)+pow(tracks[i]->GetFirstPointY(),2);
-       Double_t r=sqrt(rr);
-       if(r<minr){
-         minr=r;
-         mini=i;
-       }
+  
+  for(Int_t j=0;j<ntrack;j++)
+    {
+      Double_t minr=300;
+      Int_t    mini=0;
+      for(Int_t i=0;i<ntrack;i++)
+       {
+         if(!tracks[i]) continue;
+         Double_t rr=pow(tracks[i]->GetFirstPointX(),2)+pow(tracks[i]->GetFirstPointY(),2);
+         Double_t r=sqrt(rr);
+         if(r<minr){
+           minr=r;
+           mini=i;
+         }
+       }
+      t[j]=mini;
+      tracks[mini]=0;
     }
-    t[j]=mini;
-    tracks[mini]=0;
-  }
   for(Int_t i=0;i<ntrack;i++) tracks[i] = tmp[t[i]];
   delete[] t;
   delete[] tmp;
 }
 
-
-void AliL3Merger::SortTracks(AliL3Track **tracks, Int_t ntrack){
+void AliL3Merger::SortTracks(AliL3Track **tracks, Int_t ntrack) const
+{ 
+  //sort tracks
   AliL3Track **tmp = new  AliL3Track*[ntrack];
   for(Int_t i=0;i<ntrack;i++) tmp[i] = tracks[i];
   Int_t *t = new Int_t[ntrack];
   for(Int_t i=0;i<ntrack;i++) t[i]=-1;
-
-  for(Int_t j=0;j<ntrack;j++){
-    Double_t minx=300; 
-    Int_t    mini=0;
-    for(Int_t i=0;i<ntrack;i++){
-     if(!tracks[i]) continue;
-       if(tracks[i]->GetFirstPointX()<minx){
-         minx=tracks[i]->GetFirstPointX();
-         mini=i;
-       }     
+  
+  for(Int_t j=0;j<ntrack;j++)
+    {
+      Double_t minx=300; 
+      Int_t    mini=0;
+      for(Int_t i=0;i<ntrack;i++)
+       {
+         if(!tracks[i]) continue;
+         if(tracks[i]->GetFirstPointX()<minx)
+           {
+             minx=tracks[i]->GetFirstPointX();
+             mini=i;
+           }     
+       }
+      t[j]=mini;  
+      tracks[mini]=0;
     }
-    t[j]=mini;  
-    tracks[mini]=0;
-  }
   for(Int_t i=0;i<ntrack;i++) tracks[i] = tmp[t[i]];
   delete[] t;
   delete[] tmp;
 }
 
-void AliL3Merger::AddTrack(AliL3TrackArray *mergedtrack,AliL3Track *track){
+void AliL3Merger::AddTrack(AliL3TrackArray *mergedtrack,AliL3Track *track)
+{ 
+  // add tracks
   AliL3Track *t[1];
   t[0] = track;
   MultiMerge(mergedtrack,t,1);
 }
 
-AliL3Track * AliL3Merger::MergeTracks(AliL3TrackArray *mergedtrack,AliL3Track *t0,AliL3Track *t1){
+AliL3Track * AliL3Merger::MergeTracks(AliL3TrackArray *mergedtrack,AliL3Track *t0,AliL3Track *t1)
+{ 
+  //merge tracks
   AliL3Track *t[2];
   t[0] = t0; 
   t[1] = t1;
@@ -164,31 +210,34 @@ AliL3Track * AliL3Merger::MergeTracks(AliL3TrackArray *mergedtrack,AliL3Track *t
   return MultiMerge(mergedtrack,t,2);
 }
 
-AliL3Track * AliL3Merger::MultiMerge(AliL3TrackArray *mergedtracks,AliL3Track **tracks, Int_t ntrack){
-// merge the tracks!!
-
-//check npoints
+AliL3Track * AliL3Merger::MultiMerge(AliL3TrackArray *mergedtracks,AliL3Track **tracks, Int_t ntrack)
+{
+  //multi merge the tracks
+  //check npoints
   Int_t nps = 0;
-  for(Int_t i=0;i<ntrack;i++){
-    nps+=tracks[i]->GetNHits();
-  }
-  if(nps>176){
-    LOG(AliL3Log::kWarning,"AliL3Merger::MultiMerge","Adding Points")
-    <<AliL3Log::kDec<<"Too many Points: "<<nps<<ENDLOG;
-    return 0;
-  }
-
+  for(Int_t i=0;i<ntrack;i++)
+    {
+      nps+=tracks[i]->GetNHits();
+    }
+  if(nps>AliL3Transform::GetNRows())
+    {
+      LOG(AliL3Log::kWarning,"AliL3Merger::MultiMerge","Adding Points")
+       <<AliL3Log::kDec<<"Too many Points: "<<nps<<ENDLOG;
+      return 0;
+    }
+  
   //create new track
   AliL3Track *newtrack = mergedtracks->NextTrack();
   //copy points
-  UInt_t nn[176];
+  UInt_t * nn = new UInt_t[AliL3Transform::GetNRows()];
   nps = 0;
-
-//  for(Int_t i=0;i<ntrack;i++){
-  for(Int_t i=ntrack-1;i>=0;i--){
-    memcpy(&nn[nps],tracks[i]->GetHitNumbers(),tracks[i]->GetNHits()*sizeof(UInt_t));
-    nps+=tracks[i]->GetNHits();
-  }
+  
+  //  for(Int_t i=0;i<ntrack;i++){
+  for(Int_t i=ntrack-1;i>=0;i--)
+    {
+      memcpy(&nn[nps],tracks[i]->GetHitNumbers(),tracks[i]->GetNHits()*sizeof(UInt_t));
+      nps+=tracks[i]->GetNHits();
+    }
   AliL3Track *tpf=tracks[0];
   AliL3Track *tpl=tracks[ntrack-1];
   AliL3Track *best = tpf;
@@ -203,10 +252,13 @@ AliL3Track * AliL3Merger::MultiMerge(AliL3TrackArray *mergedtracks,AliL3Track **
   newtrack->SetPsi(best->GetPsi());
   newtrack->SetTgl(best->GetTgl());
   newtrack->SetCharge(tpf->GetCharge());
+  delete [] nn;
   return newtrack;
 }
 
-void* AliL3Merger::GetNtuple(char *varlist){
+void* AliL3Merger::GetNtuple(char *varlist) const
+{ 
+  //get ntuple
 #ifdef use_root
   TNtuple* nt = new TNtuple("ntuple","ntuple",varlist);
   return (void*) nt;
@@ -215,17 +267,21 @@ void* AliL3Merger::GetNtuple(char *varlist){
 #endif
 }
 
-void* AliL3Merger::GetNtuple(){
+void* AliL3Merger::GetNtuple() const
+{ 
+  //get ntuple
 #ifdef use_root
   TNtuple* nt = new TNtuple("ntuple","ntuple",
-       "dx:dy:dz:dk:dpsi:dtgl:dq:disx:disy:disz:dis:n0:n1:diff:drx:dry:drz");
+                           "dx:dy:dz:dk:dpsi:dtgl:dq:disx:disy:disz:dis:n0:n1:diff:drx:dry:drz");
   return (void*) nt;
 #else
   return 0;
 #endif
 }
 
-Bool_t AliL3Merger::WriteNtuple(char *filename, void* nt){
+Bool_t AliL3Merger::WriteNtuple(char *filename, void* nt) const
+{ 
+  //write ntuple
 #ifdef use_root
   TNtuple *ntuple=(TNtuple *) nt;
   TFile *f = new TFile(filename,"RECREATE");
@@ -238,48 +294,60 @@ Bool_t AliL3Merger::WriteNtuple(char *filename, void* nt){
 #endif
 }
 
-void AliL3Merger::FillNtuple(void *nt,AliL3Track *innertrack,AliL3Track *outertrack){
+void AliL3Merger::FillNtuple(void *nt,AliL3Track *innertrack,AliL3Track *outertrack)
+{ 
+  //fill ntuple
   Float_t data[17];
-  if(outertrack->IsPoint()&&innertrack->IsPoint()){
-    data[0] =Float_t(innertrack->GetPointX()-outertrack->GetPointX());
-    data[1] =Float_t(innertrack->GetPointY()-outertrack->GetPointY());
-    data[2] =Float_t(innertrack->GetPointZ()-outertrack->GetPointZ());
-    data[3] =Float_t(innertrack->GetKappa()-outertrack->GetKappa());
-    Double_t psi= innertrack->GetPointPsi() - outertrack->GetPointPsi();
-    if(psi>PI) psi-=2*PI;
-    if(psi<-PI)psi+=2*PI;
-    data[4] =Float_t(psi);
-    data[5] =Float_t(innertrack->GetTgl()-outertrack->GetTgl());
-    data[6] =Float_t(innertrack->GetCharge()-outertrack->GetCharge());
-    data[7] =Float_t(innertrack->GetLastPointX()-outertrack->GetFirstPointX());
-    data[8] =Float_t(innertrack->GetLastPointY()-outertrack->GetFirstPointY());
-    data[9] =Float_t(innertrack->GetLastPointZ()-outertrack->GetFirstPointZ());
-    data[10] =sqrt(pow(data[7],2)+pow(data[8],2)+pow(data[9],2));
-    data[11]= outertrack->GetNHits();
-    data[12]= innertrack->GetNHits();
-    data[13] = Float_t(TrackDiff(innertrack,outertrack));
+  if(outertrack->IsPoint()&&innertrack->IsPoint())
+    {
+      data[0] =Float_t(innertrack->GetPointX()-outertrack->GetPointX());
+      data[1] =Float_t(innertrack->GetPointY()-outertrack->GetPointY());
+      data[2] =Float_t(innertrack->GetPointZ()-outertrack->GetPointZ());
+      data[3] =Float_t(innertrack->GetKappa()-outertrack->GetKappa());
+      Double_t psi= innertrack->GetPointPsi() - outertrack->GetPointPsi();
+      if(psi>AliL3Transform::Pi()) psi-=AliL3Transform::TwoPi();
+      else if(psi<-AliL3Transform::Pi()) psi+=AliL3Transform::TwoPi();
+      data[4] =Float_t(psi);
+      data[5] =Float_t(innertrack->GetTgl()-outertrack->GetTgl());
+      data[6] =Float_t(innertrack->GetCharge()-outertrack->GetCharge());
+      data[7] =Float_t(innertrack->GetLastPointX()-outertrack->GetFirstPointX());
+      data[8] =Float_t(innertrack->GetLastPointY()-outertrack->GetFirstPointY());
+      data[9] =Float_t(innertrack->GetLastPointZ()-outertrack->GetFirstPointZ());
+      data[10] =sqrt(pow(data[7],2)+pow(data[8],2)+pow(data[9],2));
+      data[11]= outertrack->GetNHits();
+      data[12]= innertrack->GetNHits();
+      data[13] = Float_t(TrackDiff(innertrack,outertrack));
+      data[14]=0;
+      data[15]=0;
+      data[16]=0;
 #ifdef use_root
-    TNtuple *ntuple = (TNtuple *) nt;
-    ntuple->Fill(data);
+      TNtuple *ntuple = (TNtuple *) nt;
+      ntuple->Fill(data);
 #endif
-  }
+    }
 }
 
-void AliL3Merger::FillNtuple(void *nt,Float_t *data){
+void AliL3Merger::FillNtuple(void *nt,Float_t *data) const
+{ 
+  //fill ntuple
 #ifdef use_root
-    TNtuple *ntuple = (TNtuple *) nt;
-    ntuple->Fill(data);
+  TNtuple *ntuple = (TNtuple *) nt;
+  ntuple->Fill(data);
 #endif
 }
 
-Double_t AliL3Merger::GetAngle(Double_t a1,Double_t a2){
-  Double_t da = a1 - a2 +4*PI;
-  da = fmod(da,2*PI);
-  if(da>PI) da = 2*PI -da;
+Double_t AliL3Merger::GetAngle(Double_t a1,Double_t a2)
+{ 
+  //get angle
+  Double_t da = a1 - a2 + 4*AliL3Transform::Pi();
+  da = fmod(da,AliL3Transform::TwoPi());
+  if(da>AliL3Transform::Pi()) da = AliL3Transform::TwoPi()-da;
   return da;
 }
 
-void AliL3Merger::SetParameter(Double_t maxy, Double_t maxz, Double_t maxkappa, Double_t maxpsi, Double_t maxtgl){
+void AliL3Merger::SetParameter(Double_t maxy, Double_t maxz, Double_t maxkappa, Double_t maxpsi, Double_t maxtgl)
+{ 
+  //set parameters for merger
   fMaxY = maxy;
   fMaxZ = maxz;
   fMaxKappa = maxkappa;
@@ -287,12 +355,13 @@ void AliL3Merger::SetParameter(Double_t maxy, Double_t maxz, Double_t maxkappa,
   fMaxTgl = maxtgl;
 }
 
-Bool_t AliL3Merger::IsTrack(AliL3Track *innertrack,AliL3Track *outertrack){
-
+Bool_t AliL3Merger::IsTrack(AliL3Track *innertrack,AliL3Track *outertrack)
+{
+  //is track to be merged
   if(innertrack->GetCharge()!=outertrack->GetCharge()) return kFALSE;
   if( (!innertrack->IsPoint()) || (!outertrack->IsPoint()) )  return kFALSE; 
-  if(innertrack->GetNHits()+outertrack->GetNHits()>176) return kFALSE;
-
+  if(innertrack->GetNHits()+outertrack->GetNHits()>AliL3Transform::GetNRows()) return kFALSE;
+  
   if(fabs(innertrack->GetPointY()-outertrack->GetPointY()) >fMaxY) return kFALSE;
   if(fabs(innertrack->GetPointZ()-outertrack->GetPointZ()) >fMaxZ) return kFALSE;
   if(fabs(innertrack->GetKappa()-outertrack->GetKappa())   >fMaxKappa) return kFALSE;
@@ -302,15 +371,19 @@ Bool_t AliL3Merger::IsTrack(AliL3Track *innertrack,AliL3Track *outertrack){
   return kTRUE;
 }
 
-Bool_t AliL3Merger::IsRTrack(AliL3Track *innertrack,AliL3Track *outertrack){
+Bool_t AliL3Merger::IsRTrack(AliL3Track *innertrack,AliL3Track *outertrack)
+{ 
+  //same as IsTrack
   return IsTrack(innertrack,outertrack);
 }
 
-Double_t AliL3Merger::TrackDiff(AliL3Track *innertrack,AliL3Track *outertrack){
+Double_t AliL3Merger::TrackDiff(AliL3Track *innertrack,AliL3Track *outertrack)
+{ 
+  //return track difference
   Double_t diff =-1;
   Double_t x[4],y[4],z[4],dy[4],dz[4];
   AliL3Track *tracks[2]; 
-
+  
   tracks[0] = innertrack;
   tracks[1] = outertrack;
   SortGlobalTracks(tracks,2);
@@ -321,7 +394,7 @@ Double_t AliL3Merger::TrackDiff(AliL3Track *innertrack,AliL3Track *outertrack){
   x[1] = innertrack->GetLastPointX();
   x[2] = outertrack->GetFirstPointX();
   x[3] = outertrack->GetLastPointX();
-
+  
   y[0] = innertrack->GetFirstPointY();
   y[1] = innertrack->GetLastPointY();
   y[2] = outertrack->GetFirstPointY();
@@ -360,74 +433,82 @@ Double_t AliL3Merger::TrackDiff(AliL3Track *innertrack,AliL3Track *outertrack){
 }
 
 void AliL3Merger::PrintDiff(AliL3Track *innertrack,AliL3Track *outertrack)
-{
-  if(!innertrack->IsPoint()||!outertrack->IsPoint()){
-    LOG(AliL3Log::kInformational,"AliL3Merger::PrintDiff","No Points")<<ENDLOG;
-    //cerr<<"AliL3Merger::PrintDiff: No Points"<<endl;
-    //cerr<<"---------------------------"<<endl;
-    return;
-  } 
-
+{ 
+  // print difference
+  if(!innertrack->IsPoint()||!outertrack->IsPoint())
+    {
+      LOG(AliL3Log::kInformational,"AliL3Merger::PrintDiff","No Points")<<ENDLOG;
+      //cerr<<"AliL3Merger::PrintDiff: No Points"<<endl;
+      //cerr<<"---------------------------"<<endl;
+      return;
+    } 
+  
   Double_t dx = innertrack->GetPointX()-outertrack->GetPointX();
   Double_t dy = innertrack->GetPointY()-outertrack->GetPointY();
   Double_t dz = innertrack->GetPointZ()-outertrack->GetPointZ();
   Double_t dk = innertrack->GetKappa()-outertrack->GetKappa();
   Double_t dpsi= innertrack->GetPointPsi() - outertrack->GetPointPsi();
-  if(dpsi>PI) dpsi-=2*PI;
-  if(dpsi<-PI)dpsi+=2*PI;
+  if(dpsi>AliL3Transform::Pi()) dpsi-=AliL3Transform::TwoPi();
+  else if(dpsi<-AliL3Transform::Pi())dpsi+=AliL3Transform::TwoPi();
   //Double_t dpsi = GetAngle(innertrack->GetPointPsi(),outertrack->GetPointPsi());
   Double_t dtgl= innertrack->GetTgl()-outertrack->GetTgl();
   Double_t dq =innertrack->GetCharge()-outertrack->GetCharge();
-
+  
   LOG(AliL3Log::kInformational,"AliL3Merger::PrintDiff","Points") <<"dx: "<<dx<<" dy: "<<dy<<" dz: "<<dz<<" dk: "<<dk<<" dpsi: "<<dpsi<<" dtgl: "<<dtgl<<" dq: "<<dq<<ENDLOG;
   //fprintf(stderr,"dx: %4f dy: %4f dz: %4f dk: %4f dpsi: %4f dtgl: %4f dq: %4f\n",dx,dy,dz,dk,dpsi,dtgl,dq);
   //cerr<<"---------------------------"<<endl;
   
 }
 
-void AliL3Merger::Print(){
+void AliL3Merger::Print()
+{
   // print some infos
-  for(Int_t i=0; i<fNIn; i++){
-    AliL3TrackArray *ttt= GetInTracks(i);
-    for(Int_t j =0;j<ttt->GetNTracks();j++){
-      AliL3Track *track=ttt->GetCheckedTrack(j);
-      if(!track) continue;
-      track->CalculateHelix();
-//      Double_t angle = atan2(track->GetLastPointY(),track->GetLastPointX());
-//      if(angle<0) angle+=PI;
-      if(track->CalculatePoint(135))
-//      if(!track->CalculateEdgePoint(angle)) cerr<<"**************"<<endl;     
-//      if(track->CalculatePoint(track->GetLastPointX()))
-//      if(track->CalculatePoint(0))
-      {
-//      PrintTrack(track);
-//      track->CalculateReferencePoint(PI/180.);
-      track->CalculateReferencePoint(0.001);
-      Float_t dx=(float)track->GetPointX()-track->GetPointX();
-      Float_t dy=(float)track->GetPointY()-track->GetPointY();
-      Float_t dz=(float)track->GetPointZ()-track->GetPointZ();
-      LOG(AliL3Log::kInformational,"AliL3Merger::Print","RefPoint") <<"npt: "<<track->GetNHits()<<" dx: "<<dx<<" dy: "<<dy<<" dz: "<<dz<<ENDLOG;
-
-      //fprintf(stderr,"npt: %3d dx: %8.5f dy: %8.5f dz: %8.5f\n",track->GetNHits(),dx,dy,dz);
-      //cerr<<"---------------------------"<<endl;
-      }
-    }  
-  }
+  for(Int_t i=0; i<fNIn; i++)
+    {
+      AliL3TrackArray *ttt= GetInTracks(i);
+      for(Int_t j =0;j<ttt->GetNTracks();j++)
+       {
+         AliL3Track *track=ttt->GetCheckedTrack(j);
+         if(!track) continue;
+         track->CalculateHelix();
+         //      Double_t angle = atan2(track->GetLastPointY(),track->GetLastPointX());
+         //      if(angle<0) angle+=AliL3Transform::Pi();
+         if(track->CalculatePoint(135))
+           //      if(!track->CalculateEdgePoint(angle)) cerr<<"**************"<<endl;     
+           //      if(track->CalculatePoint(track->GetLastPointX()))
+           //      if(track->CalculatePoint(0))
+           {
+             //      PrintTrack(track);
+             //      track->CalculateReferencePoint(AliL3Transform::Pi()/180.);
+             track->CalculateReferencePoint(0.001);
+             Float_t dx=(float)track->GetPointX()-track->GetPointX();
+             Float_t dy=(float)track->GetPointY()-track->GetPointY();
+             Float_t dz=(float)track->GetPointZ()-track->GetPointZ();
+             LOG(AliL3Log::kInformational,"AliL3Merger::Print","RefPoint") <<"npt: "<<track->GetNHits()<<" dx: "<<dx<<" dy: "<<dy<<" dz: "<<dz<<ENDLOG;
+             
+             //fprintf(stderr,"npt: %3d dx: %8.5f dy: %8.5f dz: %8.5f\n",track->GetNHits(),dx,dy,dz);
+             //cerr<<"---------------------------"<<endl;
+           }
+       }  
+    }
 }
 
-void AliL3Merger::PrintTrack(AliL3Track *track){
+void AliL3Merger::PrintTrack(AliL3Track *track)
+{ 
+  //print track info
   fprintf(stderr,"npt: %3d pt: %.2f psi: %.2f tgl: %5.2f q: %2d\n",
-    track->GetNHits(),track->GetPt(),track->GetPsi(),
-    track->GetTgl(),track->GetCharge());
+         track->GetNHits(),track->GetPt(),track->GetPsi(),
+         track->GetTgl(),track->GetCharge());
   fprintf(stderr,
-    "x1: %6.2f y1: %6.2f z1: %6.2f xl: %6.2f yl: %6.2f zl: %6.2f\n",
-    track->GetFirstPointX(),track->GetFirstPointY(),track->GetFirstPointZ(),
-    track->GetLastPointX(),track->GetLastPointY(),track->GetLastPointZ());
-  if(track->IsPoint()){
-    fprintf(stderr,
-      "R: %.2f Xc: %.2f Yc: %.2f Xp: %.2f Yp: %.2f Zp: %.2f Psip: %.2f\n",
-      track->GetRadius(),track->GetCenterX(),track->GetCenterY(),
-      track->GetPointX(),track->GetPointY(),track->GetPointZ(),
-      track->GetPointPsi());
-  }
+         "x1: %6.2f y1: %6.2f z1: %6.2f xl: %6.2f yl: %6.2f zl: %6.2f\n",
+         track->GetFirstPointX(),track->GetFirstPointY(),track->GetFirstPointZ(),
+         track->GetLastPointX(),track->GetLastPointY(),track->GetLastPointZ());
+  if(track->IsPoint())
+    {
+      fprintf(stderr,
+             "R: %.2f Xc: %.2f Yc: %.2f Xp: %.2f Yp: %.2f Zp: %.2f Psip: %.2f\n",
+             track->GetRadius(),track->GetCenterX(),track->GetCenterY(),
+             track->GetPointX(),track->GetPointY(),track->GetPointZ(),
+             track->GetPointPsi());
+    }
 }