]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSClusterFinderV2SSD.cxx
Removed obsolete and no longer maintained cluster finders
[u/mrichter/AliRoot.git] / ITS / AliITSClusterFinderV2SSD.cxx
index 329f8f898730baac792dd3ad9d0eab3def73af35..f01a6ea2afd30f5902a27fd5bf311f19e1c4752f 100644 (file)
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-2003, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 2007-2009, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
+
+/* $Id$ */
+
 ////////////////////////////////////////////////////////////////////////////
 //            Implementation of the ITS clusterer V2 class                //
 //                                                                        //
 //          Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch            //
+//          Revised: Enrico Fragiacomo, enrico.fragiacomo@ts.infn.it      //
+//          Revised 23/06/08: Marco Bregant
 //                                                                        //
 ///////////////////////////////////////////////////////////////////////////
 
+#include <Riostream.h>
+
 
 #include "AliITSClusterFinderV2SSD.h"
 #include "AliITSRecPoint.h"
 #include "AliITSRawStreamSSD.h"
 #include <TClonesArray.h>
 #include "AliITSdigitSSD.h"
+#include "AliITSReconstructor.h"
+#include "AliITSCalibrationSSD.h"
+#include "AliITSsegmentationSSD.h"
 
-ClassImp(AliITSClusterFinderV2SSD)
+Short_t *AliITSClusterFinderV2SSD::fgPairs = 0x0;
+Int_t    AliITSClusterFinderV2SSD::fgPairsSize = 0;
 
+ClassImp(AliITSClusterFinderV2SSD)
 
