From 96d949da76f25c20d92a6d5af19d6d986f52cda2 Mon Sep 17 00:00:00 2001 From: belikov Date: Wed, 30 Jul 2008 16:50:47 +0000 Subject: [PATCH] Cleaning the code and using "const" wherever it is ppossible (Boris) --- STEER/AliAODv0.cxx | 112 ++++++++++----------------------------------- STEER/AliAODv0.h | 25 ++++------ 2 files changed, 33 insertions(+), 104 deletions(-) diff --git a/STEER/AliAODv0.cxx b/STEER/AliAODv0.cxx index 1449d1defdc..3926ad73d14 100644 --- a/STEER/AliAODv0.cxx +++ b/STEER/AliAODv0.cxx @@ -19,12 +19,8 @@ // G.Van Buren, BNL, gene@bnl.gov (original STAR MuDsts) //------------------------------------------------------------------------- -//#include "AliESDEvent.h" -//#include "AliESDv0.h" - #include "AliAODv0.h" - -//#include "AliAODTrack.h" +#include "AliAODTrack.h" ClassImp(AliAODv0) @@ -60,31 +56,8 @@ ClassImp(AliAODv0) fd0[1] = 999; } -//AliAODv0::AliAODv0(AliESDv0* rV0Vertex ,AliESDEvent* rEvent) : -// AliAODRecoDecay(), -// fDcaV0ToPrimVertex(999) -//{ - //-------------------------------------------------------------------- - // Constructor via fill to be removed eventually - //-------------------------------------------------------------------- -// fCharge = 0; -// fNProngs = 2; -// fNDCA = 1; -// fNPID = 2; - -// fDCA = new Double_t[fNDCA]; - -// fPx = new Double_t[GetNProngs()]; -// fPy = new Double_t[GetNProngs()]; -// fPz = new Double_t[GetNProngs()]; - -// fd0 = new Double_t[GetNProngs()]; - -// this->Fill(rV0Vertex,rEvent); -// } - AliAODv0::AliAODv0(AliAODVertex* rAODVertex, Double_t rDcaV0Daughters, Double_t rDcaV0ToPrimVertex, - Double_t *rMomPos, Double_t *rMomNeg, Double_t *rDcaDaughterToPrimVertex) : + const Double_t *rMomPos, const Double_t *rMomNeg, Double_t *rDcaDaughterToPrimVertex) : AliAODRecoDecay(rAODVertex,2,0,rDcaDaughterToPrimVertex), fDcaV0ToPrimVertex(rDcaV0ToPrimVertex), fOnFlyStatus(kFALSE) @@ -129,8 +102,11 @@ AliAODv0& AliAODv0::operator=(const AliAODv0& rAliAODv0){ //-------------------------------------------------------------------- // Assignment overload //-------------------------------------------------------------------- - this->fDcaV0ToPrimVertex = rAliAODv0.fDcaV0ToPrimVertex ; - this->fOnFlyStatus = rAliAODv0.fOnFlyStatus; + if(this!=&rAliAODv0) { + AliAODRecoDecay::operator=(rAliAODv0); + this->fDcaV0ToPrimVertex = rAliAODv0.fDcaV0ToPrimVertex ; + this->fOnFlyStatus = rAliAODv0.fOnFlyStatus; + } return *this; } @@ -140,56 +116,8 @@ AliAODv0::~AliAODv0(){ //-------------------------------------------------------------------- } - -// void AliAODv0::Fill(AliESDv0* rV0Vertex ,AliESDEvent* rEvent){ - -// Double_t tDecayVertexV0[3]; rV0Vertex->GetXYZ(tDecayVertexV0[0],tDecayVertexV0[1],tDecayVertexV0[2]); -// GetSecondaryVtx()->SetX(tDecayVertexV0[0]); -// GetSecondaryVtx()->SetY(tDecayVertexV0[1]); -// GetSecondaryVtx()->SetZ(tDecayVertexV0[2]); - -// Double_t lCovVtx[6]; -// rV0Vertex->GetPosCov(lCovVtx); -// GetSecondaryVtx()->SetCovMatrix(lCovVtx); - -// GetSecondaryVtx()->SetChi2perNDF(rV0Vertex->GetChi2V0()); -// GetSecondaryVtx()->SetType(AliAODVertex::kV0); - -// UInt_t lKeyPos = (UInt_t)TMath::Abs(rV0Vertex->GetPindex());// need to ask why Abs -// UInt_t lKeyNeg = (UInt_t)TMath::Abs(rV0Vertex->GetNindex()); -// GetSecondaryVtx()->AddDaughter(rEvent->GetTrack(lKeyPos)); -// GetSecondaryVtx()->AddDaughter(rEvent->GetTrack(lKeyNeg)); - -// fDCA[0] = rV0Vertex->GetDcaV0Daughters(); -// fDcaV0ToPrimVertex = rV0Vertex->GetD(); - -// Double_t tMomPos[3]; rV0Vertex->GetPPxPyPz(tMomPos[0],tMomPos[1],tMomPos[2]); -// fPx[0] = tMomPos[0]; -// fPy[0] = tMomPos[1]; -// fPz[0] = tMomPos[2]; - -// Double_t tMomNeg[3]; rV0Vertex->GetNPxPyPz(tMomNeg[0],tMomNeg[1],tMomNeg[2]); -// fPx[1] = tMomNeg[0]; -// fPy[1] = tMomNeg[1]; -// fPz[1] = tMomNeg[2]; - -// AliESDtrack *pTrack=rEvent->GetTrack(lKeyPos); -// AliESDtrack *nTrack=rEvent->GetTrack(lKeyNeg); - -// Float_t tDcaPosToPrimVertex[2]; -// if(pTrack) pTrack->GetImpactParameters(tDcaPosToPrimVertex[0],tDcaPosToPrimVertex[1]); -// else { tDcaPosToPrimVertex[0]=999.; tDcaPosToPrimVertex[1]=999.;} -// fd0[0] = TMath::Sqrt(tDcaPosToPrimVertex[0]*tDcaPosToPrimVertex[0]+tDcaPosToPrimVertex[1]*tDcaPosToPrimVertex[1]); - -// Float_t tDcaNegToPrimVertex[2]; -// if(nTrack) nTrack->GetImpactParameters(tDcaNegToPrimVertex[0],tDcaNegToPrimVertex[1]); -// else { tDcaNegToPrimVertex[0]=999.; tDcaNegToPrimVertex[1]=999.;} - -// fd0[1] = TMath::Sqrt(tDcaNegToPrimVertex[0]*tDcaNegToPrimVertex[0]+tDcaNegToPrimVertex[1]*tDcaNegToPrimVertex[1]); -// } - void AliAODv0::Fill(AliAODVertex *rAODVertex, Double_t rDcaV0Daughters, Double_t rDcaV0ToPrimVertex, - Double_t *rMomPos, Double_t *rMomNeg, Double_t *rDcaDaughterToPrimVertex){ + const Double_t *rMomPos, const Double_t *rMomNeg, Double_t *rDcaDaughterToPrimVertex){ this->SetSecondaryVtx(rAODVertex); @@ -210,16 +138,14 @@ void AliAODv0::Fill(AliAODVertex *rAODVertex, Double_t rDcaV0Daughters, Double_t void AliAODv0::ResetV0(){ - GetSecondaryVtx()->SetX(999); - GetSecondaryVtx()->SetY(999); - GetSecondaryVtx()->SetZ(999); GetSecondaryVtx()->SetChi2perNDF(999); + GetSecondaryVtx()->RemoveCovMatrix(); + GetSecondaryVtx()->RemoveDaughters(); + GetSecondaryVtx()->SetParent((TObject*) 0x0); + GetSecondaryVtx()->SetID(-1); + GetSecondaryVtx()->SetPosition(999,999,999); GetSecondaryVtx()->SetType(AliAODVertex::kUndef); - Int_t lNumDaughters = GetSecondaryVtx()->GetNDaughters(); - for(Int_t iDaughterIndex = 0; iDaughterIndexRemoveDaughter(GetSecondaryVtx()->GetDaughter(iDaughterIndex)); - fDCA[0] = 999; fDcaV0ToPrimVertex = 999; @@ -235,6 +161,18 @@ void AliAODv0::ResetV0(){ fd0[1] = 999; } +Short_t AliAODv0::GetPosID() const { + AliAODTrack *posTrack = (AliAODTrack *) (this->GetSecondaryVtx()->GetDaughter(0)); + Short_t posID = posTrack->GetID(); + return posID; +} + +Short_t AliAODv0::GetNegID() const { + AliAODTrack *negTrack = (AliAODTrack *) (this->GetSecondaryVtx()->GetDaughter(1)); + Short_t negID = negTrack->GetID(); + return negID; +} + void AliAODv0::Print(Option_t* /*option*/) const { // // Print some information diff --git a/STEER/AliAODv0.h b/STEER/AliAODv0.h index c072a45fb2b..1b45d4dab8b 100644 --- a/STEER/AliAODv0.h +++ b/STEER/AliAODv0.h @@ -11,25 +11,20 @@ #include "AliAODRecoDecay.h" -//class AliESDEvent; -//class AliESDv0; - class AliAODv0 : public AliAODRecoDecay { public: AliAODv0(); - // AliAODv0(AliESDv0 *rV0Vertex, AliESDEvent *rEvent); AliAODv0(AliAODVertex *rAODVertex, Double_t rDcaV0Daughters, Double_t rDcaV0ToPrimVertex, - Double_t *rMomPos, Double_t *rMomNeg, Double_t *rDcaDaughterToPrimVertex); + const Double_t *rMomPos, const Double_t *rMomNeg, Double_t *rDcaDaughterToPrimVertex); virtual ~AliAODv0(); AliAODv0(const AliAODv0& rAliAODv0); AliAODv0& operator=(const AliAODv0& rAliAODv0); - // void Fill(AliESDv0 *rV0Vertex, AliESDEvent *rEvent); void Fill(AliAODVertex *rAODVertex, Double_t rDcaV0Daughters, Double_t rDcaV0ToPrimVertex, - Double_t *rMomPos, Double_t *rMomNeg, Double_t *rDcaDaughterToPrimVertex); + const Double_t *rMomPos, const Double_t *rMomNeg, Double_t *rDcaDaughterToPrimVertex); void ResetV0(); void Print(Option_t* option = "") const; @@ -40,10 +35,10 @@ public: Double_t DecayVertexV0Y() const; Double_t DecayVertexV0Z() const; - Double_t DecayLengthV0(double*) const; + Double_t DecayLengthV0(const Double_t *) const; - Double_t DcaV0Daughters() const; - Double_t DcaV0ToPrimVertex() const; + Double_t DcaV0Daughters() const; + Double_t DcaV0ToPrimVertex() const; Double_t DcaPosToPrimVertex() const; Double_t DcaNegToPrimVertex() const; Double_t RadiusV0() const; @@ -56,9 +51,6 @@ public: Double_t MomNegY() const; Double_t MomNegZ() const; - // Int_t KeyPos() const; - // Int_t KeyNeg() const; - Double_t Chi2V0() const; Double_t MomV0X() const; @@ -88,6 +80,8 @@ public: Double_t PseudoRapPos() const; Double_t PseudoRapNeg() const; + Short_t GetPosID() const; + Short_t GetNegID() const; Int_t GetLabel() const {return -1;} // Dummy protected: @@ -101,7 +95,7 @@ inline Double_t AliAODv0::DecayVertexV0X() const {return this->GetSecVtxX();} inline Double_t AliAODv0::DecayVertexV0Y() const {return this->GetSecVtxY();} inline Double_t AliAODv0::DecayVertexV0Z() const {return this->GetSecVtxZ();} -inline Double_t AliAODv0::DecayLengthV0(double *tParentVertexPosition) const { +inline Double_t AliAODv0::DecayLengthV0(const Double_t *tParentVertexPosition) const { return ::sqrt(::pow(DecayVertexV0X() - tParentVertexPosition[0],2) + ::pow(DecayVertexV0Y() - tParentVertexPosition[1],2) + ::pow(DecayVertexV0Z() - tParentVertexPosition[2],2)); @@ -129,9 +123,6 @@ inline Double_t AliAODv0::MomNegX() const {return fPx[1];} inline Double_t AliAODv0::MomNegY() const {return fPy[1];} inline Double_t AliAODv0::MomNegZ() const {return fPz[1];} -// inline Int_t AliAODv0::KeyPos() const {return fKeyPos;} -// inline Int_t AliAODv0::KeyNeg() const {return fKeyNeg;} - inline Double_t AliAODv0::Chi2V0() const {return GetSecondaryVtx()->GetChi2perNDF();} // Compare eventually AliAODv0::MomV0X() and AliAODRecoDecay::Px() -- 2.43.0