fDCAcut = cutsave;
if(fVert.GetNContributors()>0) {
fVert.GetXYZ(fNominalPos);
- fNominalPos[0] = fVert.GetXv();
- fNominalPos[1] = fVert.GetYv();
- fNominalPos[2] = fVert.GetZv();
+ fNominalPos[0] = fVert.GetX();
+ fNominalPos[1] = fVert.GetY();
+ fNominalPos[2] = fVert.GetZ();
AliDebug(1,Form("No mean vertex: VertexFinder gives (%f, %f, %f)",fNominalPos[0],fNominalPos[1],fNominalPos[2]));
} else {
fNominalPos[0] = 0.;
}
fCurrentVertex->SetTitle(title.Data());
//
- AliDebug(1,Form("xyz: %f %f %f; nc %d",fCurrentVertex->GetXv(),fCurrentVertex->GetYv(),fCurrentVertex->GetZv(),fCurrentVertex->GetNContributors()));
+ AliDebug(1,Form("xyz: %f %f %f; nc %d",fCurrentVertex->GetX(),fCurrentVertex->GetY(),fCurrentVertex->GetZ(),fCurrentVertex->GetNContributors()));
}
// clean up
delete [] fIdSel; fIdSel=NULL;
propagateOK = track->PropagateToDCA(initVertex,GetFieldkG(),100.,d0z0,covd0z0);
} else { // optImpParCut==2
fCurrentVertex->GetSigmaXYZ(sigmaCurr);
- normdistx = TMath::Abs(fCurrentVertex->GetXv()-fNominalPos[0])/TMath::Sqrt(sigmaCurr[0]*sigmaCurr[0]+fNominalCov[0]);
- normdisty = TMath::Abs(fCurrentVertex->GetYv()-fNominalPos[1])/TMath::Sqrt(sigmaCurr[1]*sigmaCurr[1]+fNominalCov[2]);
- AliDebug(1,Form("normdistx %f %f %f",fCurrentVertex->GetXv(),fNominalPos[0],TMath::Sqrt(sigmaCurr[0]*sigmaCurr[0]+fNominalCov[0])));
- AliDebug(1,Form("normdisty %f %f %f",fCurrentVertex->GetYv(),fNominalPos[1],TMath::Sqrt(sigmaCurr[1]*sigmaCurr[1]+fNominalCov[2])));
+ normdistx = TMath::Abs(fCurrentVertex->GetX()-fNominalPos[0])/TMath::Sqrt(sigmaCurr[0]*sigmaCurr[0]+fNominalCov[0]);
+ normdisty = TMath::Abs(fCurrentVertex->GetY()-fNominalPos[1])/TMath::Sqrt(sigmaCurr[1]*sigmaCurr[1]+fNominalCov[2]);
+ AliDebug(1,Form("normdistx %f %f %f",fCurrentVertex->GetX(),fNominalPos[0],TMath::Sqrt(sigmaCurr[0]*sigmaCurr[0]+fNominalCov[0])));
+ AliDebug(1,Form("normdisty %f %f %f",fCurrentVertex->GetY(),fNominalPos[1],TMath::Sqrt(sigmaCurr[1]*sigmaCurr[1]+fNominalCov[2])));
AliDebug(1,Form("sigmaCurr %f %f %f",sigmaCurr[0],sigmaCurr[1],TMath::Sqrt(fNominalCov[0])+TMath::Sqrt(fNominalCov[2])));
if(normdistx < 3. && normdisty < 3. &&
(sigmaCurr[0]+sigmaCurr[1])<(TMath::Sqrt(fNominalCov[0])+TMath::Sqrt(fNominalCov[2]))) {
printf("WARNING: result of tracks' removal will be only approximately correct");
TMatrixD rv(3,1);
- rv(0,0) = inVtx->GetXv();
- rv(1,0) = inVtx->GetYv();
- rv(2,0) = inVtx->GetZv();
+ rv(0,0) = inVtx->GetX();
+ rv(1,0) = inVtx->GetY();
+ rv(2,0) = inVtx->GetZ();
TMatrixD vV(3,3);
Double_t cov[6];
inVtx->GetCovMatrix(cov);
// input vertex
TMatrixD rv(3,1);
- rv(0,0) = inVtx->GetXv();
- rv(1,0) = inVtx->GetYv();
- rv(2,0) = inVtx->GetZv();
+ rv(0,0) = inVtx->GetX();
+ rv(1,0) = inVtx->GetY();
+ rv(2,0) = inVtx->GetZ();
TMatrixD vV(3,3);
Double_t cov[6];
inVtx->GetCovMatrix(cov);
if (ncuts>17) if (cuts[17]>0.5) SetMVScanStep(cuts[17]);
if (ncuts>18) SetMVMaxWghNtr(cuts[18]);
if (ncuts>19) SetMVFinalWBinary(cuts[19]>0);
- if (ncuts>20) if (cuts[20]>20.) SetBCSpacing(int(cuts[20]));
+ if (ncuts>20) SetBCSpacing(int(cuts[20]));
//
if (ncuts>21) if (cuts[21]>0.5) SetUseTrackClusterization(kTRUE);
if (ncuts>22) SetDeltaZCutForCluster(cuts[22]);
if (ncuts>23) SetnSigmaZCutForCluster(cuts[23]);
//
- if (fAlgo==kMultiVertexer || fClusterize) SetSelectOnTOFBunchCrossing(kTRUE,kTRUE);
+ if ( (fAlgo==kMultiVertexer || fClusterize) && fBCSpacing>0) SetSelectOnTOFBunchCrossing(kTRUE,kTRUE);
else SetSelectOnTOFBunchCrossing(kFALSE,kTRUE);
//
return;
fCurrentVertex->SetBC(currBC);
fVert = *fCurrentVertex; // RS
AliDebug(1," Vertex after fit:");
- AliDebug(1,Form("xyz: %f %f %f; nc %d",fCurrentVertex->GetXv(),fCurrentVertex->GetYv(),fCurrentVertex->GetZv(),fCurrentVertex->GetNContributors()));
+ AliDebug(1,Form("xyz: %f %f %f; nc %d",fCurrentVertex->GetX(),fCurrentVertex->GetY(),fCurrentVertex->GetZ(),fCurrentVertex->GetNContributors()));
AliDebug(1,"--- VertexFitter(): finish\n");
if(optUseFitter) {
VertexFitter();
} else {
- Double_t position[3]={fVert.GetXv(),fVert.GetYv(),fVert.GetZv()};
+ Double_t position[3]={fVert.GetX(),fVert.GetY(),fVert.GetZ()};
Double_t covmatrix[6];
fVert.GetCovMatrix(covmatrix);
Double_t chi2=99999.;
indices[jj] = fIdSel[jj];
t = (AliExternalTrackParam*)fTrkArraySel.At(jj);
if(optPropagate && optUseFitter) {
- if(TMath::Sqrt(fCurrentVertex->GetXv()*fCurrentVertex->GetXv()+fCurrentVertex->GetYv()*fCurrentVertex->GetYv())<3.) {
+ if(TMath::Sqrt(fCurrentVertex->GetX()*fCurrentVertex->GetX()+fCurrentVertex->GetY()*fCurrentVertex->GetY())<3.) {
t->PropagateToDCA(fCurrentVertex,GetFieldkG(),100.,d0z0,covd0z0);
AliDebug(1,Form("Track %d propagated to found vertex",jj));
} else {
// create indices
int ntrk = fTrkArraySel.GetEntries();
int nindices = fCurrentVertex->GetNContributors() - (fConstraint ? 1:0);
+ if (nindices<1) {
+ delete fCurrentVertex;
+ fCurrentVertex = 0;
+ return kFALSE;
+ }
UShort_t *indices = 0;
if (nindices>0) indices = new UShort_t[nindices];
int nadded = 0;
t->SetBit(kBitAccounted);
indices[nadded++] = fIdSel[itr];
}
- if (nadded!=nindices) printf("Mismatch : NInd: %d Nadd: %d\n",nindices,nadded);
- fCurrentVertex->SetIndices(nindices,indices);
+ if (nadded!=nindices) {
+ printf("Mismatch : NInd: %d Nadd: %d\n",nindices,nadded);
+ }
+ fCurrentVertex->SetIndices(nadded,indices);
// set vertex title
TString title="VertexerTracksMVNoConstraint";
if(fConstraint) title="VertexerTracksMVWithConstraint";
nSelTr++;
}
AliESDVertex* vert=FindPrimaryVertex(&cluTrackArr,idTrkClu);
- AliDebug(1,Form("Found vertex in z=%f with %d contributors",vert->GetZv(),
+ AliDebug(1,Form("Found vertex in z=%f with %d contributors",vert->GetZ(),
vert->GetNContributors()));
fCurrentVertex=0;