Minor bugfix

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

diff --git a/HLT/hough/AliL3HoughTransformerLUT.cxx b/HLT/hough/AliL3HoughTransformerLUT.cxx
index 1c218e523697d27fbe46577f783674fe8b4c72c2..e05273e9b78991186ad1f8dadbd1163590c33e18 100644 (file)
--- a/HLT/hough/AliL3HoughTransformerLUT.cxx
+++ b/HLT/hough/AliL3HoughTransformerLUT.cxx
@@ -47,6 +47,10 @@ AliL3HoughTransformerLUT::AliL3HoughTransformerLUT() : AliL3HoughBaseTransformer
   fLUTphi0=0;
   fLUT2sinphi0=0;
   fLUT2cosphi0=0;
   fLUTphi0=0;
   fLUT2sinphi0=0;
   fLUT2cosphi0=0;

+  fLUTKappa=0;
+  
+  fLastPad=0;
+  fLastIndex=0;

 }
 
 AliL3HoughTransformerLUT::AliL3HoughTransformerLUT(Int_t slice,Int_t patch,Int_t n_eta_segments) : AliL3HoughBaseTransformer(slice,patch,n_eta_segments)
 }
 
 AliL3HoughTransformerLUT::AliL3HoughTransformerLUT(Int_t slice,Int_t patch,Int_t n_eta_segments) : AliL3HoughBaseTransformer(slice,patch,n_eta_segments)


@@ -71,6 +75,10 @@ AliL3HoughTransformerLUT::AliL3HoughTransformerLUT(Int_t slice,Int_t patch,Int_t
   fLUTphi0=0;
   fLUT2sinphi0=0;
   fLUT2cosphi0=0;
   fLUTphi0=0;
   fLUT2sinphi0=0;
   fLUT2cosphi0=0;

+  fLUTKappa=0;
+
+  fLastPad=0;
+  fLastIndex=0;

 
   Init(slice,patch,n_eta_segments);
 }
 
   Init(slice,patch,n_eta_segments);
 }


@@ -80,6 +88,7 @@ AliL3HoughTransformerLUT::~AliL3HoughTransformerLUT()
   DeleteHistograms();
 
 #ifdef do_mc
   DeleteHistograms();
 
 #ifdef do_mc

+#if 0

   if(fTrackID)
     {
       for(Int_t i=0; i<fNEtas; i++)
   if(fTrackID)
     {
       for(Int_t i=0; i<fNEtas; i++)


@@ -89,6 +98,7 @@ AliL3HoughTransformerLUT::~AliL3HoughTransformerLUT()
        }
       delete [] fTrackID;
     }
        }
       delete [] fTrackID;
     }

