]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSClusterFinderV2SSD.cxx
Fixes for report #68312: Improper usage of TClonesArrays in ITS
[u/mrichter/AliRoot.git] / ITS / AliITSClusterFinderV2SSD.cxx
index 4d3c5c7eaee8d19de3ac1a02d6692ba34e3be6dd..3c71ad378e6d2a0bb55680aae0343f20a0696453 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.              *
 //            Implementation of the ITS clusterer V2 class                //
 //                                                                        //
 //          Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch            //
-//          Revised: Enrico Fragiacomo, enrico.fragiacomo@ts.infn.it      //
+//          Last revision: 13-05-09 Enrico Fragiacomo                     //
+//                                  enrico.fragiacomo@ts.infn.it          //
 //                                                                        //
 ///////////////////////////////////////////////////////////////////////////
 
 #include <Riostream.h>
-
+#include "AliLog.h"
 
 #include "AliITSClusterFinderV2SSD.h"
 #include "AliITSRecPoint.h"
+#include "AliITSRecPointContainer.h"
 #include "AliITSgeomTGeo.h"
 #include "AliITSDetTypeRec.h"
 #include "AliRawReader.h"
 #include "AliITSRawStreamSSD.h"
 #include <TClonesArray.h>
 #include "AliITSdigitSSD.h"
+#include "AliITSReconstructor.h"
 #include "AliITSCalibrationSSD.h"
+#include "AliITSsegmentationSSD.h"
 
 Short_t *AliITSClusterFinderV2SSD::fgPairs = 0x0;
 Int_t    AliITSClusterFinderV2SSD::fgPairsSize = 0;
+const Float_t  AliITSClusterFinderV2SSD::fgkThreshold = 5.;
+
+const Float_t AliITSClusterFinderV2SSD::fgkCosmic2008StripShifts[16][9] = 
+  {{-0.35,-0.35,-0.35,-0.35,-0.35,-0.35,-0.35,-0.35,-0.35},  // DDL 512
+   {-0.35,-0.35,-0.35,-0.35,-0.35,-0.35,-0.35,-0.35,-0.35},  // DDL 513
+   {-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15},  // DDL 514
+   {-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15},  // DDL 515
+   { 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00},  // DDL 516
+   { 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00},  // DDL 517
+   {-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15},  // DDL 518
+   {-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15},  // DDL 519
+   {-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.25,-0.15},  // DDL 520
+   {-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,-0.15},  // DDL 521
+   {-0.10,-0.10,-0.10,-0.40,-0.40,-0.40,-0.10,-0.10,-0.45},  // DDL 522
+   {-0.10,-0.10,-0.10,-0.35,-0.35,-0.35,-0.10,-0.35,-0.50},  // DDL 523
+   { 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00},  // DDL 524
+   { 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00},  // DDL 525
+   { 0.35, 0.35, 0.35, 0.35, 0.35, 0.35, 0.35, 0.35, 0.35},  // DDL 526
+   { 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45, 0.45}}; // DDL 527
 
 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) : AliITSClusterFinderV2(cf),                                            fLastSSD1(cf.fLastSSD1),
-fYpitchSSD(cf.fYpitchSSD),
-fHwSSD(cf.fHwSSD),
-fHlSSD(cf.fHlSSD),
-fTanP(cf.fTanP),
-fTanN(cf.fTanN)
+AliITSClusterFinderV2SSD::AliITSClusterFinderV2SSD(const AliITSClusterFinderV2SSD &cf) : AliITSClusterFinder(cf),                                              fLastSSD1(cf.fLastSSD1)
 {
   // Copy constructor
-
 }
 
 //______________________________________________________________________
@@ -88,45 +100,104 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
   //------------------------------------------------------------
   // Actual SSD cluster finder
   //------------------------------------------------------------
+  Int_t smaxall=alldigits->GetEntriesFast();
+  if (smaxall==0) return;
+
+
+  //---------------------------------------
+  // load recoparam and calibration
+  // 
+  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;
+  Float_t noise=0;
+  //---------------------------------------
 
-  Int_t smaxall=alldigits->GetEntriesFast();
-  if (smaxall==0) return;
-  //  TObjArray *digits = new TObjArray;
+
+  //------------------------------------
+  // fill the digits array with zero-suppression condition
+  // Signal is converted in KeV
+  //
   TObjArray digits;
   for (Int_t i=0;i<smaxall; i++){
     AliITSdigitSSD *d=(AliITSdigitSSD*)alldigits->UncheckedAt(i);
 
+    if(d->IsSideP()) noise = cal->GetNoiseP(d->GetStripNumber());  
+    else noise = cal->GetNoiseN(d->GetStripNumber());
+    if (d->GetSignal()<3.*noise) continue;
+
     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)
+    Float_t q=gain*d->GetSignal(); //
     q=cal->ADCToKeV(q); // converts the charge in KeV from ADC units
-    //Float_t q=d->GetSignal()/4.29;// temp. fix (for PID purposed - normalis. to be checked)
     d->SetSignal(Int_t(q));
 
-    if (d->GetSignal()<3) continue;
     digits.AddLast(d);
   }
   Int_t smax = digits.GetEntriesFast();
   if (smax==0) return;
+  //------------------------------------
+
   
   const Int_t kMax=1000;
   Int_t np=0, nn=0; 
   Ali1Dcluster pos[kMax], neg[kMax];
   Float_t y=0., q=0., qmax=0.; 
-  Int_t lab[4]={-2,-2,-2,-2};
+  Int_t lab[4]={-2,-2,-2,-2};  
+  Bool_t flag5 = 0;
   
+  /*
+  cout<<"-----------------------------"<<endl;
+  cout<<"this is module "<<fModule;
+  cout<<endl;
+  cout<<endl;
+  */
+
+  //--------------------------------------------------------
+  // start 1D-clustering from the first digit in the digits array
+  //
   AliITSdigitSSD *d=(AliITSdigitSSD*)digits.UncheckedAt(0);
   q += d->GetSignal();
   y += d->GetCoord2()*d->GetSignal();
   qmax=d->GetSignal();
   lab[0]=d->GetTrack(0); lab[1]=d->GetTrack(1); lab[2]=d->GetTrack(2);
+  
+  if(d->IsSideP()) {
+    noise = cal->GetNoiseP(d->GetStripNumber());  
+    gain = cal->GetGainP(d->GetStripNumber());
+  }
+  else {
+    noise = cal->GetNoiseN(d->GetStripNumber());
+    gain = cal->GetGainN(d->GetStripNumber());
+  }  
+  noise*=gain;
+  noise=cal->ADCToKeV(noise); // converts noise in KeV from ADC units
+
+  if(qmax>fgkThreshold*noise) flag5=1; // seed for the cluster
+
+  /*
+  cout<<d->GetSignal()<<" "<<noise<<" "<<flag5<<" "<<
+    d->GetCoord1()<<" "<<d->GetCoord2()<<endl;
+  */
+
   Int_t curr=d->GetCoord2();
   Int_t flag=d->GetCoord1();
