X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSclustererV2.cxx;h=77c3531a210524032cff671ed71ba435846230a8;hb=f8a2761159cb718b2c423f24f9af1af36c46cbad;hp=10113e21a0ea29531fa6dd6ff743a3d9d0a5b45a;hpb=90616ce2469d1b48be47387618d716877f15e5de;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSclustererV2.cxx b/ITS/AliITSclustererV2.cxx
index 10113e21a0e..77c3531a210 100644
--- a/ITS/AliITSclustererV2.cxx
+++ b/ITS/AliITSclustererV2.cxx
@@ -2,9 +2,13 @@
 //            Implementation of the ITS clusterer V2 class
 //
 //          Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch
+// This class is no longer used for ITS recosntruction:
+// it has been replaced by the AliITSClusterFinderV2SXD classes
+// It is still used as mother class by HLT reconstruction
 //-------------------------------------------------------------------------
 
 
+#include "AliLoader.h"
 #include "AliRun.h"
 
 #include "AliITSclustererV2.h"
@@ -54,10 +58,8 @@ fHlSSD(0),
 fTanP(0),
 fTanN(0){
    //default constructor
-  for(Int_t i=0;i<260;i++){
-    fYSPD[i]=0.;
-    fZSPD[i]=0.;
-  }
+  for(Int_t i=0;i<260;i++)fYSPD[i]=0.;
+  for(Int_t i=0;i<170;i++)fZSPD[i]=0.;
   for(Int_t i=0;i<2200;i++){
     fYshift[i]=0.;
     fZshift[i]=0.;
@@ -1492,9 +1494,9 @@ FindClustersSSD(const TClonesArray *alldigits, TClonesArray *clusters) {
   Int_t smax = digits->GetEntriesFast();
   if (smax==0) return;
   
-  const Int_t MAX=1000;
+  const Int_t mMAX=1000;
   Int_t np=0, nn=0; 
-  Ali1Dcluster pos[MAX], neg[MAX];
+  Ali1Dcluster pos[mMAX], neg[mMAX];
   Float_t y=0., q=0., qmax=0.; 
   Int_t lab[4]={-2,-2,-2,-2};
   
@@ -1529,7 +1531,7 @@ FindClustersSSD(const TClonesArray *alldigits, TClonesArray *clusters) {
 	   c[*n].SetY(y/q-0.3*nd);
 	   c[*n].SetQ(0.5*q);
 	   (*n)++;
-	   if (*n==MAX) {
+	   if (*n==mMAX) {
 	     Error("FindClustersSSD","Too many 1D clusters !");
               return;
 	   }
@@ -1537,7 +1539,7 @@ FindClustersSSD(const TClonesArray *alldigits, TClonesArray *clusters) {
 	   c[*n].SetQ(0.5*q);
 	   c[*n].SetNd(nd);
 	   (*n)++;
-	   if (*n==MAX) {
+	   if (*n==mMAX) {
 	     Error("FindClustersSSD","Too many 1D clusters !");
               return;
 	   }
@@ -1553,7 +1555,7 @@ FindClustersSSD(const TClonesArray *alldigits, TClonesArray *clusters) {
 	   c[*n].SetY(y/q-0.25*nd);
 	   c[*n].SetQ(0.5*q);
 	   (*n)++;
-	   if (*n==MAX) {
+	   if (*n==mMAX) {
 	     Error("FindClustersSSD","Too many 1D clusters !");
 	     return;
 	   }
@@ -1563,7 +1565,7 @@ FindClustersSSD(const TClonesArray *alldigits, TClonesArray *clusters) {
 	   c[*n].SetLabels(milab);
 	 }	 
          (*n)++;
-         if (*n==MAX) {
+         if (*n==mMAX) {
           Error("FindClustersSSD","Too many 1D clusters !");
           return;
          }
@@ -1599,7 +1601,7 @@ FindClustersSSD(const TClonesArray *alldigits, TClonesArray *clusters) {
      c[*n].SetY(y/q-0.25*nd);
      c[*n].SetQ(0.5*q);
      (*n)++;
-     if (*n==MAX) {
+     if (*n==mMAX) {
         Error("FindClustersSSD","Too many 1D clusters !");
         return;
      }
@@ -1609,7 +1611,7 @@ FindClustersSSD(const TClonesArray *alldigits, TClonesArray *clusters) {
      c[*n].SetLabels(lab);
   }
   (*n)++;
-  if (*n==MAX) {
+  if (*n==mMAX) {
      Error("FindClustersSSD","Too many 1D clusters !");
      return;
   }
@@ -1624,8 +1626,8 @@ void AliITSclustererV2::FindClustersSSD(AliITSRawStream* input,
   // Actual SSD cluster finder for raw data
   //------------------------------------------------------------
   Int_t nClustersSSD = 0;
-  const Int_t MAX = 1000;
-  Ali1Dcluster clusters1D[2][MAX];
+  const Int_t mMAX = 1000;
+  Ali1Dcluster clusters1D[2][mMAX];
   Int_t nClusters[2] = {0, 0};
   Int_t lab[3]={-2,-2,-2};
   Float_t q = 0.;
@@ -1646,7 +1648,7 @@ void AliITSclustererV2::FindClustersSSD(AliITSRawStream* input,
     if ((!next || (input->GetModuleID() != prevModule)||
 	 (strip-prevStrip > 1) || (flag != prevFlag)) &&
 	(nDigits > 0)) {
-      if (nClusters[prevFlag] == MAX) {
+      if (nClusters[prevFlag] == mMAX) {
 	Error("FindClustersSSD", "Too many 1D clusters !");
 	return;
       }
@@ -1660,7 +1662,7 @@ void AliITSclustererV2::FindClustersSSD(AliITSRawStream* input,
       if (nDigits > 4&&nDigits < 25) {
 	cluster.SetY(y/q - 0.25*nDigits);
         cluster.SetQ(0.5*q);
-	if (nClusters[prevFlag] == MAX) {
+	if (nClusters[prevFlag] == mMAX) {
 	  Error("FindClustersSSD", "Too many 1D clusters !");
 	  return;
 	}