Fix mapping of column number

[u/mrichter/AliRoot.git] / ITS / AliITSVertexer3D.cxx

diff --git a/ITS/AliITSVertexer3D.cxx b/ITS/AliITSVertexer3D.cxx
index f2b10e62e668fa2cb508da03098d14d16b94d48c..270252cb8441a57d599d3b482d4f1c8d0f5964eb 100644 (file)
--- a/ITS/AliITSVertexer3D.cxx
+++ b/ITS/AliITSVertexer3D.cxx
@@ -54,6 +54,7 @@ AliITSVertexer3D::AliITSVertexer3D():
   fUsedCluster(kMaxCluPerMod*kNSPDMod),
   fZHisto(0),
   fDCAforPileup(0.),
+  fDiffPhiforPileup(0.),
   fBinSizeR(0.),
   fBinSizeZ(0.),
   fPileupAlgo(0)
@@ -71,10 +72,11 @@ AliITSVertexer3D::AliITSVertexer3D():
   SetMeanPSelTracks();
   SetMeanPtSelTracks();
   SetMinDCAforPileup();
+  SetDeltaPhiforPileup();
   SetPileupAlgo();
   SetBinSizeR();
   SetBinSizeZ();
-  Float_t binsize=0.02; // default 200 micron
+  Double_t binsize=0.02; // default 200 micron
   Int_t nbins=static_cast<Int_t>(1+2*fZCutDiamond/binsize);
   fZHisto=new TH1F("hz","",nbins,-fZCutDiamond,-fZCutDiamond+binsize*nbins);
 }
@@ -305,7 +307,7 @@ Int_t AliITSVertexer3D::FindTracklets(TTree *itsClusterTree, Int_t optCuts){
   } else if(optCuts==2){
     xbeam=fVert3D.GetXv();
     ybeam=fVert3D.GetYv();
-    deltaPhi = fDiffPhiMax; 
+    deltaPhi = fDiffPhiforPileup;
     deltaR=fMaxRCut;
   }
 
@@ -415,7 +417,7 @@ Int_t AliITSVertexer3D::FindTracklets(TTree *itsClusterTree, Int_t optCuts){
            Double_t curvErr=0;
            if(bField>0.00001){
              Double_t curvRadius=fMeanPtSelTrk/(0.3*bField)*100; //cm 
-             Double_t dRad=TMath::Sqrt(TMath::Power((gc1[0]-gc2[0]),2)+TMath::Power((gc1[1]-gc2[1]),2));
+             Double_t dRad=TMath::Sqrt((gc1[0]-gc2[0])*(gc1[0]-gc2[0])+(gc1[1]-gc2[1])*(gc1[1]-gc2[1]));
              Double_t aux=dRad/2.+rad1;
              curvErr=TMath::Sqrt(curvRadius*curvRadius-dRad*dRad/4.)-TMath::Sqrt(curvRadius*curvRadius-aux*aux); //cm
            }
@@ -636,11 +638,11 @@ void AliITSVertexer3D::FindPeaks(TH3F* histo, Double_t *peak, Int_t &nOfTracklet
   Int_t peak2bin[3]={-1,-1,-1};
   Int_t bc2=-1;
   for(Int_t i=xax->GetFirst();i<=xax->GetLast();i++){
-    Float_t xval = xax->GetBinCenter(i);
+    Double_t xval = xax->GetBinCenter(i);
     for(Int_t j=yax->GetFirst();j<=yax->GetLast();j++){
-      Float_t yval = yax->GetBinCenter(j);
+      Double_t yval = yax->GetBinCenter(j);
       for(Int_t k=zax->GetFirst();k<=zax->GetLast();k++){
-       Float_t zval = zax->GetBinCenter(k);
+       Double_t zval = zax->GetBinCenter(k);
        Int_t bc =(Int_t)histo->GetBinContent(i,j,k);
        if(bc==0) continue;
        if(bc>nOfTracklets){
@@ -741,7 +743,7 @@ void AliITSVertexer3D::PileupFromZ(){
   Int_t nPeaks=AliITSVertexerZ::GetPeakRegion(fZHisto,binmin,binmax);   
   if(nPeaks==2)AliWarning("2 peaks found");
   Int_t firstPeakCont=0;
-  Float_t firstPeakPos=0.;
+  Double_t firstPeakPos=0.;
   for(Int_t i=binmin-1;i<=binmax+1;i++){
     firstPeakCont+=static_cast<Int_t>(fZHisto->GetBinContent(i));
     firstPeakPos+=fZHisto->GetBinContent(i)*fZHisto->GetBinCenter(i);