+
+  // Note: the first side which will be processed is supposed to be the 
+  // P-side which is neg
   Int_t *n=&nn;
   Ali1Dcluster *c=neg;
+  if(flag) {n=&np; c=pos;} // in case we have only Nstrips (P was bad!)
+
   Int_t nd=1;
   Int_t milab[10];
   for (Int_t ilab=0;ilab<10;ilab++){
@@ -134,48 +205,94 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
   }
   milab[0]=d->GetTrack(0); milab[1]=d->GetTrack(1); milab[2]=d->GetTrack(2);
 
+
+  //----------------------------------------------------------
+  // search for neighboring digits
+  //
   for (Int_t s=1; s<smax; s++) {
       d=(AliITSdigitSSD*)digits.UncheckedAt(s);      
       Int_t strip=d->GetCoord2();
-      if ((strip-curr) > 1 || flag!=d->GetCoord1()) {
+
+      // if digits is not a neighbour or side did not change 
+      // and at least one of the previous digits met the seed condition
+      // then creates a new 1D cluster
+      if ( ( ((strip-curr) > 1) || (flag!=d->GetCoord1()) ) ) {
+
+       if(flag5) {
+         //cout<<"here1"<<endl;
          c[*n].SetY(y/q);
          c[*n].SetQ(q);
          c[*n].SetNd(nd);
         CheckLabels2(milab);
          c[*n].SetLabels(milab);
-         //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);
-        }       
+
+        if(repa->GetUseUnfoldingInClusterFinderSSD()==kTRUE) {
+          // Note: fUseUnfoldingInClusterFinderSSD=kFALSE by default in RecoParam
+
+          //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 !");
           return;
          }
+
+       } // flag5 set
+
+        // reset everything
          y=q=qmax=0.;
          nd=0;
+        flag5=0;
          lab[0]=lab[1]=lab[2]=-2;
-        //
-        for (Int_t ilab=0;ilab<10;ilab++){
-          milab[ilab]=-2;
-        }
-        //
-         if (flag!=d->GetCoord1()) { n=&np; c=pos; }
-      }
+        for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
+
+        // if side changed from P to N, switch to pos 1D clusters
+        // (if for some reason the side changed from N to P then do the opposite)
+         if (flag!=d->GetCoord1()) 
+          { if(!flag) {n=&np; c=pos;} else {n=&nn; c=neg;} }
+
+      } // end create new 1D cluster from previous neighboring digits
+
+      // continues adding digits to the previous cluster 
+      // or start a new one 
       flag=d->GetCoord1();
       q += d->GetSignal();
       y += d->GetCoord2()*d->GetSignal();
       nd++;
+
+      if(d->IsSideP()) {
+       noise = cal->GetNoiseP(d->GetStripNumber());  
+       gain = cal->GetGainP(d->GetStripNumber());
+      }
+      else {
+       noise = cal->GetNoiseN(d->GetStripNumber());
+       gain = cal->GetGainN(d->GetStripNumber());
+      }
+      noise*=gain;
+      noise=cal->ADCToKeV(noise); // converts the charge in KeV from ADC units
+
+      if(d->GetSignal()>fgkThreshold*noise) flag5=1;
+
+      /*
+  cout<<d->GetSignal()<<" "<<noise<<" "<<flag5<<" "<<
+    d->GetCoord1()<<" "<<d->GetCoord2()<<endl;
+      */
+
       if (d->GetSignal()>qmax) {
          qmax=d->GetSignal();
          lab[0]=d->GetTrack(0); lab[1]=d->GetTrack(1); lab[2]=d->GetTrack(2);
@@ -184,53 +301,89 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(TClonesArray *alldigits) {
        if (d->GetTrack(ilab)>=0) AddLabel(milab, (d->GetTrack(ilab))); 
       }
       curr=strip;
-  }
-  c[*n].SetY(y/q);
-  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) {
-        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);
-  }
-  (*n)++;
-  if (*n==kMax) {
-     Error("FindClustersSSD","Too many 1D clusters !");
-     return;
-  }
 
+
+  } // loop over digits, no more digits in the digits array
+
+
+  // add the last 1D cluster 
+  if(flag5) {
+
+    // cout<<"here2"<<endl;
+
+    c[*n].SetY(y/q);
+    c[*n].SetQ(q);
+    c[*n].SetNd(nd);
+    c[*n].SetLabels(lab);
+    
+    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);
+      }
+    } // unfolding is on
+    
+    (*n)++;
+    if (*n==kMax) {
+      Error("FindClustersSSD","Too many 1D clusters !");
+      return;
+    }
+
+  } // if flag5 last 1D cluster added
+
+
+  //------------------------------------------------------
+  // call FindClustersSSD to pair neg and pos 1D clusters 
+  // and create recpoints from the crosses
+  // Note1: neg are Pside and pos are Nside!!
+  // Note2: if there are no Pside digits nn=0 (bad strips!!) (same for Nside)
+  //
+  //  cout<<nn<<" Pside and "<<np<<" Nside clusters"<<endl;
   FindClustersSSD(neg, nn, pos, np);
+  //
+  //-----------------------------------------------------
+
 }
 
 
-void AliITSClusterFinderV2SSD::RawdataToClusters(AliRawReader* rawReader,TClonesArray** clusters){
+void AliITSClusterFinderV2SSD::RawdataToClusters(AliRawReader* rawReader){
 
     //------------------------------------------------------------
   // This function creates ITS clusters from raw data
   //------------------------------------------------------------
   rawReader->Reset();
   AliITSRawStreamSSD inputSSD(rawReader);
-  //  rawReader->SelectEquipment(-1,0,15);
-  FindClustersSSD(&inputSSD,clusters);
+  FindClustersSSD(&inputSSD);
   
 }
 
-void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input, 
-                                       TClonesArray** clusters) 
+void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input) 
 {
   //------------------------------------------------------------
   // Actual SSD cluster finder for raw data
   //------------------------------------------------------------
+
+  AliITSRecPointContainer* rpc = AliITSRecPointContainer::Instance();
+  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];
@@ -241,21 +394,18 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input,
   Int_t nDigits = 0;
   Float_t gain=0;
   Float_t noise=0.;
+  //  Float_t pedestal=0.;
   Float_t oldnoise=0.;
   AliITSCalibrationSSD* cal=NULL;
 
-  Int_t signal=0;
-  Int_t iModule;
   Int_t matrix[12][1536];
-  Int_t iddl=511;
-  Int_t iad=1;
-  Int_t ddl, ad, adc;
-  Int_t oddl = 0;
-  Int_t oad = 0;
-  Int_t oadc = 0;
-  Int_t ostrip = 0;
+  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 strip;
   Int_t n=0;
   Bool_t next=0;
 
@@ -264,144 +414,215 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input,
     
     // 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) { 
