Retagging v4-18-Rev-02

sevdokim · Feb 4, 2010 · b896810 · b896810
2 parents 5802217 + 77a9ed8
commit b896810
Show file tree

Hide file tree

Showing 4 changed files with 363 additions and 99 deletions.
diff --git a/ITS/AliITSClusterFinderV2SDD.cxx b/ITS/AliITSClusterFinderV2SDD.cxx
@@ -253,7 +253,7 @@ FindClustersSDD(AliBin* bins[2], TBits* anodeFired[2],
 	  Int_t clSizTb=maxj-minj+1;
 	  if(repa->GetUseSDDClusterSizeSelection()){
 	    if(clSizTb==1) continue; // cut common mode noise spikes
-	    if(clSizAnode>3)  continue; // cut common mode noise spikes
+	    if(clSizAnode>5)  continue; // cut common mode noise spikes
 	    if(clSizTb>10)  continue; // cut clusters on noisy anodes
 	  }
 

diff --git a/ITS/AliITSMultReconstructor.cxx b/ITS/AliITSMultReconstructor.cxx
@@ -442,9 +442,11 @@ void AliITSMultReconstructor::Reconstruct(TTree* clusterTree, Float_t* vtx, Floa
 
     if (partners[iC2] == -1) continue;
 
-    if (fOverlapFlagClustersLay1[partners[iC2]] || fOverlapFlagClustersLay2[iC2]) continue;
     if (fRemoveClustersFromOverlaps) FlagClustersInOverlapRegions (partners[iC2],iC2);
 
+
+    if (fOverlapFlagClustersLay1[partners[iC2]] || fOverlapFlagClustersLay2[iC2]) continue;
+
     fTracklets[fNTracklets] = new Float_t[6];
 
     // use the theta from the clusters in the first layer

diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx
@@ -466,7 +466,7 @@ void AliTPC::CreateMaterials()
   wmat[2]=0.443;
   wmat[3]=0.3;
 
-  density=1.163;
+  density=1.725;
 
   AliMixture(21, "Prepreg3",amat,zmat,density,4,wmat);
 
@@ -518,6 +518,24 @@ void AliTPC::CreateMaterials()
 
   AliMaterial(25,"Cu",amat[0],zmat[0],density,999.,999.);
 
+  // brass
+
+  amat[0] = 63.546;
+  zmat[0] = 29.;
+  //
+  amat[1]= 65.409;
+  zmat[1]= 30.;
+  //
+  wmat[0]= 0.6;
+  wmat[1]= 0.4;
+
+  //
+  density = 8.23;
+
+
+  //
+  AliMixture(33,"Brass",amat,zmat,density,2,wmat);
+
   // Epoxy - C14 H20 O3
 
   amat[0]=12.011;
@@ -655,7 +673,8 @@ void AliTPC::CreateMaterials()
   AliMedium(18,"Steel",29,0, iSXFLD, sXMGMX, 10., 999., .1, .001, .001); 
   AliMedium(19,"Peek",30,0, iSXFLD, sXMGMX, 10., 999., .1, .001, .001);
   AliMedium(21,"Alumina",31,0, iSXFLD, sXMGMX, 10., 999., .1, .001, .001);    
-  AliMedium(22,"Water",32,0, iSXFLD, sXMGMX, 10., 999., .1, .001, .001);  
+  AliMedium(22,"Water",32,0, iSXFLD, sXMGMX, 10., 999., .1, .001, .001);
+  AliMedium(23,"Brass",33,0, iSXFLD, sXMGMX, 10., 999., .1, .001, .001);  
 }
 
 void AliTPC::GenerNoise(Int_t tablesize)