1) AliITSRecoParam -> flag for using the bad channels in the SSD CF

2) AliITSRecPoint.cxx -> correctly set the out-of-diagonal elements of the
covariance matrix in the recpoint constructor
3) AliITSClusterFinderV2SSD -> flag for using bad channels + fix in the value
of sigma_z

E. Fragiacomo

diff --git a/ITS/AliITSClusterFinderV2SSD.cxx b/ITS/AliITSClusterFinderV2SSD.cxx
index b20bbdb23bc9e4a87829241b8a42eb831fc25fe1..36f5ff955246d03ffc52c522d9a4bb021321dc89 100644 (file)
--- a/ITS/AliITSClusterFinderV2SSD.cxx
+++ b/ITS/AliITSClusterFinderV2SSD.cxx
@@ -744,6 +744,18 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
 
   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;
   
   AliITSsegmentationSSD *seg = dynamic_cast<AliITSsegmentationSSD*>(fDetTypeRec->GetSegmentationModel(2));
@@ -838,15 +850,6 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
   Double_t ratio;
   
 
-  static AliITSRecoParam *repa = NULL;
-  if(!repa){
-    repa = (AliITSRecoParam*) AliITSReconstructor::GetRecoParam();
-    if(!repa){
-      repa = AliITSRecoParam::GetHighFluxParam();
-      AliWarning("Using default AliITSRecoParam class");
-    }
-  }
-
   if(repa->GetUseChargeMatchingInClusterFinderSSD()==kTRUE) {
 
 
@@ -914,7 +917,7 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          lp[5]=-0.00006;
        }
        else {
-         lp[3]=0.0093*0.0093;
+         lp[3]=0.093*0.093;
          if (info[0]==1) { lp[5]=-0.00014;}
          else { lp[2]=0.0017*0.0017; lp[5]=-0.00004;}
        }
@@ -1024,7 +1027,7 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          lp[5]=-0.00006;
        }
        else {
-         lp[3]=0.0093*0.0093;
+         lp[3]=0.093*0.093;
          if (info[0]==1) { lp[5]=-0.00014;}
          else { lp[2]=0.0017*0.0017; lp[5]=-0.00004;}
        }
@@ -1100,7 +1103,7 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          lp[5]=-0.00006;
        }
        else {
-         lp[3]=0.0093*0.0093;
+         lp[3]=0.093*0.093;
          if (info[0]==1) { lp[5]=-0.00014;}
          else { lp[2]=0.0017*0.0017; lp[5]=-0.00004;}
        }
@@ -1209,7 +1212,7 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          lp[5]=-0.00006;
        }
        else {
-         lp[3]=0.0093*0.0093;
+         lp[3]=0.093*0.093;
          if (info[0]==1) { lp[5]=-0.00014;}
          else { lp[2]=0.0017*0.0017; lp[5]=-0.00004;}
        }
@@ -1285,7 +1288,7 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          lp[5]=-0.00006;
        }
        else {
-         lp[3]=0.0093*0.0093;
+         lp[3]=0.093*0.093;
          if (info[0]==1) { lp[5]=-0.00014;}
          else { lp[2]=0.0017*0.0017; lp[5]=-0.00004;}
        }
@@ -1425,7 +1428,7 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          lp[5]=-0.00006;
        }
        else {
-         lp[3]=0.0093*0.0093;
+         lp[3]=0.093*0.093;
          if (info[0]==1) { lp[5]=-0.00014;}
          else { lp[2]=0.0017*0.0017; lp[5]=-0.00004;}
        }
@@ -1557,7 +1560,7 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          lp[5]=-0.00006;
        }
        else {
-         lp[3]=0.0093*0.0093;
+         lp[3]=0.093*0.093;
          if (info[0]==1) { lp[5]=-0.00014;}
          else { lp[2]=0.0017*0.0017; lp[5]=-0.00004;}
        }
@@ -1652,7 +1655,7 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
          lp[5]=-0.00006;
        }
        else {
-         lp[3]=0.0093*0.0093;
+         lp[3]=0.093*0.093;
          if (info[0]==1) { lp[5]=-0.00014;}
          else { lp[2]=0.0017*0.0017; lp[5]=-0.00004;}
        }
@@ -1684,233 +1687,238 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
   }
 
 
-  //---------------------------------------------------------
-  // 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!!
+  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));
     