+    
+    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();
-      ddl=input->GetDDL(); 
-      ad=input->GetAD();
-           if((!next)&&(input->flag)) continue;
-      adc = input->GetADC(); adc = (adc<6)? adc : adc - 2;
-      strip = input->GetStrip();
+      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;
-      signal = input->GetSignal();
-      //cout<<ddl<<" "<<ad<<" "<<adc<<" "<<strip<<" "<<signal<<endl;
+      Int_t signal = input->GetSignal();
 
-      if((ddl==iddl)&&(ad==iad)) {n++; matrix[adc][strip] = signal;}
-      else {oddl=iddl; oad=iad; oadc = adc; ostrip = strip; osignal=signal; iddl=ddl; iad=ad; break;}
+      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) 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;
+    n=0; //osignal=0;
 
+    Float_t dStrip = 0;
+    if (repa->GetUseCosmicRunShiftsSSD()) {  // Special condition for 2007/2008 cosmic data
+      dStrip = fgkCosmic2008StripShifts[oddl][oad-1];
+    }
+    if (TMath::Abs(dStrip) > 1.5)
+      AliError(Form("Indexing error ? oddl = %d, dStrip %f\n",oddl,dStrip));
     // 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;
-      iModule = AliITSRawStreamSSD::GetModuleNumber(oddl,iimod);
+      Int_t iModule = AliITSRawStreamSSD::GetModuleNumber(oddl,iimod);
       if(iModule==-1) continue;
-      //cout<<"ddl="<<oddl<<" ad"<<oad<<" module="<<iModule<<endl;
       cal = (AliITSCalibrationSSD*)GetResp(iModule);
 
       Bool_t first = 0;
-
+      Bool_t flag5 = 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;
+       
+      }
+      */
 
-       signal = matrix[iadc][istrip];
+      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);
+       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
-         //cout<<"ddl="<<oddl<<" ad"<<oad<<" module="<<iModule<<" strip= "<<istrip<<
-         //        " sig="<<signal<<endl;
+         if(signal>fgkThreshold*noise) flag5=1;
          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>0) && flag5 ) {
+           
+           Ali1Dcluster& cluster = clusters1D[0][nClusters[0]++];
 
-         if ( ((nDigits==1)&&(q>5*oldnoise)) || (nDigits>1) ) {
+           if(q!=0) cluster.SetY(y/q + dStrip);
+           else cluster.SetY(istrip + dStrip -1);
 
-           Ali1Dcluster& cluster = clusters1D[0][nClusters[0]++];
-           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[0] == kMax) {
-               Error("FindClustersSSD", "Too many 1D clusters !");
-               return;
+           if(repa->GetUseUnfoldingInClusterFinderSSD()==kTRUE) {
+             
+             //Split suspiciously big cluster
+             if (nDigits > 4&&nDigits < 25) {
+               if(q!=0) cluster.SetY(y/q + dStrip - 0.25*nDigits);
+               else cluster.SetY(istrip-1 + dStrip - 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 + dStrip + 0.25*nDigits);
+               else cluster2.SetY(istrip-1 + dStrip + 0.25*nDigits);
+               cluster2.SetQ(0.5*q);
+               cluster2.SetNd(nDigits);
+               cluster2.SetLabels(lab);
              }
-             Ali1Dcluster& cluster2 = clusters1D[0][nClusters[0]++];
-             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;
+         flag5=0;
        }
-
+       
       } // loop over strip on P-side
-
+      
       // if last strip does have signal
       if(first) {
        
-         if ( ((nDigits==1)&&(q>5*oldnoise)) || (nDigits>1) ) {
+         if ( (nDigits>0) && flag5 ) {
+         
+         Ali1Dcluster& cluster = clusters1D[0][nClusters[0]++];
 
-           Ali1Dcluster& cluster = clusters1D[0][nClusters[0]++];
-           cluster.SetY(y/q);
-           cluster.SetQ(q);
-           cluster.SetNd(nDigits);
-           cluster.SetLabels(lab);
+         if(q!=0) cluster.SetY(y/q + dStrip);
+         else cluster.SetY(istrip - 1 + dStrip);
+
+         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);
+             if(q!=0) cluster.SetY(y/q + dStrip - 0.25*nDigits);
+             else cluster.SetY(istrip-1 + dStrip - 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]++];
-             cluster2.SetY(y/q + 0.25*nDigits);
+             if(q!=0) cluster2.SetY(y/q + dStrip + 0.25*nDigits);
+             else cluster2.SetY(istrip-1 + dStrip + 0.25*nDigits);
              cluster2.SetQ(0.5*q);
              cluster2.SetNd(nDigits);
              cluster2.SetLabels(lab);
            }
-           
-         }
-         y = q = 0.;
-         nDigits = 0;
-         first=0;
+         } // unfolding is on    
+         
+       }
+       y = q = 0.;
+       nDigits = 0;
+       first=0;
+       flag5=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.;
-      for(Int_t istrip=768; istrip<1536; istrip++) { // N-side
+      Int_t strip=0;
+      for(Int_t iistrip=768; iistrip<1536; iistrip++) { // N-side
        
-       signal = matrix[iadc][istrip];
-       strip = 1535-istrip;
+       Int_t signal = TMath::Abs(matrix[iadc][iistrip]);
+       strip = 1535-iistrip;
+
        oldnoise = noise;
-       noise = cal->GetNoiseN(strip);
+       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 (signal!=65535) {
          gain = cal->GetGainN(strip);
          signal = (Int_t) ( signal * gain); // signal is corrected for gain
+         if(signal>fgkThreshold*noise) flag5=1;
          signal = (Int_t) cal->ADCToKeV( signal ); // signal is  converted in KeV 
          
          // add digit to current cluster
@@ -412,80 +633,93 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input,
        }
 
        else if(first) {
-
-         if ( ((nDigits==1)&&(q>5*oldnoise)) || (nDigits>1) ) {
+         
+         if ( (nDigits>0) && flag5 ) {
            
            Ali1Dcluster& cluster = clusters1D[1][nClusters[1]++];
-           cluster.SetY(y/q);
+
+           if(q!=0) cluster.SetY(y/q - dStrip);
+           else cluster.SetY(strip+1 - dStrip);
+
            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[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);
-           }
-           
-         }
+           if(repa->GetUseUnfoldingInClusterFinderSSD()==kTRUE) {
+
+             //Split suspiciously big cluster
+             if (nDigits > 4&&nDigits < 25) {
+               cluster.SetY(y/q - dStrip - 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 - dStrip + 0.25*nDigits);
+               cluster2.SetQ(0.5*q);
+               cluster2.SetNd(nDigits);
+               cluster2.SetLabels(lab);
+             }       
+           } // unfolding is on
+         } 
+
          y = q = 0.;
          nDigits = 0;
          first=0;        
+       flag5=0;
        }
        
       } // loop over strips on N-side
 
       if(first) {
        
-         if ( ((nDigits==1)&&(q>5*oldnoise)) || (nDigits>1) ) {
+         if ( (nDigits>0) && flag5 ) {
+         
+         Ali1Dcluster& cluster = clusters1D[1][nClusters[1]++];
+         
+         if(q!=0) cluster.SetY(y/q - dStrip);
+         else cluster.SetY(strip - dStrip + 1);
 
-           Ali1Dcluster& cluster = clusters1D[1][nClusters[1]++];
-           cluster.SetY(y/q);
-           cluster.SetQ(q);
-           cluster.SetNd(nDigits);
-           cluster.SetLabels(lab);
+         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);
+             if(q!=0) cluster.SetY(y/q - dStrip - 0.25*nDigits);
+             else cluster.SetY(strip+1 - dStrip - 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);
+             if(q!=0) cluster2.SetY(y/q - dStrip + 0.25*nDigits);
+             else cluster2.SetY(strip+1 - dStrip + 0.25*nDigits);
              cluster2.SetQ(0.5*q);
              cluster2.SetNd(nDigits);
              cluster2.SetLabels(lab);
            }
-           
-         }
-         y = q = 0.;
-         nDigits = 0;
-         first=0;        
+         } // unfolding is on      
+       }
+
+       y = q = 0.;
+       nDigits = 0;
+       first=0;          
+       flag5=0;
       }
       
       // create recpoints
