Updates and corrections.

Matus Kalisky

diff --git a/ANALYSIS/AliESDv0KineCuts.cxx b/ANALYSIS/AliESDv0KineCuts.cxx
index 0df54b488e508b920d51511935ea94fec4f233e7..9eb925540bd5d5aac26e56f76ba9ec1b1f8d1fdc 100644 (file)
--- a/ANALYSIS/AliESDv0KineCuts.cxx
+++ b/ANALYSIS/AliESDv0KineCuts.cxx
@@ -180,7 +180,8 @@ void AliESDv0KineCuts::Copy(TObject &ref) const {
   \r
 }\r
 //____________________________________________________________________\r
-Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN){\r
+Bool_t  AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const \r
+{\r
   //\r
   // main user function\r
   //\r
@@ -215,7 +216,8 @@ Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP
   return kFALSE;\r
 }\r
 //____________________________________________________________________\r
-Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN){\r
+Bool_t  AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN) const \r
+{\r
   //\r
   // main user function, simplified if the V0 identity is not necessary\r
   //\r
@@ -231,7 +233,8 @@ Bool_t AliESDv0KineCuts::ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN)
 \r
 }\r
 //____________________________________________________________________\r
-Int_t  AliESDv0KineCuts::PreselectV0(AliESDv0* const v0){\r
+Int_t AliESDv0KineCuts::PreselectV0(AliESDv0* const v0) const \r
+{\r
   //\r
   // Make a preselection (exclusive) of the V0 cadidates based on\r
   // Armenteros plot\r
@@ -302,7 +305,8 @@ Int_t  AliESDv0KineCuts::PreselectV0(AliESDv0* const v0){
   return kUndef;\r
 }\r
 //____________________________________________________________________\r
-Bool_t AliESDv0KineCuts::SingleTrackCuts(AliESDv0 * const v0){\r
+Bool_t  AliESDv0KineCuts::SingleTrackCuts(AliESDv0 * const v0) const \r
+{\r
   //\r
   // apply single track cuts\r
   // correct sign not relevat here\r
@@ -346,7 +350,8 @@ Bool_t AliESDv0KineCuts::SingleTrackCuts(AliESDv0 * const v0){
   return kTRUE;\r
 }\r
 //____________________________________________________________________\r
-Bool_t  AliESDv0KineCuts::CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN){\r
+Bool_t AliESDv0KineCuts::CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const \r
+{\r
   //\r
   // process the gamma conversion candidate\r
   //\r
@@ -433,7 +438,7 @@ Bool_t  AliESDv0KineCuts::CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdg
   return kTRUE;\r
 }\r
 //____________________________________________________________________\r
-Bool_t  AliESDv0KineCuts::CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN){\r
+Bool_t  AliESDv0KineCuts::CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const {\r
   //\r
   // process the K0 candidate\r
   //\r
@@ -510,7 +515,7 @@ Bool_t  AliESDv0KineCuts::CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP,
   return kTRUE;\r
 }\r
 //____________________________________________________________________\r
-Bool_t  AliESDv0KineCuts::CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN, Int_t id){\r
+Bool_t  AliESDv0KineCuts::CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN, Int_t id) const {\r
   //\r
   // process teh Lambda and Anti-Lambda candidate\r
   //\r
@@ -653,7 +658,8 @@ Bool_t  AliESDv0KineCuts::CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pd
   return kTRUE;\r
 }\r
 //____________________________________________________________________\r
-Bool_t AliESDv0KineCuts::V0CutsCommon(AliESDv0 * const v0){\r
+Bool_t  AliESDv0KineCuts::V0CutsCommon(AliESDv0 * const v0) const \r
+{\r
   //\r
   // V0 cuts common to all V0s\r
   //\r
@@ -673,7 +679,8 @@ Bool_t AliESDv0KineCuts::V0CutsCommon(AliESDv0 * const v0){
   return kTRUE;\r
 }\r
 //____________________________________________________________________\r
-void AliESDv0KineCuts::Armenteros(AliESDv0* const v0, Float_t val[2]){\r
+void AliESDv0KineCuts::Armenteros(AliESDv0* const v0, Float_t val[2]) const \r
+{\r
   //\r
   // computes the Armenteros variables for given V0\r
   // fills the histogram\r
@@ -709,7 +716,8 @@ void AliESDv0KineCuts::Armenteros(AliESDv0* const v0, Float_t val[2]){
   val[1] = qt;\r
 }\r
 //____________________________________________________________________\r
-Bool_t AliESDv0KineCuts::CheckSigns(AliESDv0* const v0){\r
+Bool_t AliESDv0KineCuts::CheckSigns(AliESDv0* const v0) const \r
+{\r
   //\r
   // check wheter the sign was correctly applied to \r
   // V0 daughter tracks\r
@@ -739,7 +747,8 @@ Bool_t AliESDv0KineCuts::CheckSigns(AliESDv0* const v0){
   return correct;\r
 }\r
 //________________________________________________________________\r
-Double_t AliESDv0KineCuts::PsiPair(AliESDv0* const v0) {\r
+Double_t AliESDv0KineCuts::PsiPair(AliESDv0* const v0) const \r
+{\r
   //\r
   // Angle between daughter momentum plane and plane \r
   // \r
@@ -810,7 +819,8 @@ Double_t AliESDv0KineCuts::PsiPair(AliESDv0* const v0) {
   return psiPair; \r
 }\r
 //___________________________________________________________________\r
-Bool_t AliESDv0KineCuts::GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack * const ntrack, Double_t convpos[2]){\r
+Bool_t  AliESDv0KineCuts::GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack * const ntrack, Double_t convpos[2]) const\r
+{\r
   //\r
   // recalculate the gamma conversion XY postition\r
   //\r
@@ -842,7 +852,8 @@ Bool_t AliESDv0KineCuts::GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack *
   return 1;\r
 }\r
 //___________________________________________________________________\r
-Bool_t AliESDv0KineCuts::GetHelixCenter(AliESDtrack * const track, Double_t b,Int_t charge, Double_t center[2]){\r
+Bool_t  AliESDv0KineCuts::GetHelixCenter(AliESDtrack * const track, Double_t b,Int_t charge, Double_t center[2]) const\r
+{\r
   //\r
   // computes the center of the track helix\r
   //\r
@@ -893,7 +904,8 @@ Bool_t AliESDv0KineCuts::GetHelixCenter(AliESDtrack * const track, Double_t b,In
   return 1;\r
 }\r
 //___________________________________________________________________\r
-AliKFParticle *AliESDv0KineCuts::CreateMotherParticle(const AliVTrack* const pdaughter, const AliVTrack* const ndaughter, Int_t pspec, Int_t nspec){\r
+AliKFParticle *AliESDv0KineCuts::CreateMotherParticle(const AliVTrack* const pdaughter, const AliVTrack* const ndaughter, Int_t pspec, Int_t nspec) const\r
+{\r
   //\r
   // Creates a mother particle\r
   //\r
@@ -903,7 +915,7 @@ AliKFParticle *AliESDv0KineCuts::CreateMotherParticle(const AliVTrack* const pda
   \r
   // Create the mother particle \r
   AliKFParticle *m = new AliKFParticle(pkfdaughter, nkfdaughter);\r
-  // DEBUG - testing\r
+  m->SetField(fEvent->GetMagneticField());\r
   if(TMath::Abs(kElectron) == pspec && TMath::Abs(kElectron) == nspec) m->SetMassConstraint(0, 0.001);\r
   else if(TMath::Abs(kPiPlus) == pspec && TMath::Abs(kPiPlus) == nspec) m->SetMassConstraint(TDatabasePDG::Instance()->GetParticle(kK0Short)->Mass(), 0.);\r
   else if(TMath::Abs(kProton) == pspec && TMath::Abs(kPiPlus) == nspec) m->SetMassConstraint(TDatabasePDG::Instance()->GetParticle(kLambda0)->Mass(), 0.);\r

diff --git a/ANALYSIS/AliESDv0KineCuts.h b/ANALYSIS/AliESDv0KineCuts.h
index 1e345fc9e647c97fe2f2fcbe30b6807d9b320e86..9575d63c9fa147e98c5bee1bee9a45fe0ab85c71 100644 (file)
--- a/ANALYSIS/AliESDv0KineCuts.h
+++ b/ANALYSIS/AliESDv0KineCuts.h
@@ -41,8 +41,8 @@ class AliESDv0KineCuts : public TObject{
   AliESDv0KineCuts &operator=(const AliESDv0KineCuts &ref);\r
 \r
   // main selection function - called once per V0 candidate\r
-  Bool_t ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN);\r
-  Bool_t ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN);\r
+  Bool_t ProcessV0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const;\r
+  Bool_t ProcessV0(AliESDv0* const v0, Int_t &pdgP, Int_t &pdgN) const;\r
 \r
   // must be called by the user\r
   void SetEvent(AliESDEvent* const event);\r
@@ -125,27 +125,27 @@ class AliESDv0KineCuts : public TObject{
   };\r
   \r
 \r
-  Int_t  PreselectV0(AliESDv0* const v0);\r
+  Int_t  PreselectV0(AliESDv0* const v0) const;\r
 \r
-  Bool_t CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN);\r
-  Bool_t CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN);\r
-  Bool_t CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN, Int_t id);\r
+  Bool_t CaseGamma(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const;\r
+  Bool_t CaseK0(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN) const;\r
+  Bool_t CaseLambda(AliESDv0* const v0, Int_t &pdgV0, Int_t &pdgP, Int_t &pdgN, Int_t id) const;\r
 \r
-  Bool_t V0CutsCommon(AliESDv0 * const v0);\r
-  Bool_t SingleTrackCuts(AliESDv0 * const v0);\r
-  void   Armenteros(AliESDv0* const v0, Float_t val[2]);\r
-  Bool_t CheckSigns(AliESDv0* const v0);\r
+  Bool_t V0CutsCommon(AliESDv0 * const v0) const;\r
+  Bool_t SingleTrackCuts(AliESDv0 * const v0) const;\r
+  void   Armenteros(AliESDv0* const v0, Float_t val[2]) const;\r
+  Bool_t CheckSigns(AliESDv0* const v0) const;\r
 \r
-  Double_t PsiPair(AliESDv0* const v0);\r
-  Bool_t   GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack * const ntrack, Double_t convpos[2]);\r
-  Bool_t   GetHelixCenter(AliESDtrack * const track, Double_t b, Int_t charge, Double_t center[2]);\r
+  Double_t PsiPair(AliESDv0* const v0) const;\r
+  Bool_t   GetConvPosXY(AliESDtrack * const ptrack, AliESDtrack * const ntrack, Double_t convpos[2]) const;\r
+  Bool_t   GetHelixCenter(AliESDtrack * const track, Double_t b, Int_t charge, Double_t center[2]) const;\r
 \r
  protected:\r
   void Copy(TObject &ref) const;\r
 \r
  private:\r
 \r
-  AliKFParticle *CreateMotherParticle(const AliVTrack* const pdaughter, const AliVTrack* const ndaughter, Int_t pspec, Int_t nspec);\r
+  AliKFParticle *CreateMotherParticle(const AliVTrack* const pdaughter, const AliVTrack* const ndaughter, Int_t pspec, Int_t nspec) const;\r
   void      SetCuts();                          // setup cuts for selected fMode and fType, see source file for details\r
   Bool_t    GammaEffCuts(AliESDv0 * const v0);  // set of cuts optimized for high gamma efficiency\r
 \r