-AliITSClusterFinderV2SSD::AliITSClusterFinderV2SSD(AliITSDetTypeRec* dettyp):AliITSClusterFinderV2(dettyp),
-fLastSSD1(AliITSgeomTGeo::GetModuleIndex(6,1,1)-1),
-fYpitchSSD(0.0095),
-fHwSSD(3.65),
-fHlSSD(2.00),
-fTanP(0.0275),
-fTanN(0.0075){
 
-  //Default constructor
+AliITSClusterFinderV2SSD::AliITSClusterFinderV2SSD(AliITSDetTypeRec* dettyp):AliITSClusterFinder(dettyp),
+fLastSSD1(AliITSgeomTGeo::GetModuleIndex(6,1,1)-1)
+{
+//Default constructor
 
 }
  
+//______________________________________________________________________
+AliITSClusterFinderV2SSD::AliITSClusterFinderV2SSD(const AliITSClusterFinderV2SSD &cf) : AliITSClusterFinder(cf),                                              fLastSSD1(cf.fLastSSD1)
+{
+  // Copy constructor
+}
+
+//______________________________________________________________________
+AliITSClusterFinderV2SSD& AliITSClusterFinderV2SSD::operator=(const AliITSClusterFinderV2SSD&  cf ){
+  // Assignment operator
+
+  this->~AliITSClusterFinderV2SSD();
+  new(this) AliITSClusterFinderV2SSD(cf);
+  return *this;
+}
+
 
 void AliITSClusterFinderV2SSD::FindRawClusters(Int_t mod){
 
@@ -57,17 +80,39 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
   //------------------------------------------------------------
   // Actual SSD cluster finder
   //------------------------------------------------------------
+
+  static AliITSRecoParam *repa = NULL;
+  
+  
+  if(!repa){
+    repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
+    if(!repa){
+      repa = AliITSRecoParam::GetHighFluxParam();
+      AliWarning("Using default AliITSRecoParam class");
+    }
+  }
+
+  AliITSCalibrationSSD* cal = (AliITSCalibrationSSD*)GetResp(fModule);
+  Float_t gain=0;
+
   Int_t smaxall=alldigits->GetEntriesFast();
   if (smaxall==0) return;
-  TObjArray *digits = new TObjArray;
+  //  TObjArray *digits = new TObjArray;
+  TObjArray digits;
   for (Int_t i=0;i<smaxall; i++){
     AliITSdigitSSD *d=(AliITSdigitSSD*)alldigits->UncheckedAt(i);
-    Float_t q=d->GetSignal()/4.29;// temp. fix (for PID purposed - normalis. to be checked)
+
+    if(d->IsSideP()) gain = cal->GetGainP(d->GetStripNumber());  
+    else gain = cal->GetGainN(d->GetStripNumber());
+
+    Float_t q=gain*d->GetSignal(); // calibration brings mip peaks around 120 (in ADC units)
+    q=cal->ADCToKeV(q); // converts the charge in KeV from ADC units
     d->SetSignal(Int_t(q));
+
     if (d->GetSignal()<3) continue;
-    digits->AddLast(d);
+    digits.AddLast(d);
   }
-  Int_t smax = digits->GetEntriesFast();
+  Int_t smax = digits.GetEntriesFast();
   if (smax==0) return;
   
   const Int_t kMax=1000;
@@ -76,7 +121,7 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
   Float_t y=0., q=0., qmax=0.; 
   Int_t lab[4]={-2,-2,-2,-2};
   
-  AliITSdigitSSD *d=(AliITSdigitSSD*)digits->UncheckedAt(0);
+  AliITSdigitSSD *d=(AliITSdigitSSD*)digits.UncheckedAt(0);
   q += d->GetSignal();
   y += d->GetCoord2()*d->GetSignal();
   qmax=d->GetSignal();
@@ -93,7 +138,7 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
   milab[0]=d->GetTrack(0); milab[1]=d->GetTrack(1); milab[2]=d->GetTrack(2);
 
   for (Int_t s=1; s<smax; s++) {
-      d=(AliITSdigitSSD*)digits->UncheckedAt(s);      
+      d=(AliITSdigitSSD*)digits.UncheckedAt(s);      
       Int_t strip=d->GetCoord2();
       if ((strip-curr) > 1 || flag!=d->GetCoord1()) {
          c[*n].SetY(y/q);
@@ -101,45 +146,26 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
          c[*n].SetNd(nd);
         CheckLabels2(milab);
          c[*n].SetLabels(milab);
-         //Split suspiciously big cluster
-        /*
-        if (nd>10&&nd<16){
-          c[*n].SetY(y/q-0.3*nd);
-          c[*n].SetQ(0.5*q);
-          (*n)++;
-          if (*n==MAX) {
-            Error("FindClustersSSD","Too many 1D clusters !");
-              return;
-          }
-          c[*n].SetY(y/q-0.0*nd);
-          c[*n].SetQ(0.5*q);
-          c[*n].SetNd(nd);
-          (*n)++;
-          if (*n==MAX) {
-            Error("FindClustersSSD","Too many 1D clusters !");
-              return;
-          }
-          //
-          c[*n].SetY(y/q+0.3*nd);
-          c[*n].SetQ(0.5*q);
-          c[*n].SetNd(nd);
-          c[*n].SetLabels(milab);
-        }
-        else{
-        */
-        if (nd>4&&nd<25) {
-          c[*n].SetY(y/q-0.25*nd);
-          c[*n].SetQ(0.5*q);
-          (*n)++;
-          if (*n==kMax) {
-            Error("FindClustersSSD","Too many 1D clusters !");
-            return;
-          }
-          c[*n].SetY(y/q+0.25*nd);
-          c[*n].SetQ(0.5*q);
-          c[*n].SetNd(nd);
-          c[*n].SetLabels(milab);
-        }       
+
+        if(repa->GetUseUnfoldingInClusterFinderSSD()==kTRUE) {
+          
+          //Split suspiciously big cluster
+          if (nd>4&&nd<25) {
+            c[*n].SetY(y/q-0.25*nd);
+            c[*n].SetQ(0.5*q);
+            (*n)++;
+            if (*n==kMax) {
+              Error("FindClustersSSD","Too many 1D clusters !");
+              return;
+            }
+            c[*n].SetY(y/q+0.25*nd);
+            c[*n].SetQ(0.5*q);
+            c[*n].SetNd(nd);
+            c[*n].SetLabels(milab);
+          }     
+          
+        } // unfolding is on
+
          (*n)++;
          if (*n==kMax) {
           Error("FindClustersSSD","Too many 1D clusters !");
@@ -172,20 +198,25 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
   c[*n].SetQ(q);
   c[*n].SetNd(nd);
   c[*n].SetLabels(lab);
-  //Split suspiciously big cluster
-  if (nd>4 && nd<25) {
-     c[*n].SetY(y/q-0.25*nd);
-     c[*n].SetQ(0.5*q);
-     (*n)++;
-     if (*n==kMax) {
+
+  if(repa->GetUseUnfoldingInClusterFinderSSD()==kTRUE) {
+    
+    //Split suspiciously big cluster
+    if (nd>4 && nd<25) {
+      c[*n].SetY(y/q-0.25*nd);
+      c[*n].SetQ(0.5*q);
+      (*n)++;
+      if (*n==kMax) {
         Error("FindClustersSSD","Too many 1D clusters !");
         return;
-     }
-     c[*n].SetY(y/q+0.25*nd);
-     c[*n].SetQ(0.5*q);
-     c[*n].SetNd(nd);
-     c[*n].SetLabels(lab);
-  }
+      }
+      c[*n].SetY(y/q+0.25*nd);
+      c[*n].SetQ(0.5*q);
+      c[*n].SetNd(nd);
+      c[*n].SetLabels(lab);
+    }
+  } // unfolding is on
+  
   (*n)++;
   if (*n==kMax) {
      Error("FindClustersSSD","Too many 1D clusters !");
@@ -207,12 +238,22 @@ void AliITSClusterFinderV2SSD::RawdataToClusters(AliRawReader* rawReader,TClones
   
 }
 
-void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStream* input, 
+void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input, 
                                        TClonesArray** clusters) 
 {
   //------------------------------------------------------------
   // Actual SSD cluster finder for raw data
   //------------------------------------------------------------
+
+  static AliITSRecoParam *repa = NULL;
+  if(!repa){
+    repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
+    if(!repa){
+      repa = AliITSRecoParam::GetHighFluxParam();
+      AliWarning("Using default AliITSRecoParam class");
+    }
+  }
+
   Int_t nClustersSSD = 0;
   const Int_t kMax = 1000;
   Ali1Dcluster clusters1D[2][kMax];
@@ -221,78 +262,333 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStream* input,
   Float_t q = 0.;
   Float_t y = 0.;
   Int_t nDigits = 0;
-  Int_t prevStrip = -1;
-  Int_t prevFlag = -1;
-  Int_t prevModule = -1;
+  Float_t gain=0;
+  Float_t noise=0.;
+  //  Float_t pedestal=0.;
+  Float_t oldnoise=0.;
+  AliITSCalibrationSSD* cal=NULL;
+
+  Int_t matrix[12][1536];
+  Int_t iddl=-1;
+  Int_t iad=-1;
+  Int_t oddl = -1;
+  Int_t oad = -1;
+  Int_t oadc = -1;
+  Int_t ostrip = -1;
+  Int_t osignal = 65535;
+  Int_t n=0;
+  Bool_t next=0;
 
   // read raw data input stream
   while (kTRUE) {
-    Bool_t next = input->Next();
-
-    if(input->GetSignal()<(3*4.29) && next) continue;
-    // check if a new cluster starts
-    Int_t strip = input->GetCoord2();
-    Int_t flag = input->GetCoord1();
-    if ((!next || (input->GetModuleID() != prevModule)||
-        (strip-prevStrip > 1) || (flag != prevFlag)) &&
-       (nDigits > 0)) {
-      if (nClusters[prevFlag] == kMax) {
-       Error("FindClustersSSD", "Too many 1D clusters !");
-       return;
+    
+    // reset signal matrix
+    for(Int_t i=0; i<12; i++) { for(Int_t j=0; j<1536; j++) { matrix[i][j] = 65535;} }
+    
+    if((osignal!=65535)&&(ostrip>0)&&(ostrip<1536)) { 
+      n++;
+      matrix[oadc][ostrip] = osignal; // recover data from previous occurence of input->Next() 
+    }
+    
+    // buffer data for ddl=iddl and ad=iad
+    while(kTRUE) {
+        
+      next = input->Next();
+      if((!next)&&(input->flag)) continue;
+      Int_t ddl=input->GetDDL(); 
+      Int_t ad=input->GetAD();
+      Int_t adc = input->GetADC(); adc = (adc<6)? adc : adc - 2;
+      Int_t strip = input->GetStrip();
+      if(input->GetSideFlag()) strip=1535-strip;
+      Int_t signal = input->GetSignal();
+
+      if((ddl==iddl)&&(ad==iad)&&(strip>0)&&(strip<1536)) {n++; matrix[adc][strip] = signal;}
+      else {if ((strip<1536) && (strip>0)) {oddl=iddl; oad=iad; oadc = adc; ostrip = strip; osignal=signal; iddl=ddl; iad=ad; break;}}
+      
+      if(!next)  {oddl=iddl; oad=iad; oadc = adc; ostrip = strip; osignal=signal; iddl=ddl; iad=ad; break;}
+      //break;
+    }
+    
+    // No SSD data
+    if(!next && oddl<0) break;
+    
+    if(n==0) continue; // first occurence
+    n=0; //osignal=0;
+    
+    // fill 1Dclusters
+    for(Int_t iadc=0; iadc<12; iadc++) {  // loop over ADC index for ddl=oddl and ad=oad
+      
+      Int_t iimod = (oad - 1)  * 12 + iadc;
+      Int_t iModule = AliITSRawStreamSSD::GetModuleNumber(oddl,iimod);
+      if(iModule==-1) continue;
+      cal = (AliITSCalibrationSSD*)GetResp(iModule);
+      
+      Bool_t first = 0;
+      
+      /*
+      for(Int_t istrip=0; istrip<768; istrip++) { // P-side
+       Int_t signal = matrix[iadc][istrip];
+       pedestal = cal->GetPedestalP(istrip);
+       matrix[iadc][istrip]=signal-(Int_t)pedestal;
+      } 
+      */
+
+      /*
+      Float_t cmode=0;
+      for(Int_t l=0; l<6; l++) {
+       cmode=0;
+       for(Int_t n=20; n<108; n++) cmode+=matrix[iadc][l*128+n];
+       cmode/=88.;
+       for(Int_t n=0; n<128; n++) matrix[iadc][l*128+n]-=(Int_t)cmode;
+       
       }
-      Ali1Dcluster& cluster = clusters1D[prevFlag][nClusters[prevFlag]++];
-      cluster.SetY(y/q);
-      cluster.SetQ(q);
-      cluster.SetNd(nDigits);
-      cluster.SetLabels(lab);
-
-      //Split suspiciously big cluster
-      if (nDigits > 4&&nDigits < 25) {
-       cluster.SetY(y/q - 0.25*nDigits);
-        cluster.SetQ(0.5*q);
-       if (nClusters[prevFlag] == kMax) {
-         Error("FindClustersSSD", "Too many 1D clusters !");
-         return;
+      */
+
+      Int_t istrip=0;
+      for(istrip=0; istrip<768; istrip++) { // P-side
+       
+       Int_t signal = TMath::Abs(matrix[iadc][istrip]);
+       
+       oldnoise = noise;
+       noise = cal->GetNoiseP(istrip); if(noise<1.) signal = 65535;
+       if(signal<3*noise) signal = 65535; // in case ZS was not done in hw do it now
+
+       //        if(cal->IsPChannelBad(istrip)) signal=0;
+
+       if (signal!=65535) {
+         gain = cal->GetGainP(istrip);
+         signal = (Int_t) ( signal * gain ); // signal is corrected for gain
+         signal = (Int_t) cal->ADCToKeV( signal ); // signal is  converted in KeV 
+         
+         q += signal;    // add digit to current cluster
+         y += istrip * signal;   
+         nDigits++;
+         first=1;
+       }
+       
+       else if(first) {
+         
+         if ( ( (nDigits==1) && ( (q==0) || (q>5*oldnoise)) ) || (nDigits>1) ) {
+           
+           Ali1Dcluster& cluster = clusters1D[0][nClusters[0]++];
+
+           if(q!=0) cluster.SetY(y/q);
+           else cluster.SetY(istrip-1);
+
+           cluster.SetQ(q);
+           cluster.SetNd(nDigits);
+           cluster.SetLabels(lab);
+           
+           if(repa->GetUseUnfoldingInClusterFinderSSD()==kTRUE) {
+             
+             //Split suspiciously big cluster
+             if (nDigits > 4&&nDigits < 25) {
+               if(q!=0) cluster.SetY(y/q - 0.25*nDigits);
+               else cluster.SetY(istrip-1 - 0.25*nDigits);
+               cluster.SetQ(0.5*q);
+               if (nClusters[0] == kMax) {
+                 Error("FindClustersSSD", "Too many 1D clusters !");
+                 return;
+               }
+               Ali1Dcluster& cluster2 = clusters1D[0][nClusters[0]++];
+               if(q!=0) cluster2.SetY(y/q + 0.25*nDigits);
+               else cluster2.SetY(istrip-1 + 0.25*nDigits);
+               cluster2.SetQ(0.5*q);
+               cluster2.SetNd(nDigits);
+               cluster2.SetLabels(lab);
+             }
+           } // unfolding is on            
+         }
+         
+         y = q = 0.;
+         nDigits = 0;
+         first=0;
        }
-       Ali1Dcluster& cluster2 = clusters1D[prevFlag][nClusters[prevFlag]++];
-       cluster2.SetY(y/q + 0.25*nDigits);
-       cluster2.SetQ(0.5*q);
-       cluster2.SetNd(nDigits);
-       cluster2.SetLabels(lab);
+       
+      } // loop over strip on P-side
+      
+      // if last strip does have signal
+      if(first) {
+       
+         if ( ( (nDigits==1) && ( (q==0) || (q>5*oldnoise)) ) || (nDigits>1) ) {
+         
+         Ali1Dcluster& cluster = clusters1D[0][nClusters[0]++];
+
+         if(q!=0) cluster.SetY(y/q);
+         else cluster.SetY(istrip-1);
+
+         cluster.SetQ(q);
+         cluster.SetNd(nDigits);
+         cluster.SetLabels(lab);
+         
+         if(repa->GetUseUnfoldingInClusterFinderSSD()==kTRUE) {
+           
+           //Split suspiciously big cluster
+           if (nDigits > 4&&nDigits < 25) {
+             if(q!=0) cluster.SetY(y/q - 0.25*nDigits);
+             else cluster.SetY(istrip-1 - 0.25*nDigits);
+             cluster.SetQ(0.5*q);
+             if (nClusters[0] == kMax) {
+               Error("FindClustersSSD", "Too many 1D clusters !");
+               return;
+             }
+             Ali1Dcluster& cluster2 = clusters1D[0][nClusters[0]++];
+             if(q!=0) cluster2.SetY(y/q + 0.25*nDigits);
+             else cluster2.SetY(istrip-1 + 0.25*nDigits);
+             cluster2.SetQ(0.5*q);
+             cluster2.SetNd(nDigits);
+             cluster2.SetLabels(lab);
+           }
+         } // unfolding is on    
+         
+       }
+       y = q = 0.;
+       nDigits = 0;
+       first=0;
       }
-      y = q = 0.;
-      nDigits = 0;
-    }
+      
+      /*
+      for(Int_t istrip=768; istrip<1536; istrip++) { // P-side
+       Int_t signal = matrix[iadc][istrip];
+       pedestal = cal->GetPedestalN(1535-istrip);
+       matrix[iadc][istrip]=signal-(Int_t)pedestal;
+      }        
+      */
+
+      /*
+      for(Int_t l=6; l<12; l++) {
+       Float_t cmode=0;
+       for(Int_t n=20; n<108; n++) cmode+=matrix[iadc][l*128+n];
+       cmode/=88.;
+       for(Int_t n=0; n<128; n++) matrix[iadc][l*128+n]-=(Int_t)cmode;
+      }
+      */
+
+      oldnoise = 0.;
+      noise = 0.;
+      Int_t strip=0;
+      for(Int_t iistrip=768; iistrip<1536; iistrip++) { // N-side
+       
+       Int_t signal = TMath::Abs(matrix[iadc][iistrip]);
+       strip = 1535-iistrip;
+
+       oldnoise = noise;
+       noise = cal->GetNoiseN(strip); if(noise<1.) signal=65535;
+
+       //        if(cal->IsNChannelBad(strip)) signal=0;
+
+       if(signal<3*noise) signal = 65535; // in case ZS was not done in hw do it now
 
-    if (!next || (input->GetModuleID() != prevModule)) {
-      Int_t iModule = prevModule;
+       if (signal!=65535) {
+         gain = cal->GetGainN(strip);
+         signal = (Int_t) ( signal * gain); // signal is corrected for gain
+         signal = (Int_t) cal->ADCToKeV( signal ); // signal is  converted in KeV 
+         
+         // add digit to current cluster
+         q += signal;
+         y += strip * signal;
+         nDigits++;
+         first=1;
+       }
+
+       else if(first) {
+         
+         if ( ( (nDigits==1) && ( (q==0) || (q>5*oldnoise)) ) || (nDigits>1) ) {
+           
+           Ali1Dcluster& cluster = clusters1D[1][nClusters[1]++];
+
+           if(q!=0) cluster.SetY(y/q);
+           else cluster.SetY(strip+1);
+
+           cluster.SetQ(q);
+           cluster.SetNd(nDigits);
+           cluster.SetLabels(lab);
+           
+           if(repa->GetUseUnfoldingInClusterFinderSSD()==kTRUE) {
+
+             //Split suspiciously big cluster
+             if (nDigits > 4&&nDigits < 25) {
+               cluster.SetY(y/q - 0.25*nDigits);
+               cluster.SetQ(0.5*q);
+               if (nClusters[1] == kMax) {
+                 Error("FindClustersSSD", "Too many 1D clusters !");
+                 return;
+               }
+               Ali1Dcluster& cluster2 = clusters1D[1][nClusters[1]++];
+               cluster2.SetY(y/q + 0.25*nDigits);
+               cluster2.SetQ(0.5*q);
+               cluster2.SetNd(nDigits);
+               cluster2.SetLabels(lab);
+             }       
+           } // unfolding is on
+         } 
+
+         y = q = 0.;
+         nDigits = 0;
+         first=0;        
+       }
+       
+      } // loop over strips on N-side
+
+      if(first) {
+       
+         if ( ( (nDigits==1) && ( (q==0) || (q>5*oldnoise)) ) || (nDigits>1) ) {
+         
+         Ali1Dcluster& cluster = clusters1D[1][nClusters[1]++];
+         
+         if(q!=0) cluster.SetY(y/q);
+         else cluster.SetY(strip+1);
 
-      // when all data from a module was read, search for clusters
-      if (prevFlag >= 0) {
+         cluster.SetQ(q);
+         cluster.SetNd(nDigits);
+         cluster.SetLabels(lab);
+         
+         if(repa->GetUseUnfoldingInClusterFinderSSD()==kTRUE) {
+           
+           //Split suspiciously big cluster
+           if (nDigits > 4&&nDigits < 25) {
+             if(q!=0) cluster.SetY(y/q - 0.25*nDigits);
+             else cluster.SetY(strip+1 - 0.25*nDigits);
+             cluster.SetQ(0.5*q);
+             if (nClusters[1] == kMax) {
+               Error("FindClustersSSD", "Too many 1D clusters !");
+               return;
+             }
+             Ali1Dcluster& cluster2 = clusters1D[1][nClusters[1]++];
+             if(q!=0) cluster2.SetY(y/q + 0.25*nDigits);
+             else cluster2.SetY(strip+1 + 0.25*nDigits);
+             cluster2.SetQ(0.5*q);
+             cluster2.SetNd(nDigits);
+             cluster2.SetLabels(lab);
+           }
+         } // unfolding is on      
+       }
+
+       y = q = 0.;
+       nDigits = 0;
+       first=0;          
+      }
+      
+      // create recpoints
+      if((nClusters[0])&&(nClusters[1])) {
+       
        clusters[iModule] = new TClonesArray("AliITSRecPoint");
        fModule = iModule;
        FindClustersSSD(&clusters1D[0][0], nClusters[0], 
                        &clusters1D[1][0], nClusters[1], clusters[iModule]);
-       Int_t nClusters = clusters[iModule]->GetEntriesFast();
-       nClustersSSD += nClusters;
+       Int_t nClustersn = clusters[iModule]->GetEntriesFast();
+       nClustersSSD += nClustersn;
       }
 
-      if (!next) break;
       nClusters[0] = nClusters[1] = 0;
       y = q = 0.;
       nDigits = 0;
-    }
 
-    // add digit to current cluster
-    q += input->GetSignal()/4.29;
-    y += strip * input->GetSignal()/4.29;
-    nDigits++;
-    prevStrip = strip;
-    prevFlag = flag;
-    prevModule = input->GetModuleID();
+    } // loop over adc
 
+    if(!next) break;
   }
-
+  
   Info("FindClustersSSD", "found clusters in ITS SSD: %d", nClustersSSD);
 }
 
@@ -303,293 +599,401 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
   //------------------------------------------------------------
   // Actual SSD cluster finder
   //------------------------------------------------------------
+
+  const TGeoHMatrix *mT2L=AliITSgeomTGeo::GetTracking2LocalMatrix(fModule);
+
   TClonesArray &cl=*clusters;
-  //
-  Float_t tanp=fTanP, tann=fTanN;
-  if (fModule>fLastSSD1) {tann=fTanP; tanp=fTanN;}
+  
+  AliITSsegmentationSSD *seg = dynamic_cast<AliITSsegmentationSSD*>(fDetTypeRec->GetSegmentationModel(2));
+  if (fModule>fLastSSD1) 
+    seg->SetLayer(6);
+  else 
+    seg->SetLayer(5);
+
+  Float_t hwSSD = seg->Dx()*1e-4/2;
+  Float_t hlSSD = seg->Dz()*1e-4/2;
+
   Int_t idet=fNdet[fModule];
   Int_t ncl=0;
+
   //
-  Int_t negativepair[30000];
-  Int_t cnegative[3000];  
-  Int_t cused1[3000];
-  Int_t positivepair[30000];
-  Int_t cpositive[3000];
-  Int_t cused2[3000];
-  for (Int_t i=0;i<3000;i++) {cnegative[i]=0; cused1[i]=0;}
-  for (Int_t i=0;i<3000;i++) {cpositive[i]=0; cused2[i]=0;}
-  for (Int_t i=0;i<30000;i++) {negativepair[i]=0; positivepair[i]=0;}
-  static Short_t pairs[1000][1000];
-  memset(pairs,0,sizeof(Short_t)*1000000);
-//   Short_t ** pairs = new Short_t*[1000];
-//   for (Int_t i=0; i<1000; i++) {
-//     pairs[i] = new Short_t[1000];
-//     memset(pairs[i],0,sizeof(Short_t)*1000);
-//   }  
+  Int_t *cnegative = new Int_t[np];  
+  Int_t *cused1 = new Int_t[np];
+  Int_t *negativepair = new Int_t[10*np];
+  Int_t *cpositive = new Int_t[nn];  
+  Int_t *cused2 = new Int_t[nn];  
+  Int_t *positivepair = new Int_t[10*nn];  
+  for (Int_t i=0;i<np;i++) {cnegative[i]=0; cused1[i]=0;}
+  for (Int_t i=0;i<nn;i++) {cpositive[i]=0; cused2[i]=0;}
+  for (Int_t i=0;i<10*np;i++) {negativepair[i]=0;}
+  for (Int_t i=0;i<10*nn;i++) {positivepair[i]=0;}
+
+  if ((np*nn) > fgPairsSize) {
+
+    if (fgPairs) delete [] fgPairs;
+    fgPairsSize = 4*np*nn;
+    fgPairs = new Short_t[fgPairsSize];
+  }
+  memset(fgPairs,0,sizeof(Short_t)*np*nn);
+
   //
   // find available pairs
   //
   for (Int_t i=0; i<np; i++) {
-    Float_t yp=pos[i].GetY()*fYpitchSSD
-    if (pos[i].GetQ()<3) continue;
+    Float_t yp=pos[i].GetY(); 
+    if ( (pos[i].GetQ()>0) && (pos[i].GetQ()<3) ) continue;
     for (Int_t j=0; j<nn; j++) {
-      if (neg[j].GetQ()<3) continue;
-      Float_t yn=neg[j].GetY()*fYpitchSSD;
-      Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
-      Float_t yt=yn + tann*zt;
-      zt-=fHlSSD; yt-=fHwSSD;
-      if (TMath::Abs(yt)<fHwSSD+0.01)
-      if (TMath::Abs(zt)<fHlSSD+0.01*(neg[j].GetNd()+pos[i].GetNd())) {
+      if ( (neg[j].GetQ()>0) && (neg[j].GetQ()<3) ) continue;
+      Float_t yn=neg[j].GetY();
+
+      Float_t xt, zt;
+      seg->GetPadCxz(yn, yp, xt, zt);
+      
+      if (TMath::Abs(xt)<hwSSD+0.01)
+      if (TMath::Abs(zt)<hlSSD+0.01*(neg[j].GetNd()+pos[i].GetNd())) {
        negativepair[i*10+cnegative[i]] =j;  //index
        positivepair[j*10+cpositive[j]] =i;
        cnegative[i]++;  //counters
        cpositive[j]++; 
-       pairs[i][j]=100;
+       fgPairs[i*nn+j]=100;
       }
     }
   }
+
+  //
+  // try to recover points out of but close to the module boundaries 
   //
   for (Int_t i=0; i<np; i++) {
-    Float_t yp=pos[i].GetY()*fYpitchSSD
-    if (pos[i].GetQ()<3) continue;
+    Float_t yp=pos[i].GetY(); 
+    if ( (pos[i].GetQ()>0) && (pos[i].GetQ()<3) ) continue;
     for (Int_t j=0; j<nn; j++) {
-      if (neg[j].GetQ()<3) continue;
+      if ( (neg[j].GetQ()>0) && (neg[j].GetQ()<3) ) continue;
+      // if both 1Dclusters have an other cross continue
       if (cpositive[j]&&cnegative[i]) continue;
-      Float_t yn=neg[j].GetY()*fYpitchSSD;
-      Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
-      Float_t yt=yn + tann*zt;
-      zt-=fHlSSD; yt-=fHwSSD;
-      if (TMath::Abs(yt)<fHwSSD+0.1)
-      if (TMath::Abs(zt)<fHlSSD+0.15) {
+      Float_t yn=neg[j].GetY();
+      
+      Float_t xt, zt;
+      seg->GetPadCxz(yn, yp, xt, zt);
+      
+      if (TMath::Abs(xt)<hwSSD+0.1)
+      if (TMath::Abs(zt)<hlSSD+0.15) {
+       // tag 1Dcluster (eventually will produce low quality recpoint)
        if (cnegative[i]==0) pos[i].SetNd(100);  // not available pair
        if (cpositive[j]==0) neg[j].SetNd(100);  // not available pair
        negativepair[i*10+cnegative[i]] =j;  //index
        positivepair[j*10+cpositive[j]] =i;
        cnegative[i]++;  //counters
        cpositive[j]++; 
-       pairs[i][j]=100;
+       fgPairs[i*nn+j]=100;
       }
     }
   }
+
   //
   Float_t lp[5];
   Int_t milab[10];
   Double_t ratio;
   
-  //
-  // sign gold tracks
-  //
-  for (Int_t ip=0;ip<np;ip++){
-    Float_t ybest=1000,zbest=1000,qbest=0;
+
+  static AliITSRecoParam *repa = NULL;
+  if(!repa){
+    repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
+    if(!repa){
+      repa = AliITSRecoParam::GetHighFluxParam();
+      AliWarning("Using default AliITSRecoParam class");
+    }
+  }
+
+  if(repa->GetUseChargeMatchingInClusterFinderSSD()==kTRUE) {
+
+
     //
-    // select gold clusters
-    if ( (cnegative[ip]==1) && cpositive[negativepair[10*ip]]==1){ 
-      Float_t yp=pos[ip].GetY()*fYpitchSSD; 
-      Int_t j = negativepair[10*ip];      
-      ratio = (pos[ip].GetQ()-neg[j].GetQ())/(pos[ip].GetQ()+neg[j].GetQ());
-      //
-      Float_t yn=neg[j].GetY()*fYpitchSSD;
-      Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
-      Float_t yt=yn + tann*zt;
-      zt-=fHlSSD; yt-=fHwSSD;
-      ybest=yt; zbest=zt; 
-      qbest=0.5*(pos[ip].GetQ()+neg[j].GetQ());
-      lp[0]=-(-ybest+fYshift[fModule]);
-      lp[1]=  -zbest+fZshift[fModule];
-      lp[2]=0.0025*0.0025;  //SigmaY2
-      lp[3]=0.110*0.110;  //SigmaZ2
-      
-      lp[4]=qbest;        //Q
-      for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
-      for (Int_t ilab=0;ilab<3;ilab++){
-       milab[ilab] = pos[ip].GetLabel(ilab);
-       milab[ilab+3] = neg[j].GetLabel(ilab);
-      }
+    // sign gold tracks
+    //
+    for (Int_t ip=0;ip<np;ip++){
+      Float_t xbest=1000,zbest=1000,qbest=0;
       //
-      CheckLabels2(milab);
-      milab[3]=(((ip<<10) + j)<<10) + idet; // pos|neg|det
-      Int_t info[3] = {pos[ip].GetNd(),neg[j].GetNd(),fNlayer[fModule]};
-      AliITSRecPoint * cl2;
-      if(clusters){
-       cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
-       cl2->SetChargeRatio(ratio);     
-       cl2->SetType(1);
-       pairs[ip][j]=1;
-       if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
-         cl2->SetType(2);
-         pairs[ip][j]=2;
+      // select gold clusters
+      if ( (cnegative[ip]==1) && cpositive[negativepair[10*ip]]==1){ 
+       Float_t yp=pos[ip].GetY(); 
+       Int_t j = negativepair[10*ip];      
+
+       if( (pos[ip].GetQ()==0) && (neg[j].GetQ() ==0) ) { 
+         // both bad, hence continue;    
+         // mark both as used (to avoid recover at the end)
+         cused1[ip]++; 
+         cused2[j]++;
+         continue;
        }
-       cused1[ip]++;
-       cused2[j]++;
+
+       ratio = (pos[ip].GetQ()-neg[j].GetQ())/(pos[ip].GetQ()+neg[j].GetQ());
+
+       // charge matching (note that if posQ or negQ is 0 -> ratio=1 and the following condition is met
+       if (TMath::Abs(ratio)>0.2) continue; // note: 0.2=3xsigma_ratio calculated in cosmics tests
+
+       //
+       Float_t yn=neg[j].GetY();
        
-      }
-      else{
-       cl2 = new AliITSRecPoint(milab,lp,info);        
-       cl2->SetChargeRatio(ratio);     
-       cl2->SetType(1);
-       pairs[ip][j]=1;
-       if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
-         cl2->SetType(2);
-         pairs[ip][j]=2;
+       Float_t xt, zt;
+       seg->GetPadCxz(yn, yp, xt, zt);
+       
+       xbest=xt; zbest=zt; 
+
+       
+       qbest=0.5*(pos[ip].GetQ()+neg[j].GetQ());
+       if( (pos[ip].GetQ()==0)||(neg[ip].GetQ()==0)) qbest*=2; // in case of bad strips on one side keep all charge from the other one
+       
+       {
+         Double_t loc[3]={xbest,0.,zbest},trk[3]={0.,0.,0.};
+         mT2L->MasterToLocal(loc,trk);
+         lp[0]=trk[1];
+         lp[1]=trk[2];
        }
-       cused1[ip]++;
-       cused2[j]++;
-       fDetTypeRec->AddRecPoint(*cl2);
+       lp[2]=0.0025*0.0025;  //SigmaY2
+       lp[3]=0.110*0.110;  //SigmaZ2
+       
+       lp[4]=qbest;        //Q
+       for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
+       for (Int_t ilab=0;ilab<3;ilab++){
+         milab[ilab] = pos[ip].GetLabel(ilab);
+         milab[ilab+3] = neg[j].GetLabel(ilab);
+       }
+       //
+       CheckLabels2(milab);
+       milab[3]=(((ip<<10) + j)<<10) + idet; // pos|neg|det
+       Int_t info[3] = {pos[ip].GetNd(),neg[j].GetNd(),fNlayer[fModule]};
+       AliITSRecPoint * cl2;
+       
+       if(clusters){  // Note clusters != 0 when method is called for rawdata
+         
+         
+         cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+         
+         cl2->SetChargeRatio(ratio);           
+         cl2->SetType(1);
+         fgPairs[ip*nn+j]=1;
+
+         if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+           cl2->SetType(2);
+           fgPairs[ip*nn+j]=2;
+         }
+
+         if(pos[ip].GetQ()==0) cl2->SetType(3);
+         if(neg[ip].GetQ()==0) cl2->SetType(4);
+
+         cused1[ip]++;
+         cused2[j]++;
+         
+       }
+       else{ // Note clusters == 0 when method is called for digits
+         
+         cl2 = new AliITSRecPoint(milab,lp,info);      
+         
+         cl2->SetChargeRatio(ratio);           
+         cl2->SetType(1);
+         fgPairs[ip*nn+j]=1;
+
+         if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+           cl2->SetType(2);
+           fgPairs[ip*nn+j]=2;
+         }
+
+         if(pos[ip].GetQ()==0) cl2->SetType(3);
+         if(neg[ip].GetQ()==0) cl2->SetType(4);
+
+         cused1[ip]++;
+         cused2[j]++;
+
+         fDetTypeRec->AddRecPoint(*cl2);
+       }
+       ncl++;
       }
-      ncl++;
     }
-  }
     
-  for (Int_t ip=0;ip<np;ip++){
-    Float_t ybest=1000,zbest=1000,qbest=0;
-    //
-    //
-    // select "silber" cluster
-    if ( cnegative[ip]==1 && cpositive[negativepair[10*ip]]==2){
-      Int_t in  = negativepair[10*ip];
-      Int_t ip2 = positivepair[10*in];
-      if (ip2==ip) ip2 =  positivepair[10*in+1];
-      Float_t pcharge = pos[ip].GetQ()+pos[ip2].GetQ();
-      if (TMath::Abs(pcharge-neg[in].GetQ())<10){
-       //
-       // add first pair
-       if (pairs[ip][in]==100){  //
-         Float_t yp=pos[ip].GetY()*fYpitchSSD; 
-         Float_t yn=neg[in].GetY()*fYpitchSSD;
-         Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
-         Float_t yt=yn + tann*zt;
-         zt-=fHlSSD; yt-=fHwSSD;
-         ybest =yt;  zbest=zt; 
-         qbest =pos[ip].GetQ();
-         lp[0]=-(-ybest+fYshift[fModule]);
-         lp[1]=  -zbest+fZshift[fModule];
-         lp[2]=0.0025*0.0025;  //SigmaY2
-         lp[3]=0.110*0.110;  //SigmaZ2
+    for (Int_t ip=0;ip<np;ip++){
+      Float_t xbest=1000,zbest=1000,qbest=0;
+      //
+      //
+      // select "silber" cluster
+      if ( cnegative[ip]==1 && cpositive[negativepair[10*ip]]==2){
+       Int_t in  = negativepair[10*ip];
+       Int_t ip2 = positivepair[10*in];
+       if (ip2==ip) ip2 =  positivepair[10*in+1];
+       Float_t pcharge = pos[ip].GetQ()+pos[ip2].GetQ();
+       
+       if ( (TMath::Abs(pcharge-neg[in].GetQ())<30) && (pcharge!=0) ) { // 
          
-         lp[4]=qbest;        //Q
-         for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
-         for (Int_t ilab=0;ilab<3;ilab++){
-           milab[ilab] = pos[ip].GetLabel(ilab);
-           milab[ilab+3] = neg[in].GetLabel(ilab);
-         }
          //
-         CheckLabels2(milab);
-         ratio = (pos[ip].GetQ()-neg[in].GetQ())/(pos[ip].GetQ()+neg[in].GetQ());
-         milab[3]=(((ip<<10) + in)<<10) + idet; // pos|neg|det
-         Int_t info[3] = {pos[ip].GetNd(),neg[in].GetNd(),fNlayer[fModule]};
+         // add first pair
+         if ( (fgPairs[ip*nn+in]==100)&&(pos[ip].GetQ() ) ) {  //
+           
+           Float_t yp=pos[ip].GetY(); 
+           Float_t yn=neg[in].GetY();
+           
+           Float_t xt, zt;
+           seg->GetPadCxz(yn, yp, xt, zt);
+           
+           xbest=xt; zbest=zt; 
 
-         AliITSRecPoint * cl2;
-         if(clusters){
-           cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
-           cl2->SetChargeRatio(ratio);         
-           cl2->SetType(5);
-           pairs[ip][in] = 5;
-           if ((pos[ip].GetNd()+neg[in].GetNd())>6){ //multi cluster
-             cl2->SetType(6);
-             pairs[ip][in] = 6;
-           }       
-         }
-         else{
-           cl2 = new AliITSRecPoint(milab,lp,info);
-           cl2->SetChargeRatio(ratio);         
-           cl2->SetType(5);
-           pairs[ip][in] = 5;
-           if ((pos[ip].GetNd()+neg[in].GetNd())>6){ //multi cluster
-             cl2->SetType(6);
-             pairs[ip][in] = 6;
+           qbest =pos[ip].GetQ();
+           Double_t loc[3]={xbest,0.,zbest},trk[3]={0.,0.,0.};
+           mT2L->MasterToLocal(loc,trk);
+           lp[0]=trk[1];
+           lp[1]=trk[2];
+           
+           lp[2]=0.0025*0.0025;  //SigmaY2
+           lp[3]=0.110*0.110;  //SigmaZ2
+           
+           lp[4]=qbest;        //Q
+           for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
+           for (Int_t ilab=0;ilab<3;ilab++){
+             milab[ilab] = pos[ip].GetLabel(ilab);
+             milab[ilab+3] = neg[in].GetLabel(ilab);
            }
+           //
+           CheckLabels2(milab);
+           ratio = (pos[ip].GetQ()-neg[in].GetQ())/(pos[ip].GetQ()+neg[in].GetQ());
+           milab[3]=(((ip<<10) + in)<<10) + idet; // pos|neg|det
+           Int_t info[3] = {pos[ip].GetNd(),neg[in].GetNd(),fNlayer[fModule]};
            
-           fDetTypeRec->AddRecPoint(*cl2);
+           AliITSRecPoint * cl2;
+           if(clusters){
+             
+             cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+             cl2->SetChargeRatio(ratio);       
+             cl2->SetType(5);
+             fgPairs[ip*nn+in] = 5;
+             if ((pos[ip].GetNd()+neg[in].GetNd())>6){ //multi cluster
+               cl2->SetType(6);
+               fgPairs[ip*nn+in] = 6;
+             }     
+           }
+           else{
+             cl2 = new AliITSRecPoint(milab,lp,info);
+             cl2->SetChargeRatio(ratio);       
+             cl2->SetType(5);
+             fgPairs[ip*nn+in] = 5;
+             if ((pos[ip].GetNd()+neg[in].GetNd())>6){ //multi cluster
+               cl2->SetType(6);
+               fgPairs[ip*nn+in] = 6;
+             }
+             
+             fDetTypeRec->AddRecPoint(*cl2);
+           }
+           ncl++;
          }
-         ncl++;
-       }
-       
-       //
-       // add second pair
-       
-      //       if (!(cused1[ip2] || cused2[in])){  //
-       if (pairs[ip2][in]==100){
-         Float_t yp=pos[ip2].GetY()*fYpitchSSD;
-         Float_t yn=neg[in].GetY()*fYpitchSSD;
-         Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
-         Float_t yt=yn + tann*zt;
-         zt-=fHlSSD; yt-=fHwSSD;
-         ybest =yt;  zbest=zt; 
-         qbest =pos[ip2].GetQ();
-         lp[0]=-(-ybest+fYshift[fModule]);
-         lp[1]=  -zbest+fZshift[fModule];
-         lp[2]=0.0025*0.0025;  //SigmaY2
-         lp[3]=0.110*0.110;  //SigmaZ2
          
-         lp[4]=qbest;        //Q
-         for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
-         for (Int_t ilab=0;ilab<3;ilab++){
-           milab[ilab] = pos[ip2].GetLabel(ilab);
-           milab[ilab+3] = neg[in].GetLabel(ilab);
-         }
+         
          //
-         CheckLabels2(milab);
-         ratio = (pos[ip2].GetQ()-neg[in].GetQ())/(pos[ip2].GetQ()+neg[in].GetQ());
-         milab[3]=(((ip2<<10) + in)<<10) + idet; // pos|neg|det
-         Int_t info[3] = {pos[ip2].GetNd(),neg[in].GetNd(),fNlayer[fModule]};
+         // add second pair
          
-         AliITSRecPoint * cl2;
-         if(clusters){
-           cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
-           cl2->SetChargeRatio(ratio);         
-           cl2->SetType(5);
-           pairs[ip2][in] =5;
-           if ((pos[ip2].GetNd()+neg[in].GetNd())>6){ //multi cluster
-             cl2->SetType(6);
-             pairs[ip2][in] =6;
+         //    if (!(cused1[ip2] || cused2[in])){  //
+         if ( (fgPairs[ip2*nn+in]==100) && (pos[ip2].GetQ()) ) {
+           
+           Float_t yp=pos[ip2].GetY();
+           Float_t yn=neg[in].GetY();
+           
+           Float_t xt, zt;
+           seg->GetPadCxz(yn, yp, xt, zt);
+           
+           xbest=xt; zbest=zt; 
+
+           qbest =pos[ip2].GetQ();
+           
+           Double_t loc[3]={xbest,0.,zbest},trk[3]={0.,0.,0.};
+           mT2L->MasterToLocal(loc,trk);
+           lp[0]=trk[1];
+           lp[1]=trk[2];
+           
+           lp[2]=0.0025*0.0025;  //SigmaY2
+           lp[3]=0.110*0.110;  //SigmaZ2
+           
+           lp[4]=qbest;        //Q
+           for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
+           for (Int_t ilab=0;ilab<3;ilab++){
+             milab[ilab] = pos[ip2].GetLabel(ilab);
+             milab[ilab+3] = neg[in].GetLabel(ilab);
            }
-         }
-         else{
-           cl2 = new AliITSRecPoint(milab,lp,info);
-           cl2->SetChargeRatio(ratio);         
-           cl2->SetType(5);
-           pairs[ip2][in] =5;
-           if ((pos[ip2].GetNd()+neg[in].GetNd())>6){ //multi cluster
-             cl2->SetType(6);
-             pairs[ip2][in] =6;
+           //
+           CheckLabels2(milab);
+           ratio = (pos[ip2].GetQ()-neg[in].GetQ())/(pos[ip2].GetQ()+neg[in].GetQ());
+           milab[3]=(((ip2<<10) + in)<<10) + idet; // pos|neg|det
+           Int_t info[3] = {pos[ip2].GetNd(),neg[in].GetNd(),fNlayer[fModule]};
+           
+           AliITSRecPoint * cl2;
+           if(clusters){
+             cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+             
+             cl2->SetChargeRatio(ratio);       
+             cl2->SetType(5);
+             fgPairs[ip2*nn+in] =5;
+             if ((pos[ip2].GetNd()+neg[in].GetNd())>6){ //multi cluster
+               cl2->SetType(6);
+               fgPairs[ip2*nn+in] =6;
+             }
            }
-
-           fDetTypeRec->AddRecPoint(*cl2);
+           else{
+             cl2 = new AliITSRecPoint(milab,lp,info);
+             cl2->SetChargeRatio(ratio);       
+             cl2->SetType(5);
+             fgPairs[ip2*nn+in] =5;
+             if ((pos[ip2].GetNd()+neg[in].GetNd())>6){ //multi cluster
+               cl2->SetType(6);
+               fgPairs[ip2*nn+in] =6;
+             }
+             
+             fDetTypeRec->AddRecPoint(*cl2);
+           }
+           ncl++;
          }
-         ncl++;
-       }       
-       cused1[ip]++;
-       cused1[ip2]++;
-       cused2[in]++;
-      }
-    }    
-  }
+         
+         cused1[ip]++;
+         cused1[ip2]++;
+         cused2[in]++;
 
-  //  
-  for (Int_t jn=0;jn<nn;jn++){
-    if (cused2[jn]) continue;
-    Float_t ybest=1000,zbest=1000,qbest=0;
-    // select "silber" cluster
-    if ( cpositive[jn]==1 && cnegative[positivepair[10*jn]]==2){
-      Int_t ip  = positivepair[10*jn];
-      Int_t jn2 = negativepair[10*ip];
-      if (jn2==jn) jn2 =  negativepair[10*ip+1];
-      Float_t pcharge = neg[jn].GetQ()+neg[jn2].GetQ();
-      //
-      if (TMath::Abs(pcharge-pos[ip].GetQ())<10){
+       } // charge matching condition
+
+      } // 2 Pside cross 1 Nside
+    } // loop over Pside clusters
+    
+    
+      
+      //  
+    for (Int_t jn=0;jn<nn;jn++){
+      if (cused2[jn]) continue;
+      Float_t xbest=1000,zbest=1000,qbest=0;
+      // select "silber" cluster
+      if ( cpositive[jn]==1 && cnegative[positivepair[10*jn]]==2){
+       Int_t ip  = positivepair[10*jn];
+       Int_t jn2 = negativepair[10*ip];
+       if (jn2==jn) jn2 =  negativepair[10*ip+1];
+       Float_t pcharge = neg[jn].GetQ()+neg[jn2].GetQ();
        //
-       // add first pair
-       //      if (!(cused1[ip]||cused2[jn])){
-       if (pairs[ip][jn]==100){
-         Float_t yn=neg[jn].GetY()*fYpitchSSD; 
-         Float_t yp=pos[ip].GetY()*fYpitchSSD;
-         Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
-         Float_t yt=yn + tann*zt;
-         zt-=fHlSSD; yt-=fHwSSD;
-         ybest =yt;  zbest=zt; 
-         qbest =neg[jn].GetQ();
-         lp[0]=-(-ybest+fYshift[fModule]);
-         lp[1]=  -zbest+fZshift[fModule];
+       
+       if ( (TMath::Abs(pcharge-pos[ip].GetQ())<30) &&  // charge matching 
+            (pcharge!=0) ) { // reject combinations of bad strips
+         
+         //
+         // add first pair
+         //    if (!(cused1[ip]||cused2[jn])){
+         if ( (fgPairs[ip*nn+jn]==100) && (neg[jn].GetQ()) ) {  //
+           
+           Float_t yn=neg[jn].GetY(); 
+           Float_t yp=pos[ip].GetY();
+
+           Float_t xt, zt;
+           seg->GetPadCxz(yn, yp, xt, zt);
+           
+           xbest=xt; zbest=zt; 
+
+           qbest =neg[jn].GetQ();
+
+           {
+             Double_t loc[3]={xbest,0.,zbest},trk[3]={0.,0.,0.};
+             mT2L->MasterToLocal(loc,trk);
+             lp[0]=trk[1];
+             lp[1]=trk[2];
+          }
          lp[2]=0.0025*0.0025;  //SigmaY2
          lp[3]=0.110*0.110;  //SigmaZ2
          
@@ -608,12 +1012,13 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          AliITSRecPoint * cl2;
          if(clusters){
            cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+
            cl2->SetChargeRatio(ratio);         
            cl2->SetType(7);
-           pairs[ip][jn] =7;
+           fgPairs[ip*nn+jn] =7;
            if ((pos[ip].GetNd()+neg[jn].GetNd())>6){ //multi cluster
              cl2->SetType(8);
-             pairs[ip][jn]=8;
+             fgPairs[ip*nn+jn]=8;
            }
 
          }
@@ -621,10 +1026,10 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
            cl2 = new AliITSRecPoint(milab,lp,info);
            cl2->SetChargeRatio(ratio);         
            cl2->SetType(7);
-           pairs[ip][jn] =7;
+           fgPairs[ip*nn+jn] =7;
            if ((pos[ip].GetNd()+neg[jn].GetNd())>6){ //multi cluster
              cl2->SetType(8);
-             pairs[ip][jn]=8;
+             fgPairs[ip*nn+jn]=8;
            }
 
            fDetTypeRec->AddRecPoint(*cl2);
@@ -634,16 +1039,24 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
        //
        // add second pair
        //      if (!(cused1[ip]||cused2[jn2])){
-       if (pairs[ip][jn2]==100){
-         Float_t yn=neg[jn2].GetY()*fYpitchSSD; 
-         Double_t yp=pos[ip].GetY()*fYpitchSSD; 
-         Double_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
-         Double_t yt=yn + tann*zt;
-         zt-=fHlSSD; yt-=fHwSSD;
-         ybest =yt;  zbest=zt; 
+       if ( (fgPairs[ip*nn+jn2]==100)&&(neg[jn2].GetQ() ) ) {  //
+
+         Float_t yn=neg[jn2].GetY(); 
+         Double_t yp=pos[ip].GetY(); 
+
+         Float_t xt, zt;
+         seg->GetPadCxz(yn, yp, xt, zt);
+         
+         xbest=xt; zbest=zt; 
+
          qbest =neg[jn2].GetQ();
-         lp[0]=-(-ybest+fYshift[fModule]);
-         lp[1]=  -zbest+fZshift[fModule];
+
+          {
+          Double_t loc[3]={xbest,0.,zbest},trk[3]={0.,0.,0.};
+          mT2L->MasterToLocal(loc,trk);
+          lp[0]=trk[1];
+          lp[1]=trk[2];
+          }
          lp[2]=0.0025*0.0025;  //SigmaY2
          lp[3]=0.110*0.110;  //SigmaZ2
          
@@ -661,25 +1074,27 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          AliITSRecPoint * cl2;
          if(clusters){
            cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+
+
            cl2->SetChargeRatio(ratio);         
-           pairs[ip][jn2]=7;
+           fgPairs[ip*nn+jn2]=7;
            cl2->SetType(7);
            if ((pos[ip].GetNd()+neg[jn2].GetNd())>6){ //multi cluster
              cl2->SetType(8);
-             pairs[ip][jn2]=8;
+             fgPairs[ip*nn+jn2]=8;
            }
            
          }
          else{
            cl2 = new AliITSRecPoint(milab,lp,info);
            cl2->SetChargeRatio(ratio);         
-           pairs[ip][jn2]=7;
+           fgPairs[ip*nn+jn2]=7;
            cl2->SetType(7);
            if ((pos[ip].GetNd()+neg[jn2].GetNd())>6){ //multi cluster
              cl2->SetType(8);
-             pairs[ip][jn2]=8;
+             fgPairs[ip*nn+jn2]=8;
            }
-           
+
            fDetTypeRec->AddRecPoint(*cl2);
          }
 
@@ -688,131 +1103,163 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
        cused1[ip]++;
        cused2[jn]++;
        cused2[jn2]++;
-      }
-    }    
-  }
+
+       } // charge matching condition
+
+      } // 2 Nside cross 1 Pside
+    } // loop over Pside clusters
+
   
-  for (Int_t ip=0;ip<np;ip++){
-    Float_t ybest=1000,zbest=1000,qbest=0;
-    //
-    // 2x2 clusters
-    //
-    if ( (cnegative[ip]<5) && cpositive[negativepair[10*ip]]<5){ 
-      Float_t minchargediff =4.;
-      Int_t j=-1;
-      for (Int_t di=0;di<cnegative[ip];di++){
-       Int_t   jc = negativepair[ip*10+di];
-       Float_t chargedif = pos[ip].GetQ()-neg[jc].GetQ();
-       if (TMath::Abs(chargedif)<minchargediff){
-         j =jc;
-         minchargediff = TMath::Abs(chargedif);
-       }
-      }
-      if (j<0) continue;  // not proper cluster      
-      Int_t count =0;
-      for (Int_t di=0;di<cnegative[ip];di++){
-       Int_t   jc = negativepair[ip*10+di];
-       Float_t chargedif = pos[ip].GetQ()-neg[jc].GetQ();
-       if (TMath::Abs(chargedif)<minchargediff+3.) count++;
-      }
-      if (count>1) continue;  // more than one "proper" cluster for positive
-      //
-      count =0;
-      for (Int_t dj=0;dj<cpositive[j];dj++){
-       Int_t   ic  = positivepair[j*10+dj];
-       Float_t chargedif = pos[ic].GetQ()-neg[j].GetQ();
-       if (TMath::Abs(chargedif)<minchargediff+3.) count++;
-      }
-      if (count>1) continue;  // more than one "proper" cluster for negative
-      
-      Int_t jp = 0;
-      
-      count =0;
-      for (Int_t dj=0;dj<cnegative[jp];dj++){
-       Int_t   ic = positivepair[jp*10+dj];
-       Float_t chargedif = pos[ic].GetQ()-neg[jp].GetQ();
-       if (TMath::Abs(chargedif)<minchargediff+4.) count++;
-      }
-      if (count>1) continue;   
-      if (pairs[ip][j]<100) continue;
+    
+    for (Int_t ip=0;ip<np;ip++){
+      Float_t xbest=1000,zbest=1000,qbest=0;
       //
-      //almost gold clusters
-      Float_t yp=pos[ip].GetY()*fYpitchSSD; 
-      Float_t yn=neg[j].GetY()*fYpitchSSD;
-      Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
-      Float_t yt=yn + tann*zt;
-      zt-=fHlSSD; yt-=fHwSSD;
-      ybest=yt; zbest=zt; 
-      qbest=0.5*(pos[ip].GetQ()+neg[j].GetQ());
-      lp[0]=-(-ybest+fYshift[fModule]);
-      lp[1]=  -zbest+fZshift[fModule];
-      lp[2]=0.0025*0.0025;  //SigmaY2
-      lp[3]=0.110*0.110;  //SigmaZ2    
-      lp[4]=qbest;        //Q
-      for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
-      for (Int_t ilab=0;ilab<3;ilab++){
-       milab[ilab] = pos[ip].GetLabel(ilab);
-       milab[ilab+3] = neg[j].GetLabel(ilab);
-      }
+      // 2x2 clusters
       //
-      CheckLabels2(milab);
-      ratio = (pos[ip].GetQ()-neg[j].GetQ())/(pos[ip].GetQ()+neg[j].GetQ());
-      milab[3]=(((ip<<10) + j)<<10) + idet; // pos|neg|det
-      Int_t info[3] = {pos[ip].GetNd(),neg[j].GetNd(),fNlayer[fModule]};
-      AliITSRecPoint * cl2;
-      if(clusters){
-       cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
-       cl2->SetChargeRatio(ratio);     
-       cl2->SetType(10);
-       pairs[ip][j]=10;
-       if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
-         cl2->SetType(11);
-         pairs[ip][j]=11;
+      if ( (cnegative[ip]<5) && cpositive[negativepair[10*ip]]<5){ 
+       Float_t minchargediff =4.;
+       Int_t j=-1;
+       for (Int_t di=0;di<cnegative[ip];di++){
+         Int_t   jc = negativepair[ip*10+di];
+         Float_t chargedif = pos[ip].GetQ()-neg[jc].GetQ();
+         if (TMath::Abs(chargedif)<minchargediff){
+           j =jc;
+           minchargediff = TMath::Abs(chargedif);
+         }
        }
-       cused1[ip]++;
-       cused2[j]++;      
-      }
-      else{
-       cl2 = new AliITSRecPoint(milab,lp,info);
-       cl2->SetChargeRatio(ratio);     
-       cl2->SetType(10);
-       pairs[ip][j]=10;
-       if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
-         cl2->SetType(11);
-         pairs[ip][j]=11;
+       if (j<0) continue;  // not proper cluster      
+       
+       Int_t count =0;
+       for (Int_t di=0;di<cnegative[ip];di++){
+         Int_t   jc = negativepair[ip*10+di];
+         Float_t chargedif = pos[ip].GetQ()-neg[jc].GetQ();
+         if (TMath::Abs(chargedif)<minchargediff+3.) count++;
        }
-       cused1[ip]++;
-       cused2[j]++;      
+       if (count>1) continue;  // more than one "proper" cluster for positive
+       //
        
-       fDetTypeRec->AddRecPoint(*cl2);
-      }      
-      ncl++;
-    }
+       count =0;
+       for (Int_t dj=0;dj<cpositive[j];dj++){
+         Int_t   ic  = positivepair[j*10+dj];
+         Float_t chargedif = pos[ic].GetQ()-neg[j].GetQ();
+         if (TMath::Abs(chargedif)<minchargediff+3.) count++;
+       }
+       if (count>1) continue;  // more than one "proper" cluster for negative
+       
+       Int_t jp = 0;
+       
+       count =0;
+       for (Int_t dj=0;dj<cnegative[jp];dj++){
+         Int_t   ic = positivepair[jp*10+dj];
+         Float_t chargedif = pos[ic].GetQ()-neg[jp].GetQ();
+         if (TMath::Abs(chargedif)<minchargediff+4.) count++;
+       }
+       if (count>1) continue;   
+       if (fgPairs[ip*nn+j]<100) continue;
+       //
+       
+       //almost gold clusters
+       Float_t yp=pos[ip].GetY(); 
+       Float_t yn=neg[j].GetY();
+      
 
-  }
+       Float_t xt, zt;
+       seg->GetPadCxz(yn, yp, xt, zt);
+       
+       xbest=xt; zbest=zt; 
+
+       qbest=0.5*(pos[ip].GetQ()+neg[j].GetQ());
+
+       {
+         Double_t loc[3]={xbest,0.,zbest},trk[3]={0.,0.,0.};
+         mT2L->MasterToLocal(loc,trk);
+         lp[0]=trk[1];
+         lp[1]=trk[2];
+       }
+       lp[2]=0.0025*0.0025;  //SigmaY2
+       lp[3]=0.110*0.110;  //SigmaZ2   
+       lp[4]=qbest;        //Q
+       for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
+       for (Int_t ilab=0;ilab<3;ilab++){
+         milab[ilab] = pos[ip].GetLabel(ilab);
+         milab[ilab+3] = neg[j].GetLabel(ilab);
+       }
+       //
+       CheckLabels2(milab);
+        if ((neg[j].GetQ()==0)&&(pos[ip].GetQ()==0)) continue; // reject crosses of bad strips!!
+       ratio = (pos[ip].GetQ()-neg[j].GetQ())/(pos[ip].GetQ()+neg[j].GetQ());
+       milab[3]=(((ip<<10) + j)<<10) + idet; // pos|neg|det
+       Int_t info[3] = {pos[ip].GetNd(),neg[j].GetNd(),fNlayer[fModule]};
+       AliITSRecPoint * cl2;
+       if(clusters){
+         cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+                 
+         cl2->SetChargeRatio(ratio);           
+         cl2->SetType(10);
+         fgPairs[ip*nn+j]=10;
+         if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+           cl2->SetType(11);
+           fgPairs[ip*nn+j]=11;
+         }
+         cused1[ip]++;
+         cused2[j]++;      
+       }
+       else{
+         cl2 = new AliITSRecPoint(milab,lp,info);
+         cl2->SetChargeRatio(ratio);           
+         cl2->SetType(10);
+         fgPairs[ip*nn+j]=10;
+         if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+           cl2->SetType(11);
+           fgPairs[ip*nn+j]=11;
+         }
+         cused1[ip]++;
+         cused2[j]++;      
+         
+         fDetTypeRec->AddRecPoint(*cl2);
+       }      
+       ncl++;
+       
+      } // manyXmany
+    } // loop over Pside 1Dclusters
+    
+    
+  } // use charge matching
   
+  
+  // recover all the other crosses
   //  
   for (Int_t i=0; i<np; i++) {
-    Float_t ybest=1000,zbest=1000,qbest=0;
-    Float_t yp=pos[i].GetY()*fYpitchSSD
-    if (pos[i].GetQ()<3) continue;
+    Float_t xbest=1000,zbest=1000,qbest=0;
+    Float_t yp=pos[i].GetY(); 
+    if ((pos[i].GetQ()>0)&&(pos[i].GetQ()<3)) continue;
     for (Int_t j=0; j<nn; j++) {
     //    for (Int_t di = 0;di<cpositive[i];di++){
     //  Int_t j = negativepair[10*i+di];
-      if (neg[j].GetQ()<3) continue;
+      if ((neg[j].GetQ()>0)&&(neg[j].GetQ()<3)) continue;
+
+      if ((neg[j].GetQ()==0)&&(pos[i].GetQ()==0)) continue; // reject crosses of bad strips!!
+
       if (cused2[j]||cused1[i]) continue;      
-      if (pairs[i][j]>0 &&pairs[i][j]<100) continue;
+      if (fgPairs[i*nn+j]>0 &&fgPairs[i*nn+j]<100) continue;
       ratio = (pos[i].GetQ()-neg[j].GetQ())/(pos[i].GetQ()+neg[j].GetQ());      
-      Float_t yn=neg[j].GetY()*fYpitchSSD;
-      Float_t zt=(2*fHlSSD*tanp + yp - yn)/(tann+tanp);
-      Float_t yt=yn + tann*zt;
-      zt-=fHlSSD; yt-=fHwSSD;
-      if (TMath::Abs(yt)<fHwSSD+0.01)
-      if (TMath::Abs(zt)<fHlSSD+0.01*(neg[j].GetNd()+pos[i].GetNd())) {
-        ybest=yt; zbest=zt; 
+      Float_t yn=neg[j].GetY();
+      
+      Float_t xt, zt;
+      seg->GetPadCxz(yn, yp, xt, zt);
+      
+      if (TMath::Abs(xt)<hwSSD+0.01)
+      if (TMath::Abs(zt)<hlSSD+0.01*(neg[j].GetNd()+pos[i].GetNd())) {
+       xbest=xt; zbest=zt; 
+
         qbest=0.5*(pos[i].GetQ()+neg[j].GetQ());
-        lp[0]=-(-ybest+fYshift[fModule]);
-        lp[1]=  -zbest+fZshift[fModule];
+
+        {
+        Double_t loc[3]={xbest,0.,zbest},trk[3]={0.,0.,0.};
+        mT2L->MasterToLocal(loc,trk);
+        lp[0]=trk[1];
+        lp[1]=trk[2];
+        }
         lp[2]=0.0025*0.0025;  //SigmaY2
         lp[3]=0.110*0.110;  //SigmaZ2
 
@@ -829,33 +1276,33 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
        AliITSRecPoint * cl2;
        if(clusters){
          cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+
          cl2->SetChargeRatio(ratio);
          cl2->SetType(100+cpositive[j]+cnegative[i]);    
+
+         if(pos[i].GetQ()==0) cl2->SetType(200+cpositive[j]+cnegative[i]);
+         if(neg[j].GetQ()==0) cl2->SetType(300+cpositive[j]+cnegative[i]);
+
        }
        else{
          cl2 = new AliITSRecPoint(milab,lp,info);
          cl2->SetChargeRatio(ratio);
          cl2->SetType(100+cpositive[j]+cnegative[i]);
+         
+         if(pos[i].GetQ()==0) cl2->SetType(200+cpositive[j]+cnegative[i]);
+         if(neg[j].GetQ()==0) cl2->SetType(300+cpositive[j]+cnegative[i]);
+
          fDetTypeRec->AddRecPoint(*cl2);
        }
        ncl++;
-       //cl2->SetType(0);
-       /*
-         if (pairs[i][j]<100){
-         printf("problem:- %d\n", pairs[i][j]);
-         }
-         if (cnegative[i]<2&&cpositive[j]<2){
-         printf("problem:- %d\n", pairs[i][j]);
-         }
-       */
       }
     }
   }
-
-//   for (Int_t i=0; i<1000; i++) delete [] pairs[i];
-//   delete [] pairs;
+  delete [] cnegative;
+  delete [] cused1;
+  delete [] negativepair;
+  delete [] cpositive;
+  delete [] cused2;
+  delete [] positivepair;
 
 }
-
-
-