-      if((nClusters[0])&&(nClusters[1])) {
-       //cout<<"creating recpoint for module="<<iModule<<" "<<nClusters[0]<<" "<<nClusters[1]<<endl;
-       clusters[iModule] = new TClonesArray("AliITSRecPoint");
+      if((nClusters[0])&&(nClusters[1])) {     
        fModule = iModule;
-       //      fModule = 500;
+       TClonesArray* clusters = rpc->UncheckedGetClusters(fModule);
        FindClustersSSD(&clusters1D[0][0], nClusters[0], 
-                       &clusters1D[1][0], nClusters[1], clusters[iModule]);
-       Int_t nClusters = clusters[iModule]->GetEntriesFast();
-       nClustersSSD += nClusters;
+                       &clusters1D[1][0], nClusters[1], clusters);
+       Int_t nClustersn = clusters->GetEntriesFast();
+       nClustersSSD += nClustersn;
       }
 
       nClusters[0] = nClusters[1] = 0;
@@ -494,10 +728,10 @@ void AliITSClusterFinderV2SSD::FindClustersSSD(AliITSRawStreamSSD* input,
 
     } // loop over adc
 
-    if((!next)||(iddl==528)) break;
+    if(!next) break;
   }
   
-  Info("FindClustersSSD", "found clusters in ITS SSD: %d", nClustersSSD);
+  AliDebug(1,Form("found clusters in ITS SSD: %d", nClustersSSD));
 }
 
 void AliITSClusterFinderV2SSD::
@@ -508,28 +742,48 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
   // Actual SSD cluster finder
   //------------------------------------------------------------
 
-  //  Float_t xyz[3];
-
   const TGeoHMatrix *mT2L=AliITSgeomTGeo::GetTracking2LocalMatrix(fModule);
 
+  //---------------------------------------
+  // load recoparam
+  // 
+  static AliITSRecoParam *repa = NULL;  
+  if(!repa){
+    repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
+    if(!repa){
+      repa = AliITSRecoParam::GetHighFluxParam();
+      AliWarning("Using default AliITSRecoParam class");
+    }
+  }
+
   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;}
+  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];
@@ -540,310 +794,435 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t 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())) {
-       negativepair[i*10+cnegative[i]] =j;  //index
-       positivepair[j*10+cpositive[j]] =i;
-       cnegative[i]++;  //counters
-       cpositive[j]++; 
-       fgPairs[i*nn+j]=100;
+      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);
+      //cout<<yn<<" "<<yp<<" "<<xt<<" "<<zt<<endl;
+      
+      if (TMath::Abs(xt)<hwSSD)
+      if (TMath::Abs(zt)<hlSSD) {
+       Int_t in = i*10+cnegative[i];
+       Int_t ip = j*10+cpositive[j];
+       if ((in < 10*np) && (ip < 10*nn)) {
+         negativepair[in] =j;  //index
+         positivepair[ip] =i;
+         cnegative[i]++;  //counters
+         cpositive[j]++;       
+         fgPairs[i*nn+j]=100;
+       }
+       else
+         AliError(Form("Index out of range: ip=%d, in=%d",ip,in));
       }
     }
   }
 
-  //
+  /* //
   // 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]++; 
-       fgPairs[i*nn+j]=100;
+       Int_t in = i*10+cnegative[i];
+       Int_t ip = j*10+cpositive[j];
+       if ((in < 10*np) && (ip < 10*nn)) {
+         negativepair[in] =j;  //index
+         positivepair[ip] =i;
+         cnegative[i]++;  //counters
+         cpositive[j]++;       
+         fgPairs[i*nn+j]=100;
+       }
+       else
+         AliError(Form("Index out of range: ip=%d, in=%d",ip,in));
       }
     }
   }
+  */
 
   //
-  Float_t lp[5];
+  Float_t lp[6];
   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;
+
+  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());
-      {
-      Double_t loc[3]={ybest,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);
-      }
+    // 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){  // Note clusters != 0 when method is called for rawdata
+      // 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;
+       }
 
+       ratio = (pos[ip].GetQ()-neg[j].GetQ())/(pos[ip].GetQ()+neg[j].GetQ());
+       //cout<<"ratio="<<ratio<<endl;
 
-       cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+       // 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
 
-       //      cl2-> GetGlobalXYZ(xyz); cout<<"rec "<<xyz[0]<<" "<<xyz[1]<<" "<<xyz[2]<<endl;
+       //
+       Float_t yn=neg[j].GetY();
+       
+       Float_t xt, zt;
+       seg->GetPadCxz(yn, yp, xt, zt);
+       
+       xbest=xt; zbest=zt; 
 
-       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;
+       
+       qbest=0.5*(pos[ip].GetQ()+neg[j].GetQ());
+       if( (pos[ip].GetQ()==0)||(neg[j].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]++;
+       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]};
+
+       lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+       lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+       // out-of-diagonal element of covariance matrix
+       if( (info[0]==1) && (info[1]==1) ) lp[5]=-0.00012;
+       else if ( (info[0]>1) && (info[1]>1) ) { 
+         lp[2]=2.63e-06;    // 0.0016*0.0016;  //SigmaY2
+         lp[3]=0.0065;      // 0.08*0.08;   //SigmaZ2
+         lp[5]=-6.48e-05;
+       }
+       else {
+         lp[2]=4.80e-06;      // 0.00219*0.00219
+         lp[3]=0.0093;        // 0.0964*0.0964;
+         if (info[0]==1) {
+           lp[5]=-0.00014;
+         }
+         else { 
+           lp[2]=2.79e-06;    // 0.0017*0.0017; 
+           lp[3]=0.00935;     // 0.967*0.967;
+           lp[5]=-4.32e-05;
+         }
+       }
+
+       AliITSRecPoint * cl2;
        