+#endif

 #endif
 
   if(fNRows){
 #endif
 
   if(fNRows){


@@ -109,10 +119,12 @@ void AliL3HoughTransformerLUT::DeleteHistograms()
     delete[] fLUT2sinphi0;
     delete[] fLUT2cosphi0;
     delete[] fLUTphi0;
     delete[] fLUT2sinphi0;
     delete[] fLUT2cosphi0;
     delete[] fLUTphi0;

+    delete[] fLUTKappa;

     fNPhi0=0;
     fLUTphi0=0;
     fLUT2sinphi0=0;
     fLUT2cosphi0=0;
     fNPhi0=0;
     fLUTphi0=0;
     fLUT2sinphi0=0;
     fLUT2cosphi0=0;

+    fLUTKappa=0;

   }
 
   if(!fParamSpace){
   }
 
   if(!fParamSpace){


@@ -214,12 +226,16 @@ void AliL3HoughTransformerLUT::CreateHistograms(Int_t nxbin,Double_t xmin,Double
 #ifdef do_mc
   if(fDoMC)
     {
 #ifdef do_mc
   if(fDoMC)
     {

+      cerr << "Did not program changes in AliL3TransformerLUT for DO_MC!" << endl;
+      exit(1);
+#if 0

       AliL3Histogram *hist = fParamSpace[0];
       Int_t ncells = (hist->GetNbinsX()+2)*(hist->GetNbinsY()+2);
       cout<<"Allocating "<<fNEtas*ncells*sizeof(TrackIndex)<<" bytes to fTrackID"<<endl;
       fTrackID = new TrackIndex*[fNEtas];
       for(Int_t i=0; i<fNEtas; i++)
        fTrackID[i] = new TrackIndex[ncells];
       AliL3Histogram *hist = fParamSpace[0];
       Int_t ncells = (hist->GetNbinsX()+2)*(hist->GetNbinsY()+2);
       cout<<"Allocating "<<fNEtas*ncells*sizeof(TrackIndex)<<" bytes to fTrackID"<<endl;
       fTrackID = new TrackIndex*[fNEtas];
       for(Int_t i=0; i<fNEtas; i++)
        fTrackID[i] = new TrackIndex[ncells];

+#endif

     }
 #endif
 
     }
 #endif
 


@@ -229,6 +245,7 @@ void AliL3HoughTransformerLUT::CreateHistograms(Int_t nxbin,Double_t xmin,Double
   fLUTphi0=new Float_t[fNPhi0];
   fLUT2sinphi0=new Float_t[fNPhi0];
   fLUT2cosphi0=new Float_t[fNPhi0];
   fLUTphi0=new Float_t[fNPhi0];
   fLUT2sinphi0=new Float_t[fNPhi0];
   fLUT2cosphi0=new Float_t[fNPhi0];

+  fLUTKappa=new Float_t[fNPhi0];

   Float_t diff=(ymax-ymin)/nybin;
   Float_t phi0=ymin-0.5*diff;
   for(Int_t i=0; i<fNPhi0; i++){
   Float_t diff=(ymax-ymin)/nybin;
   Float_t phi0=ymin-0.5*diff;
   for(Int_t i=0; i<fNPhi0; i++){


@@ -236,6 +253,7 @@ void AliL3HoughTransformerLUT::CreateHistograms(Int_t nxbin,Double_t xmin,Double
     fLUTphi0[i]=phi0;
     fLUT2sinphi0[i]=2.*sin(phi0);
     fLUT2cosphi0[i]=2.*cos(phi0);
     fLUTphi0[i]=phi0;
     fLUT2sinphi0[i]=2.*sin(phi0);
     fLUT2cosphi0[i]=2.*cos(phi0);

+    fLUTKappa[i]=0.;

     //cout << i << ": " << fLUTphi0[i] << " " << fLUT2sinphi0[i] << " " << fLUT2cosphi0[i] << endl;
   }  
 }
     //cout << i << ": " << fLUTphi0[i] << " " << fLUT2sinphi0[i] << " " << fLUT2cosphi0[i] << endl;
   }  
 }


@@ -256,10 +274,14 @@ void AliL3HoughTransformerLUT::Reset()
 #ifdef do_mc
   if(fDoMC)
     {
 #ifdef do_mc
   if(fDoMC)
     {

+      cerr << "Did not program changes in AliL3TransformerLUT for DO_MC!" << endl;
+      exit(1);
+#if 0

       AliL3Histogram *hist = fParamSpace[0];
       Int_t ncells = (hist->GetNbinsX()+2)*(hist->GetNbinsY()+2);
       for(Int_t i=0; i<fNEtas; i++)
        memset(fTrackID[i],0,ncells*sizeof(TrackIndex));
       AliL3Histogram *hist = fParamSpace[0];
       Int_t ncells = (hist->GetNbinsX()+2)*(hist->GetNbinsY()+2);
       for(Int_t i=0; i<fNEtas; i++)
        memset(fTrackID[i],0,ncells*sizeof(TrackIndex));

+#endif

     }
 #endif
 }
     }
 #endif
 }


@@ -272,13 +294,23 @@ Int_t AliL3HoughTransformerLUT::GetEtaIndex(Double_t eta)
   return FindIndex(rz2);
 }
 
   return FindIndex(rz2);
 }
 