-    for (Int_t i=0; i<np; i++) { // loop over Nside 1Dclusters with no crosses
-      if(cnegative[i]) continue; // if intersecting Pside clusters continue;
+    if( (countPbad<100) && (countNbad<100) ) { // no bad side!!
       
-      //      for(Int_t ib=0; ib<768; ib++) { // loop over all Pstrips
-      for(Int_t ib=15; ib<753; ib++) { // loop over all Pstrips
+      for (Int_t i=0; i<np; i++) { // loop over Nside 1Dclusters with no crosses
+       if(cnegative[i]) continue; // if intersecting Pside clusters continue;
        
-       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);    
+       //      for(Int_t ib=0; ib<768; ib++) { // loop over all Pstrips
+       for(Int_t ib=15; ib<753; ib++) { // loop over all Pstrips
          
-         //----------
-         // bad Pstrip is crossing the Nside 1Dcluster -> create recpoint
-         // 
-         if ( (TMath::Abs(xt)<hwSSD+0.01) && (TMath::Abs(zt)<hlSSD+0.01) ) {
-           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]};
+         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);  
            
-           // out-of-diagonal element of covariance matrix
-           if (info[0]==1) lp[5]=0.0065;
-           else lp[5]=0.0093;
-
-       lp[2]=0.0022*0.0022;  //SigmaY2
-       lp[3]=0.110*0.110;  //SigmaZ2
-       lp[5]=-0.00012; // out-of-diagonal element of covariance matrix
-       
-           AliITSRecPoint * cl2;
-           if(clusters){
-             cl2 = new (cl[ncl]) AliITSRecPoint(milab,lp,info);            
-             cl2->SetChargeRatio(1.);
+           //----------
+           // bad Pstrip is crossing the Nside 1Dcluster -> create recpoint
+           // 
+           if ( (TMath::Abs(xt)<hwSSD+0.01) && (TMath::Abs(zt)<hlSSD+0.01) ) {
+             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]};
+             
+             // out-of-diagonal element of covariance matrix
+             if (info[0]==1) lp[5]=0.0065;
+             else lp[5]=0.0093;
+             
+             lp[2]=0.0022*0.0022;  //SigmaY2
+             lp[3]=0.110*0.110;  //SigmaZ2
+             lp[5]=-0.00012; // out-of-diagonal element of covariance matrix
+             
+             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
-         //
-         //--------------
+             }
+             else{
+               cl2 = new AliITSRecPoint(milab,lp,info);
+               cl2->SetChargeRatio(1.);
+               cl2->SetType(50);
+               fDetTypeRec->AddRecPoint(*cl2);
+             }
+             ncl++;
+           } // cross is within the detector
+           //
+           //--------------
+           
+         } // bad Pstrip
          
-       } // bad Pstrip
+       } // end loop over Pstrips
        
-      } // end loop over Pstrips
+      } // end loop over Nside 1D clusters
       
-    } // 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+0.01) && (TMath::Abs(zt)<hlSSD+0.01) ) {
+             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]=0.0022*0.0022;  //SigmaY2
+             lp[3]=0.110*0.110;  //SigmaZ2
+             lp[5]=-0.00012; // out-of-diagonal element of covariance matrix
+             
+             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 
+    
+    //---------------------------------------------------------
     
-    for (Int_t j=0; j<nn; j++) { // loop over Pside 1D clusters with no crosses
-      if(cpositive[j]) continue;
+    else if( (countPbad>700) && (countNbad<100) ) { // bad Pside!!
       
-      //      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
+      for (Int_t i=0; i<np; i++) { // loop over Nside 1Dclusters with no crosses
+       if(cnegative[i]) continue; // if intersecting Pside clusters continue;
        
-       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);    
+       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+0.01) && (TMath::Abs(zt)<hlSSD+0.01) ) {
+         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]};
          
-         //----------
-         // bad Nstrip is crossing the Pside 1Dcluster -> create recpoint
-         // 
-         if ( (TMath::Abs(xt)<hwSSD+0.01) && (TMath::Abs(zt)<hlSSD+0.01) ) {
-           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]=0.0022*0.0022;  //SigmaY2
-           lp[3]=0.110*0.110;  //SigmaZ2
-           lp[5]=-0.00012; // out-of-diagonal element of covariance matrix
-       
-           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
-         //
-         //--------------
+         lp[2]=0.031*0.031;  //SigmaY2
+         lp[3]=1.15*1.15;  //SigmaZ2
+         lp[5]=-0.036;
          
-       } // bad Nstrip
-      } // end loop over Nstrips
-    } // end loop over Pside 1D clusters
+         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
     
-  } // 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;
+    else if( (countNbad>700) && (countPbad<100) ) { // bad Nside!!
       
-      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);  
+      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+0.01) && (TMath::Abs(zt)<hlSSD+0.01) ) {
+         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]};
          
-      if ( (TMath::Abs(xt)<hwSSD+0.01) && (TMath::Abs(zt)<hlSSD+0.01) ) {
-       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.031*0.031;  //SigmaY2
-       lp[3]=1.15*1.15;  //SigmaZ2
-       lp[5]=-0.036;
-
-       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
-      //
-      //--------------
+         lp[2]=0.0085*0.0085;  //SigmaY2
+         lp[3]=1.15*1.15;  //SigmaZ2
+         lp[5]=0.0093;
+         
+         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
       
-    } // end loop over Nside 1D clusters
+    } // bad Nside module
     
-  } // 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+0.01) && (TMath::Abs(zt)<hlSSD+0.01) ) {
-       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]=0.0085*0.0085;  //SigmaY2
-       lp[3]=1.15*1.15;  //SigmaZ2
-       lp[5]=0.0093;
-
-       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
+  } // use bad channels
     
-  } // bad Nside module
-  
-  //---------------------------------------------------------
-  
   //cout<<ncl<<" clusters for this module"<<endl;
 
   delete [] cnegative;