-      }
-      else{ // Note clusters == 0 when method is called for digits
+       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;
 
-       cl2 = new AliITSRecPoint(milab,lp,info);        
+         if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+           cl2->SetType(2);
+           fgPairs[ip*nn+j]=2;
+         }
 
-       //      cl2-> GetGlobalXYZ(xyz); cout<<"rec "<<xyz[0]<<" "<<xyz[1]<<" "<<xyz[2]<<endl;
+         if(pos[ip].GetQ()==0) cl2->SetType(3);
+         if(neg[j].GetQ()==0) cl2->SetType(4);
 
-       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;
+         cused1[ip]++;
+         cused2[j]++;
+         
        }
-       cused1[ip]++;
-       cused2[j]++;
-       //cout<<"AliITSClusterFinderV2SSD "<<fModule<<" gold"<<endl;
-       fDetTypeRec->AddRecPoint(*cl2);
-      }
-      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 (fgPairs[ip*nn+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();
-          {
-          Double_t loc[3]={ybest,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
+       else{ // Note clusters == 0 when method is called for digits
          
-         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]};
-
-         AliITSRecPoint * cl2;
-         if(clusters){
+         cl2 = new AliITSRecPoint(milab,lp,info);      
+         
+         cl2->SetChargeRatio(ratio);           
+         cl2->SetType(1);
+         fgPairs[ip*nn+j]=1;
 
-           cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+         if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+           cl2->SetType(2);
+           fgPairs[ip*nn+j]=2;
+         }
 
-           //  cl2-> GetGlobalXYZ(xyz); cout<<"rec "<<xyz[0]<<" "<<xyz[1]<<" "<<xyz[2]<<endl;
+         if(pos[ip].GetQ()==0) cl2->SetType(3);
+         if(neg[j].GetQ()==0) cl2->SetType(4);
 
-           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;
-           }
-           //cout<<"AliITSClusterFinderV2SSD "<<fModule<<" silver1"<<endl;
+         cused1[ip]++;
+         cused2[j]++;
 
-           fDetTypeRec->AddRecPoint(*cl2);
-         }
-         ncl++;
+         fDetTypeRec->AddRecPoint(*cl2);
        }
+       ncl++;
+      }
+    }
+    
+    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();
        
-       //
-       // add second pair
-       
-      //       if (!(cused1[ip2] || cused2[in])){  //
-       if (fgPairs[ip2*nn+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();
-          {
-          Double_t loc[3]={ybest,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
+
+
+       ratio = (pcharge-neg[in].GetQ())/(pcharge+neg[in].GetQ());
+       if ( (TMath::Abs(ratio)<0.2) && (pcharge!=0) ) {
+         //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[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]};
-         
-         AliITSRecPoint * cl2;
-         if(clusters){
-           cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+         // 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; 
 
-           //  cl2-> GetGlobalXYZ(xyz); cout<<"rec "<<xyz[0]<<" "<<xyz[1]<<" "<<xyz[2]<<endl;
+           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[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]};
+           
+       lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+       lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+       // out-of-diagonal element of covariance matrix
+       if( (info[0]==1) && (info[1]==1) ) lp[5]=-0.00012;
+       else if ( (info[0]>1) && (info[1]>1) ) { 
+         lp[2]=2.63e-06;    // 0.0016*0.0016;  //SigmaY2
+         lp[3]=0.0065;      // 0.08*0.08;   //SigmaZ2
+         lp[5]=-6.48e-05;
+       }
+       else {
+         lp[2]=4.80e-06;      // 0.00219*0.00219
+         lp[3]=0.0093;        // 0.0964*0.0964;
+         if (info[0]==1) {
+           lp[5]=-0.00014;
+         }
+         else { 
+           lp[2]=2.79e-06;    // 0.0017*0.0017; 
+           lp[3]=0.00935;     // 0.967*0.967;
+           lp[5]=-4.32e-05;
+         }
+       }
 
-           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;
+       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++;
          }
-         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;
+         
+         
+         //
+         // add second pair
+         
+         //    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[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]};
            
-           //   cout<<"AliITSClusterFinderV2SSD "<<fModule<<" silver2"<<endl;
-           fDetTypeRec->AddRecPoint(*cl2);
+       lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+       lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+       // out-of-diagonal element of covariance matrix
+       if( (info[0]==1) && (info[1]==1) ) lp[5]=-0.00012;
+       else if ( (info[0]>1) && (info[1]>1) ) { 
+         lp[2]=2.63e-06;    // 0.0016*0.0016;  //SigmaY2
+         lp[3]=0.0065;      // 0.08*0.08;   //SigmaZ2
+         lp[5]=-6.48e-05;
+       }
+       else {
+         lp[2]=4.80e-06;      // 0.00219*0.00219
+         lp[3]=0.0093;        // 0.0964*0.0964;
+         if (info[0]==1) {
+           lp[5]=-0.00014;
          }
-         ncl++;
-       }       
-       cused1[ip]++;
-       cused1[ip2]++;
-       cused2[in]++;
-      }
-    }    
-  }
+         else { 
+           lp[2]=2.79e-06;    // 0.0017*0.0017; 
+           lp[3]=0.00935;     // 0.967*0.967;
+           lp[5]=-4.32e-05;
+         }
+       }
 