-Int_t AliL3HoughTransformerLUT::FindIndex(Float_t rz2)
+Int_t AliL3HoughTransformerLUT::FindIndex(Float_t rz2, Int_t start)

 {
 {

-  Int_t index=0; //could improve search through devide and conquere strategy
-  while((index<fNEtas)&&(rz2<=fLUTEta[index])){
+  //could improve search through devide and conquere strategy
+  
+  Int_t index=start; 
+  if(index==-100){
+    index=0;
+    while((index<fNEtas)&&(rz2<=fLUTEta[index])){
+      index++;
+    }
+  } else {
+    while((index>=0)&&(rz2>fLUTEta[index])){
+      index--;
+    }

     index++;
     index++;

-    //cout << index << ": " << rz2 << " " << fLUTEta[index] << endl;

   }
   }

+  //cout << start << " - " << index << ": " << rz2 << " " << fLUTEta[index] << endl;

   return index;
 }
 
   return index;
 }
 


@@ -373,6 +405,14 @@ void AliL3HoughTransformerLUT::TransformCircle()
          continue;
        }
 
          continue;
        }
 

+      //calculate x for this row
+      Float_t x = CalcX(row);
+      Float_t x2=x*x;
+      Float_t r2=0;
+
+      //start a new row
+      fLastPad=-1;
+

       //Loop over the data on this padrow:
       for(UInt_t j=0; j<tempPt->fNDigit; j++)
        {
       //Loop over the data on this padrow:
       for(UInt_t j=0; j<tempPt->fNDigit; j++)
        {


@@ -385,37 +425,50 @@ void AliL3HoughTransformerLUT::TransformCircle()
          UChar_t pad = digPt[j].fPad;
          UShort_t time = digPt[j].fTime;
 
          UChar_t pad = digPt[j].fPad;
          UShort_t time = digPt[j].fTime;
 

-         Float_t x = CalcX(row);
-         Float_t y = CalcY(pad,row);
-         Float_t z = CalcZ(time);
+         if(fLastPad!=pad){ //only update if necessary
+           fLastIndex=fNEtas-1;   
+  
+           //calculate hough for this pad
+           Float_t y = CalcY(pad,row);
+           Float_t y2 = y*y;
+           r2 = x2 + y2;
+           Float_t R2 = 1. / r2;
+           for(Int_t b=0; b<fNPhi0; b++)
+             fLUTKappa[b]=R2*(y*fLUT2cosphi0[b]-x*fLUT2sinphi0[b]);
+
+           fLastPad=pad;
+         }

 
          //find eta slice
 
          //find eta slice

-         Float_t rz2 = 1 + (x*x+y*y)/(z*z);
-         Int_t eta_index = FindIndex(rz2);
-
+         Float_t z = CalcZ(time);
+         Float_t z2=z*z;
+         Float_t rz2 = 1 + r2/z2;
+         Int_t eta_index = FindIndex(rz2,fLastIndex);
+         //cout << row << " " << (int)pad << " " << (int)time << " " << eta_index <<" " <<fLastIndex<< endl;

          if(eta_index < 0 || eta_index >= fNEtas){
            //LOG(AliL3Log::kWarning,"AliL3HoughTransformerLUT::TransformCircle","Histograms")<<"No histograms corresponding to eta index value of "<<eta_index<<"."<<ENDLOG;
            continue;
          }       
          if(eta_index < 0 || eta_index >= fNEtas){
            //LOG(AliL3Log::kWarning,"AliL3HoughTransformerLUT::TransformCircle","Histograms")<<"No histograms corresponding to eta index value of "<<eta_index<<"."<<ENDLOG;
            continue;
          }       

-

          //Get the correct histogrampointer:
          AliL3Histogram *hist = fParamSpace[eta_index];
          if(!hist){
            //LOG(AliL3Log::kWarning,"AliL3HoughTransformerLUT::TransformCircle","Histograms")<<"Error getting histogram in index "<<eta_index<<"."<<ENDLOG;
            continue;
          }
          //Get the correct histogrampointer:
          AliL3Histogram *hist = fParamSpace[eta_index];
          if(!hist){
            //LOG(AliL3Log::kWarning,"AliL3HoughTransformerLUT::TransformCircle","Histograms")<<"Error getting histogram in index "<<eta_index<<"."<<ENDLOG;
            continue;
          }

+         fLastIndex=eta_index;

 
          //Fill the histogram along the phirange
 
          //Fill the histogram along the phirange

-         Float_t R2=1/(x*x+y*y);

          for(Int_t b=0; b<fNPhi0; b++){
          for(Int_t b=0; b<fNPhi0; b++){

-           Float_t kappa=R2*(y*fLUT2cosphi0[b]-x*fLUT2sinphi0[b]);
-
-           hist->Fill(kappa,fLUTphi0[b],charge);
+           hist->Fill(fLUTKappa[b],fLUTphi0[b],charge);
+           //hist->Fill(fLUTKappa[b],fLUTphi0[b],1);

            //cout << kappa << " " << fLUTphi0[b] << " " << charge << endl;
 
 #ifdef do_mcc
            if(fDoMC)
              {
            //cout << kappa << " " << fLUTphi0[b] << " " << charge << endl;
 
 #ifdef do_mcc
            if(fDoMC)
              {

+               cerr << "Did not program changes in AliL3TransformerLUT for DO_MC!" << endl;
+               exit(1);
+#if 0

                Int_t bin = hist->FindBin(kappa,phi0);
                for(Int_t t=0; t<3; t++)
                  {
                Int_t bin = hist->FindBin(kappa,phi0);
                for(Int_t t=0; t<3; t++)
                  {


@@ -429,10 +482,12 @@ void AliL3HoughTransformerLUT::TransformCircle()
                    fTrackID[eta_index][bin].fLabel[c] = label;
                    fTrackID[eta_index][bin].fNHits[c]++;
                  }
                    fTrackID[eta_index][bin].fLabel[c] = label;
                    fTrackID[eta_index][bin].fNHits[c]++;
                  }

+#endif

              }
 #endif
          }
        }
              }
 #endif
          }
        }