@@ -1920,4 +1928,4 @@ FindClustersSSD(Ali1Dcluster* neg, Int_t nn,
   delete [] cused2;
   delete [] positivepair;
 
-}
+}
\ No newline at end of file

diff --git a/ITS/AliITSRecPoint.cxx b/ITS/AliITSRecPoint.cxx
index 9c33935303efbc344ea468315281de31fbc8c8e8..c65f63a9bc99ddb312cbfcafae4b0d8c2826aaf7 100644 (file)
--- a/ITS/AliITSRecPoint.cxx
+++ b/ITS/AliITSRecPoint.cxx
@@ -77,6 +77,8 @@ fDriftTime(0.)
     Double_t lxyz[3] = {0, 0, 0};
     GetTracking2LocalMatrix()->LocalToMaster(txyz,lxyz);
     fXloc = lxyz[0]; fZloc = lxyz[2];
+    if(fLayer==5) hit[5]=-hit[5];
+    if( (fLayer==4) || (fLayer=5) ) SetSigmaYZ(hit[5]); 
   }
   else {
     switch (fLayer) {
@@ -215,4 +217,4 @@ istream &operator>>(istream &is,AliITSRecPoint &r){
     r.Read(&is);
     return is;
 }
-//----------------------------------------------------------------------
+//----------------------------------------------------------------------
\ No newline at end of file

diff --git a/ITS/AliITSRecoParam.cxx b/ITS/AliITSRecoParam.cxx
index 3282a76fb48244a935525bab0c0202b9b8fafbb9..2e0d877277c18b4cc2b5ebe80ff4a2d25ed929af 100644 (file)
--- a/ITS/AliITSRecoParam.cxx
+++ b/ITS/AliITSRecoParam.cxx
@@ -152,6 +152,7 @@ fStoreLikeSignV0s(kFALSE),
 fUseUnfoldingInClusterFinderSPD(kFALSE),
 fUseUnfoldingInClusterFinderSDD(kTRUE),
 fUseUnfoldingInClusterFinderSSD(kFALSE),
+fUseBadChannelsInClusterFinderSSD(kFALSE),
 fUseSDDCorrectionMaps(kTRUE),
 fUseSDDClusterSizeSelection(kFALSE),
 fMinClusterChargeSDD(0.),
@@ -643,4 +644,4 @@ void AliITSRecoParam::PrintParameters() const
   Dump();
 
   return;
-}
+}
\ No newline at end of file

diff --git a/ITS/AliITSRecoParam.h b/ITS/AliITSRecoParam.h
index 3d29ff18d71904bb16b65b7004aa488975431054..c33218d6141e6568c45586954c4fc9d822a6e250 100644 (file)
--- a/ITS/AliITSRecoParam.h
+++ b/ITS/AliITSRecoParam.h
@@ -303,6 +303,9 @@ class AliITSRecoParam : public AliDetectorRecoParam
   void   SetUseUnfoldingInClusterFinderSSD(Bool_t use=kTRUE) { fUseUnfoldingInClusterFinderSSD=use; return; }
   Bool_t GetUseUnfoldingInClusterFinderSSD() const { return fUseUnfoldingInClusterFinderSSD; }
 
+  void   SetUseBadChannelsInClusterFinderSSD(Bool_t use=kFALSE) { fUseBadChannelsInClusterFinderSSD=use; return; }
+  Bool_t GetUseBadChannelsInClusterFinderSSD() const  { return fUseBadChannelsInClusterFinderSSD;  }   
+
   void   SetUseSDDCorrectionMaps(Bool_t use=kTRUE) {fUseSDDCorrectionMaps=use;}
   Bool_t GetUseSDDCorrectionMaps() const {return fUseSDDCorrectionMaps;}
   void   SetUseSDDClusterSizeSelection(Bool_t use=kTRUE) {fUseSDDClusterSizeSelection=use;}
@@ -540,6 +543,8 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Bool_t fUseUnfoldingInClusterFinderSDD; // SDD
   Bool_t fUseUnfoldingInClusterFinderSSD; // SSD
 
+  Bool_t fUseBadChannelsInClusterFinderSSD; // flag to switch on bad channels in CF SSD
+
   Bool_t  fUseSDDCorrectionMaps; // flag for use of SDD maps in C.F.
   Bool_t  fUseSDDClusterSizeSelection; // cut on SDD cluster size
   Float_t fMinClusterChargeSDD; // cut on SDD cluster charge
@@ -582,7 +587,7 @@ class AliITSRecoParam : public AliDetectorRecoParam
   Bool_t  fAlignFilterFillQANtuples;      // fill QA ntuples  
 
 
-  ClassDef(AliITSRecoParam,22) // ITS reco parameters
+  ClassDef(AliITSRecoParam,23) // ITS reco parameters
 };
 
 #endif

diff --git a/OCDB/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root b/OCDB/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root
index 9f1853378894648dd666c34f7f32ed4518aab9cb..8f7b0e0e136562dcd16f09bc2f37102a817bda2a 100644 (file)
Binary files a/OCDB/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root and b/OCDB/ITS/Calib/RecoParam/Run0_999999999_v0_s0.root differ