-  //  
-  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){
+           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;
+             }
+           }
+           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++;
+         }
+         
+         cused1[ip]++;
+         cused1[ip2]++;
+         cused2[in]++;
+
+       } // 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 (fgPairs[ip*nn+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();
-          {
-          Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
-          mT2L->MasterToLocal(loc,trk);
-          lp[0]=trk[1];
-          lp[1]=trk[2];
+       
+
+       ratio = (pcharge-pos[ip].GetQ())/(pcharge+pos[ip].GetQ());
+       if ( (TMath::Abs(ratio)<0.2) && (pcharge!=0) ) {
+
+         /*
+       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
          
          lp[4]=qbest;        //Q
          for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
@@ -857,12 +1236,32 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          milab[3]=(((ip<<10) + jn)<<10) + idet; // pos|neg|det
          Int_t info[3] = {pos[ip].GetNd(),neg[jn].GetNd(),fNlayer[fModule]};
 
+       lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+       lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+       // out-of-diagonal element of covariance matrix
+       if( (info[0]==1) && (info[1]==1) ) lp[5]=-0.00012;
+       else if ( (info[0]>1) && (info[1]>1) ) { 
+         lp[2]=2.63e-06;    // 0.0016*0.0016;  //SigmaY2
+         lp[3]=0.0065;      // 0.08*0.08;   //SigmaZ2
+         lp[5]=-6.48e-05;
+       }
+       else {
+         lp[2]=4.80e-06;      // 0.00219*0.00219
+         lp[3]=0.0093;        // 0.0964*0.0964;
+         if (info[0]==1) {
+           lp[5]=-0.00014;
+         }
+         else { 
+           lp[2]=2.79e-06;    // 0.0017*0.0017; 
+           lp[3]=0.00935;     // 0.967*0.967;
+           lp[5]=-4.32e-05;
+         }
+       }
+
          AliITSRecPoint * cl2;
          if(clusters){
            cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
 
-           //  cl2-> GetGlobalXYZ(xyz); cout<<"rec "<<xyz[0]<<" "<<xyz[1]<<" "<<xyz[2]<<endl;
-
            cl2->SetChargeRatio(ratio);         
            cl2->SetType(7);
            fgPairs[ip*nn+jn] =7;
@@ -881,7 +1280,6 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
              cl2->SetType(8);
              fgPairs[ip*nn+jn]=8;
            }
-           //cout<<"AliITSClusterFinderV2SSD "<<fModule<<" silverN1"<<endl;
 
            fDetTypeRec->AddRecPoint(*cl2);
          }
@@ -890,23 +1288,25 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
        //
        // add second pair
        //      if (!(cused1[ip]||cused2[jn2])){
-       if (fgPairs[ip*nn+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();
+
           {
-          Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
+          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++){
@@ -918,11 +1318,33 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          ratio = (pos[ip].GetQ()-neg[jn2].GetQ())/(pos[ip].GetQ()+neg[jn2].GetQ());
          milab[3]=(((ip<<10) + jn2)<<10) + idet; // pos|neg|det
          Int_t info[3] = {pos[ip].GetNd(),neg[jn2].GetNd(),fNlayer[fModule]};
+
+       lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+       lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+       // out-of-diagonal element of covariance matrix
+       if( (info[0]==1) && (info[1]==1) ) lp[5]=-0.00012;
+       else if ( (info[0]>1) && (info[1]>1) ) { 
+         lp[2]=2.63e-06;    // 0.0016*0.0016;  //SigmaY2
+         lp[3]=0.0065;      // 0.08*0.08;   //SigmaZ2
+         lp[5]=-6.48e-05;
+       }
+       else {
+         lp[2]=4.80e-06;      // 0.00219*0.00219
+         lp[3]=0.0093;        // 0.0964*0.0964;
+         if (info[0]==1) {
+           lp[5]=-0.00014;
+         }
+         else { 
+           lp[2]=2.79e-06;    // 0.0017*0.0017; 
+           lp[3]=0.00935;     // 0.967*0.967;
+           lp[5]=-4.32e-05;
+         }
+       }
+
          AliITSRecPoint * cl2;
          if(clusters){
            cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
 
-           //  cl2-> GetGlobalXYZ(xyz); cout<<"rec "<<xyz[0]<<" "<<xyz[1]<<" "<<xyz[2]<<endl;
 
            cl2->SetChargeRatio(ratio);         
            fgPairs[ip*nn+jn2]=7;
@@ -942,7 +1364,6 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
              cl2->SetType(8);
              fgPairs[ip*nn+jn2]=8;
            }
-           //cout<<"AliITSClusterFinderV2SSD "<<fModule<<" silverN2"<<endl;
 
            fDetTypeRec->AddRecPoint(*cl2);
          }
@@ -952,148 +1373,329 @@ 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      
+    
+    for (Int_t ip=0;ip<np;ip++){
 
-      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
+      if(cused1[ip]) continue;
+
+
+      Float_t xbest=1000,zbest=1000,qbest=0;
       //
-      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;
+      // 2x2 clusters
       //
-      //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());
-      {
-      Double_t loc[3]={ybest,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);
-      }
+      if ( (cnegative[ip]==2) && cpositive[negativepair[10*ip]]==2){ 
+       Float_t minchargediff =4.;
+       Float_t minchargeratio =0.2;
+
+       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();
+         ratio = (pos[ip].GetQ()-neg[jc].GetQ())/(pos[ip].GetQ()+neg[jc].GetQ()); 
+         //if (TMath::Abs(chargedif)<minchargediff){
+         if (TMath::Abs(ratio)<0.2){
+           j =jc;
+           minchargediff = TMath::Abs(chargedif);
+           minchargeratio = TMath::Abs(ratio);
+         }
+       }
+       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 (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[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]};
+
+       lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+       lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+       // out-of-diagonal element of covariance matrix
+       if( (info[0]==1) && (info[1]==1) ) lp[5]=-0.00012;
+       else if ( (info[0]>1) && (info[1]>1) ) { 
+         lp[2]=2.63e-06;    // 0.0016*0.0016;  //SigmaY2
+         lp[3]=0.0065;      // 0.08*0.08;   //SigmaZ2
+         lp[5]=-6.48e-05;
+       }
+       else {
+         lp[2]=4.80e-06;      // 0.00219*0.00219
+         lp[3]=0.0093;        // 0.0964*0.0964;
+         if (info[0]==1) {
+           lp[5]=-0.00014;
+         }
+         else { 
+           lp[2]=2.79e-06;    // 0.0017*0.0017; 
+           lp[3]=0.00935;     // 0.967*0.967;
+           lp[5]=-4.32e-05;
+         }
+       }
+
+       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++;
+       
+      } // 2X2
+    } // loop over Pside 1Dclusters
+
+
+
+    for (Int_t ip=0;ip<np;ip++){
+
+      if(cused1[ip]) continue;
+
+
+      Float_t xbest=1000,zbest=1000,qbest=0;
       //
-      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-> GetGlobalXYZ(xyz); cout<<"rec "<<xyz[0]<<" "<<xyz[1]<<" "<<xyz[2]<<endl;
-
-       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;
+      // manyxmany 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);
+         }
        }
-       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;
+       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
+       //
+       
+       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;
+       //
        
-       //cout<<"AliITSClusterFinderV2SSD "<<fModule<<" 2x2"<<endl;
+       //almost gold clusters
+       Float_t yp=pos[ip].GetY(); 
+       Float_t yn=neg[j].GetY();
+      
 
-       fDetTypeRec->AddRecPoint(*cl2);
-      }      
-      ncl++;
-    }
+       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[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]};
+
+       lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+       lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+       // out-of-diagonal element of covariance matrix
+       if( (info[0]==1) && (info[1]==1) ) lp[5]=-0.00012;
+       else if ( (info[0]>1) && (info[1]>1) ) { 
+         lp[2]=2.63e-06;    // 0.0016*0.0016;  //SigmaY2
+         lp[3]=0.0065;      // 0.08*0.08;   //SigmaZ2
+         lp[5]=-6.48e-05;
+       }
+       else {
+         lp[2]=4.80e-06;      // 0.00219*0.00219
+         lp[3]=0.0093;        // 0.0964*0.0964;
+         if (info[0]==1) {
+           lp[5]=-0.00014;
+         }
+         else { 
+           lp[2]=2.79e-06;    // 0.0017*0.0017; 
+           lp[3]=0.00935;     // 0.967*0.967;
+           lp[5]=-4.32e-05;
+         }
+       }
+
+       AliITSRecPoint * cl2;
+       if(clusters){
+         cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
+                 
+         cl2->SetChargeRatio(ratio);           
+         cl2->SetType(12);
+         fgPairs[ip*nn+j]=12;
+         if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+           cl2->SetType(13);
+           fgPairs[ip*nn+j]=13;
+         }
+         cused1[ip]++;
+         cused2[j]++;      
+       }
+       else{
+         cl2 = new AliITSRecPoint(milab,lp,info);
+         cl2->SetChargeRatio(ratio);           
+         cl2->SetType(12);
+         fgPairs[ip*nn+j]=12;
+         if ((pos[ip].GetNd()+neg[j].GetNd())>6){ //multi cluster
+           cl2->SetType(13);
+           fgPairs[ip*nn+j]=13;
+         }
+         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 (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)
+      if (TMath::Abs(zt)<hlSSD) {
+       xbest=xt; zbest=zt; 
+
         qbest=0.5*(pos[i].GetQ()+neg[j].GetQ());
+
         {
-        Double_t loc[3]={ybest,0.,zbest},trk[3]={0.,0.,0.};
+        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++){
@@ -1104,38 +1706,304 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
        CheckLabels2(milab);
        milab[3]=(((i<<10) + j)<<10) + idet; // pos|neg|det
        Int_t info[3] = {pos[i].GetNd(),neg[j].GetNd(),fNlayer[fModule]};
+
+       lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+       lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+       // out-of-diagonal element of covariance matrix
+       if( (info[0]==1) && (info[1]==1) ) lp[5]=-0.00012;
+       else if ( (info[0]>1) && (info[1]>1) ) { 
+         lp[2]=2.63e-06;    // 0.0016*0.0016;  //SigmaY2
+         lp[3]=0.0065;      // 0.08*0.08;   //SigmaZ2
+         lp[5]=-6.48e-05;
+       }
+       else {
+         lp[2]=4.80e-06;      // 0.00219*0.00219
+         lp[3]=0.0093;        // 0.0964*0.0964;
+         if (info[0]==1) {
+           lp[5]=-0.00014;
+         }
+         else { 
+           lp[2]=2.79e-06;    // 0.0017*0.0017; 
+           lp[3]=0.00935;     // 0.967*0.967;
+           lp[5]=-4.32e-05;
+         }
+       }
+
        AliITSRecPoint * cl2;
        if(clusters){
          cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);
 
-         //    cl2-> GetGlobalXYZ(xyz); cout<<"rec "<<xyz[0]<<" "<<xyz[1]<<" "<<xyz[2]<<endl;
-
          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]);
          
-         //cout<<"AliITSClusterFinderV2SSD "<<fModule<<" other"<<endl;
+         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 (fgPairs[i*nn+j]<100){
-         printf("problem:- %d\n", fgPairs[i*nn+j]);
-         }
-         if (cnegative[i]<2&&cpositive[j]<2){
-         printf("problem:- %d\n", fgPairs[i*nn+j]);
-         }
-       */
       }
     }
   }
 