+      

       //Move the data pointer to the next padrow:
       AliL3MemHandler::UpdateRowPointer(tempPt);
     }
       //Move the data pointer to the next padrow:
       AliL3MemHandler::UpdateRowPointer(tempPt);
     }


@@ -447,6 +502,9 @@ Int_t AliL3HoughTransformerLUT::GetTrackID(Int_t eta_index,Double_t kappa,Double
     }
   
 #ifdef do_mcc
     }
   
 #ifdef do_mcc

+  cerr << "Did not program changes in AliL3TransformerLUT for DO_MC!" << endl;
+  exit(1);
+#if 0

   if(eta_index < 0 || eta_index > fNEtas)
     {
       cerr<<"AliL3HoughTransformer::GetTrackID : Wrong etaindex "<<eta_index<<endl;
   if(eta_index < 0 || eta_index > fNEtas)
     {
       cerr<<"AliL3HoughTransformer::GetTrackID : Wrong etaindex "<<eta_index<<endl;


@@ -467,6 +525,7 @@ Int_t AliL3HoughTransformerLUT::GetTrackID(Int_t eta_index,Double_t kappa,Double
        }
     }
   return label;
        }
     }
   return label;

+#endif

 #endif
   cout<<"AliL3HoughTransformer::GetTrackID : Compile with do_mc flag!"<<endl;
   return -1;
 #endif
   cout<<"AliL3HoughTransformer::GetTrackID : Compile with do_mc flag!"<<endl;
   return -1;