From: morsch Date: Thu, 24 Mar 2011 20:47:22 +0000 (+0000) Subject: Updates and corrections. X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=5abc3dfe2105bfe7362b43e3a1b24f7e18d76f8d;p=u%2Fmrichter%2FAliRoot.git Updates and corrections. Matus Kalisky --- diff --git a/ANALYSIS/AliESDv0KineCuts.cxx b/ANALYSIS/AliESDv0KineCuts.cxx index 0df54b488e5..9eb925540bd 100644 --- a/ANALYSIS/AliESDv0KineCuts.cxx +++ b/ANALYSIS/AliESDv0KineCuts.cxx @@ -180,7 +180,8 @@ void AliESDv0KineCuts::Copy(TObject &ref) const { } //____________________________________________________________________ -Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN){ +Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const +{ // // main user function // @@ -215,7 +216,8 @@ Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP return kFALSE; } //____________________________________________________________________ -Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN){ +Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN) const +{ // // main user function, simplified if the V0 identity is not necessary // @@ -231,7 +233,8 @@ Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN) } //____________________________________________________________________ -Int_t AliESDv0KineCuts::PreselectV0(AliESDv0* const v0){ +Int_t AliESDv0KineCuts::PreselectV0(AliESDv0* const v0) const +{ // // Make a preselection (exclusive) of the V0 cadidates based on // Armenteros plot @@ -302,7 +305,8 @@ Int_t AliESDv0KineCuts::PreselectV0(AliESDv0* const v0){ return kUndef; } //____________________________________________________________________ -Bool_t AliESDv0KineCuts::SingleTrackCuts(AliESDv0 * const v0){ +Bool_t AliESDv0KineCuts::SingleTrackCuts(AliESDv0 * const v0) const +{ // // apply single track cuts // correct sign not relevat here @@ -346,7 +350,8 @@ Bool_t AliESDv0KineCuts::SingleTrackCuts(AliESDv0 * const v0){ return kTRUE; } //____________________________________________________________________ -Bool_t AliESDv0KineCuts::CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN){ +Bool_t AliESDv0KineCuts::CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const +{ // // process the gamma conversion candidate // @@ -433,7 +438,7 @@ Bool_t AliESDv0KineCuts::CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdg return kTRUE; } //____________________________________________________________________ -Bool_t AliESDv0KineCuts::CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN){ +Bool_t AliESDv0KineCuts::CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const { // // process the K0 candidate // @@ -510,7 +515,7 @@ Bool_t AliESDv0KineCuts::CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, return kTRUE; } //____________________________________________________________________ -Bool_t AliESDv0KineCuts::CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN, Int_t id){ +Bool_t AliESDv0KineCuts::CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN, Int_t id) const { // // process teh Lambda and Anti-Lambda candidate // @@ -653,7 +658,8 @@ Bool_t AliESDv0KineCuts::CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pd return kTRUE; } //____________________________________________________________________ -Bool_t AliESDv0KineCuts::V0CutsCommon(AliESDv0 * const v0){ +Bool_t AliESDv0KineCuts::V0CutsCommon(AliESDv0 * const v0) const +{ // // V0 cuts common to all V0s // @@ -673,7 +679,8 @@ Bool_t AliESDv0KineCuts::V0CutsCommon(AliESDv0 * const v0){ return kTRUE; } //____________________________________________________________________ -void AliESDv0KineCuts::Armenteros(AliESDv0* const v0, Float_t val[2]){ +void AliESDv0KineCuts::Armenteros(AliESDv0* const v0, Float_t val[2]) const +{ // // computes the Armenteros variables for given V0 // fills the histogram @@ -709,7 +716,8 @@ void AliESDv0KineCuts::Armenteros(AliESDv0* const v0, Float_t val[2]){ val[1] = qt; } //____________________________________________________________________ -Bool_t AliESDv0KineCuts::CheckSigns(AliESDv0* const v0){ +Bool_t AliESDv0KineCuts::CheckSigns(AliESDv0* const v0) const +{ // // check wheter the sign was correctly applied to // V0 daughter tracks @@ -739,7 +747,8 @@ Bool_t AliESDv0KineCuts::CheckSigns(AliESDv0* const v0){ return correct; } //________________________________________________________________ -Double_t AliESDv0KineCuts::PsiPair(AliESDv0* const v0) { +Double_t AliESDv0KineCuts::PsiPair(AliESDv0* const v0) const +{ // // Angle between daughter momentum plane and plane // @@ -810,7 +819,8 @@ Double_t AliESDv0KineCuts::PsiPair(AliESDv0* const v0) { return psiPair; } //___________________________________________________________________ -Bool_t AliESDv0KineCuts::GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack * const ntrack, Double_t convpos[2]){ +Bool_t AliESDv0KineCuts::GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack * const ntrack, Double_t convpos[2]) const +{ // // recalculate the gamma conversion XY postition // @@ -842,7 +852,8 @@ Bool_t AliESDv0KineCuts::GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack * return 1; } //___________________________________________________________________ -Bool_t AliESDv0KineCuts::GetHelixCenter(AliESDtrack * const track, Double_t b,Int_t charge, Double_t center[2]){ +Bool_t AliESDv0KineCuts::GetHelixCenter(AliESDtrack * const track, Double_t b,Int_t charge, Double_t center[2]) const +{ // // computes the center of the track helix // @@ -893,7 +904,8 @@ Bool_t AliESDv0KineCuts::GetHelixCenter(AliESDtrack * const track, Double_t b,In return 1; } //___________________________________________________________________ -AliKFParticle *AliESDv0KineCuts::CreateMotherParticle(const AliVTrack* const pdaughter, const AliVTrack* const ndaughter, Int_t pspec, Int_t nspec){ +AliKFParticle *AliESDv0KineCuts::CreateMotherParticle(const AliVTrack* const pdaughter, const AliVTrack* const ndaughter, Int_t pspec, Int_t nspec) const +{ // // Creates a mother particle // @@ -903,7 +915,7 @@ AliKFParticle *AliESDv0KineCuts::CreateMotherParticle(const AliVTrack* const pda // Create the mother particle AliKFParticle *m = new AliKFParticle(pkfdaughter, nkfdaughter); - // DEBUG - testing + m->SetField(fEvent->GetMagneticField()); if(TMath::Abs(kElectron) == pspec && TMath::Abs(kElectron) == nspec) m->SetMassConstraint(0, 0.001); else if(TMath::Abs(kPiPlus) == pspec && TMath::Abs(kPiPlus) == nspec) m->SetMassConstraint(TDatabasePDG::Instance()->GetParticle(kK0Short)->Mass(), 0.); else if(TMath::Abs(kProton) == pspec && TMath::Abs(kPiPlus) == nspec) m->SetMassConstraint(TDatabasePDG::Instance()->GetParticle(kLambda0)->Mass(), 0.); diff --git a/ANALYSIS/AliESDv0KineCuts.h b/ANALYSIS/AliESDv0KineCuts.h index 1e345fc9e64..9575d63c9fa 100644 --- a/ANALYSIS/AliESDv0KineCuts.h +++ b/ANALYSIS/AliESDv0KineCuts.h @@ -41,8 +41,8 @@ class AliESDv0KineCuts : public TObject{ AliESDv0KineCuts &operator=(const AliESDv0KineCuts &ref); // main selection function - called once per V0 candidate - Bool_t ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN); - Bool_t ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN); + Bool_t ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const; + Bool_t ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN) const; // must be called by the user void SetEvent(AliESDEvent* const event); @@ -125,27 +125,27 @@ class AliESDv0KineCuts : public TObject{ }; - Int_t PreselectV0(AliESDv0* const v0); + Int_t PreselectV0(AliESDv0* const v0) const; - Bool_t CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN); - Bool_t CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN); - Bool_t CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN, Int_t id); + Bool_t CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const; + Bool_t CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const; + Bool_t CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN, Int_t id) const; - Bool_t V0CutsCommon(AliESDv0 * const v0); - Bool_t SingleTrackCuts(AliESDv0 * const v0); - void Armenteros(AliESDv0* const v0, Float_t val[2]); - Bool_t CheckSigns(AliESDv0* const v0); + Bool_t V0CutsCommon(AliESDv0 * const v0) const; + Bool_t SingleTrackCuts(AliESDv0 * const v0) const; + void Armenteros(AliESDv0* const v0, Float_t val[2]) const; + Bool_t CheckSigns(AliESDv0* const v0) const; - Double_t PsiPair(AliESDv0* const v0); - Bool_t GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack * const ntrack, Double_t convpos[2]); - Bool_t GetHelixCenter(AliESDtrack * const track, Double_t b, Int_t charge, Double_t center[2]); + Double_t PsiPair(AliESDv0* const v0) const; + Bool_t GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack * const ntrack, Double_t convpos[2]) const; + Bool_t GetHelixCenter(AliESDtrack * const track, Double_t b, Int_t charge, Double_t center[2]) const; protected: void Copy(TObject &ref) const; private: - AliKFParticle *CreateMotherParticle(const AliVTrack* const pdaughter, const AliVTrack* const ndaughter, Int_t pspec, Int_t nspec); + AliKFParticle *CreateMotherParticle(const AliVTrack* const pdaughter, const AliVTrack* const ndaughter, Int_t pspec, Int_t nspec) const; void SetCuts(); // setup cuts for selected fMode and fType, see source file for details Bool_t GammaEffCuts(AliESDv0 * const v0); // set of cuts optimized for high gamma efficiency