-}
 
 
+  if(repa->GetUseBadChannelsInClusterFinderSSD()==kTRUE) {
+    
+    //---------------------------------------------------------
+    // recover crosses of good 1D clusters with bad strips on the other side
+    // Note1: at first iteration skip modules with a bad side (or almost), (would produce too many fake!) 
+    // Note2: for modules with a bad side see below 
+    
+    AliITSCalibrationSSD* cal = (AliITSCalibrationSSD*)GetResp(fModule);
+    Int_t countPbad=0, countNbad=0;
+    for(Int_t ib=0; ib<768; ib++) {
+      if(cal->IsPChannelBad(ib)) countPbad++;
+      if(cal->IsNChannelBad(ib)) countNbad++;
+    }
+    //  AliInfo(Form("module %d has %d P- and %d N-bad strips",fModule,countPbad,countNbad));
+    
+    if( (countPbad<100) && (countNbad<100) ) { // no bad side!!
+      
+      for (Int_t i=0; i<np; i++) { // loop over Nside 1Dclusters with no crosses
+       if(cnegative[i]) continue; // if intersecting Pside clusters continue;
+       
+       //      for(Int_t ib=0; ib<768; ib++) { // loop over all Pstrips
+       for(Int_t ib=15; ib<753; ib++) { // loop over all Pstrips
+         
+         if(cal->IsPChannelBad(ib)) { // check if strips is bad
+           Float_t yN=pos[i].GetY();   
+           Float_t xt, zt;
+           seg->GetPadCxz(1.*ib, yN, xt, zt);  
+           
+           //----------
+           // bad Pstrip is crossing the Nside 1Dcluster -> create recpoint
+           // 
+           if ( (TMath::Abs(xt)<hwSSD) && (TMath::Abs(zt)<hlSSD) ) {
+             Double_t loc[3]={xt,0.,zt},trk[3]={0.,0.,0.};
+             mT2L->MasterToLocal(loc,trk);
+             lp[0]=trk[1];
+             lp[1]=trk[2];        
+             lp[4]=pos[i].GetQ(); //Q
+             for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
+             for (Int_t ilab=0;ilab<3;ilab++) milab[ilab] = pos[i].GetLabel(ilab);       
+             CheckLabels2(milab);
+             milab[3]=( (i<<10) << 10 ) + idet; // pos|neg|det
+             Int_t info[3] = {pos[i].GetNd(),0,fNlayer[fModule]};
+             
+             lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+             lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+             lp[5]=-0.00012; // out-of-diagonal element of covariance matrix
+             if (info[0]>1) {
+               lp[2]=4.80e-06;
+               lp[3]=0.0093;
+               lp[5]=0.00014;
+             }
+                     
+             AliITSRecPoint * cl2;
+             if(clusters){
+               cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);          
+               cl2->SetChargeRatio(1.);
+             cl2->SetType(50);   
+             }
+             else{
+               cl2 = new AliITSRecPoint(milab,lp,info);
+               cl2->SetChargeRatio(1.);
+               cl2->SetType(50);
+               fDetTypeRec->AddRecPoint(*cl2);
+             }
+             ncl++;
+           } // cross is within the detector
+           //
+           //--------------
+           
+         } // bad Pstrip
+         
+       } // end loop over Pstrips
+       
+      } // end loop over Nside 1D clusters
+      
+      for (Int_t j=0; j<nn; j++) { // loop over Pside 1D clusters with no crosses
+       if(cpositive[j]) continue;
+       
+       //      for(Int_t ib=0; ib<768; ib++) { // loop over all Nside strips
+       for(Int_t ib=15; ib<753; ib++) { // loop over all Nside strips
+         
+         if(cal->IsNChannelBad(ib)) { // check if strip is bad
+           Float_t yP=neg[j].GetY();   
+           Float_t xt, zt;
+           seg->GetPadCxz(yP, 1.*ib, xt, zt);  
+           
+           //----------
+           // bad Nstrip is crossing the Pside 1Dcluster -> create recpoint
+           // 
+           if ( (TMath::Abs(xt)<hwSSD) && (TMath::Abs(zt)<hlSSD) ) {
+             Double_t loc[3]={xt,0.,zt},trk[3]={0.,0.,0.};
+             mT2L->MasterToLocal(loc,trk);
+             lp[0]=trk[1];
+             lp[1]=trk[2];        
+             lp[4]=neg[j].GetQ(); //Q
+             for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
+             for (Int_t ilab=0;ilab<3;ilab++) milab[ilab] = neg[j].GetLabel(ilab);       
+             CheckLabels2(milab);
+             milab[3]=( j << 10 ) + idet; // pos|neg|det
+             Int_t info[3]={0,(Int_t)neg[j].GetNd(),fNlayer[fModule]};
+             
+             lp[2]=4.968e-06;     // 0.00223*0.00223;  //SigmaY2
+             lp[3]=0.012;         // 0.110*0.110;  //SigmaZ2
+             lp[5]=-0.00012; // out-of-diagonal element of covariance matrix
+             if (info[0]>1) {
+               lp[2]=2.79e-06;
+               lp[3]=0.00935;
+               lp[5]=-4.32e-05;
+             }
+             
+             AliITSRecPoint * cl2;
+             if(clusters){
+               cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);          
+               cl2->SetChargeRatio(1.);
+               cl2->SetType(60);         
+             }
+             else{
+               cl2 = new AliITSRecPoint(milab,lp,info);
+               cl2->SetChargeRatio(1.);
+               cl2->SetType(60);
+               fDetTypeRec->AddRecPoint(*cl2);
+             }
+             ncl++;
+           } // cross is within the detector
+           //
+           //--------------
+           
+         } // bad Nstrip
+       } // end loop over Nstrips
+      } // end loop over Pside 1D clusters
+      
+    } // no bad sides 
+    
+    //---------------------------------------------------------
+    
+    else if( (countPbad>700) && (countNbad<100) ) { // bad Pside!!
+      
+      for (Int_t i=0; i<np; i++) { // loop over Nside 1Dclusters with no crosses
+       if(cnegative[i]) continue; // if intersecting Pside clusters continue;
+       
+       Float_t xt, zt;
+       Float_t yN=pos[i].GetY();       
+       Float_t yP=0.;
+       if (seg->GetLayer()==5) yP = yN + (7.6/1.9);
+       else yP = yN - (7.6/1.9);
+       seg->GetPadCxz(yP, yN, xt, zt); 
+       
+       if ( (TMath::Abs(xt)<hwSSD) && (TMath::Abs(zt)<hlSSD) ) {
+         Double_t loc[3]={xt,0.,zt},trk[3]={0.,0.,0.};
+         mT2L->MasterToLocal(loc,trk);
+         lp[0]=trk[1];
+         lp[1]=trk[2];        
+         lp[4]=pos[i].GetQ(); //Q
+         for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
+         for (Int_t ilab=0;ilab<3;ilab++) milab[ilab] = pos[i].GetLabel(ilab);   
+         CheckLabels2(milab);
+         milab[3]=( (i<<10) << 10 ) + idet; // pos|neg|det
+         Int_t info[3] = {(Int_t)pos[i].GetNd(),0,fNlayer[fModule]};
+         
+         lp[2]=0.00098;    // 0.031*0.031;  //SigmaY2
+         lp[3]=1.329;      // 1.15*1.15;  //SigmaZ2
+         lp[5]=-0.0359;
+         if(info[0]>1) lp[2]=0.00097;
+
+         AliITSRecPoint * cl2;
+         if(clusters){
+           cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);      
+           cl2->SetChargeRatio(1.);
+           cl2->SetType(70);     
+         }
+         else{
+           cl2 = new AliITSRecPoint(milab,lp,info);
+           cl2->SetChargeRatio(1.);
+           cl2->SetType(70);
+           fDetTypeRec->AddRecPoint(*cl2);
+         }
+         ncl++;
+       } // cross is within the detector
+       //
+       //--------------
+       
+      } // end loop over Nside 1D clusters
+      
+    } // bad Pside module
+    
+    else if( (countNbad>700) && (countPbad<100) ) { // bad Nside!!
+      
+      for (Int_t j=0; j<nn; j++) { // loop over Pside 1D clusters with no crosses
+       if(cpositive[j]) continue;
+       
+       Float_t xt, zt;
+       Float_t yP=neg[j].GetY();       
+       Float_t yN=0.;
+       if (seg->GetLayer()==5) yN = yP - (7.6/1.9);
+       else yN = yP + (7.6/1.9);
+       seg->GetPadCxz(yP, yN, xt, zt); 
+       
+       if ( (TMath::Abs(xt)<hwSSD) && (TMath::Abs(zt)<hlSSD) ) {
+         Double_t loc[3]={xt,0.,zt},trk[3]={0.,0.,0.};
+         mT2L->MasterToLocal(loc,trk);
+         lp[0]=trk[1];
+         lp[1]=trk[2];        
+         lp[4]=neg[j].GetQ(); //Q
+         for (Int_t ilab=0;ilab<10;ilab++) milab[ilab]=-2;
+         for (Int_t ilab=0;ilab<3;ilab++) milab[ilab] = neg[j].GetLabel(ilab);   
+         CheckLabels2(milab);
+         milab[3]=( j << 10 ) + idet; // pos|neg|det
+         Int_t info[3] = {0,(Int_t)neg[j].GetNd(),fNlayer[fModule]};
+         
+         lp[2]=7.27e-05;   // 0.0085*0.0085;  //SigmaY2
+         lp[3]=1.33;       // 1.15*1.15;  //SigmaZ2
+         lp[5]=0.00931;
+         if(info[1]>1) lp[2]=6.91e-05;
+         
+         AliITSRecPoint * cl2;
+         if(clusters){
+           cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);      
+           cl2->SetChargeRatio(1.);
+           cl2->SetType(80);     
+         }
+         else{
+           cl2 = new AliITSRecPoint(milab,lp,info);
+           cl2->SetChargeRatio(1.);
+           cl2->SetType(80);
+           fDetTypeRec->AddRecPoint(*cl2);
+         }
+         ncl++;
+       } // cross is within the detector
+       //
+       //--------------
+       
+      } // end loop over Pside 1D clusters
+      
+    } // bad Nside module
+    
+    //---------------------------------------------------------
+    
+  } // use bad channels
+    
+  //cout<<ncl<<" clusters for this module"<<endl;
+
+  delete [] cnegative;
+  delete [] cused1;
+  delete [] negativepair;
+  delete [] cpositive;
+  delete [] cused2;
+  delete [] positivepair;
+
+}
+