removing deprecated functions

fixing typos in function names --> old functions still exist but raise a warning. they will be removed in due time.

diff --git a/ANALYSIS/AliESDtrackCuts.cxx b/ANALYSIS/AliESDtrackCuts.cxx
index b43076663851cd16b5ae02302112aceb03df773a..83a5a373f6d97b54019d49df949a477c8eb72d52 100644 (file)
--- a/ANALYSIS/AliESDtrackCuts.cxx
+++ b/ANALYSIS/AliESDtrackCuts.cxx
@@ -118,7 +118,7 @@ AliESDtrackCuts::AliESDtrackCuts(const Char_t* name, const Char_t* title) : AliA
   SetMaxCovDiagonalElements();                                     
   SetRequireTPCRefit();
   SetRequireITSRefit();
-  SetAcceptKingDaughters();
+  SetAcceptKinkDaughters();
   SetMaxNsigmaToVertex();
   SetMaxDCAToVertexXY();
   SetMaxDCAToVertexZ();
@@ -1282,38 +1282,20 @@ void AliESDtrackCuts::SetMinNsigmaToVertex(Float_t sigma)
   SetMaxNsigmaToVertex(sigma);
 }
 
-void AliESDtrackCuts::SetDCAToVertex(Float_t dist)
+void AliESDtrackCuts::SetAcceptKingDaughters(Bool_t b)
 {
   // deprecated, will be removed in next release
 
-  SetMaxDCAToVertex(dist);
-}
-  
-void AliESDtrackCuts::SetMaxDCAToVertex(Float_t dist)
-{
-  // deprecated, will be removed in next release
-  
-  Printf("WARNING: AliESDtrackCuts::SetMaxDCAToVertex is DEPRECATED and will be removed in the next release. Please use SetDCAToVertexXY(dist) and SetDCAToVertexZ(dist) and SetDCAToVertex2D(kTRUE)");
+  Printf("WARNING: AliESDtrackCuts::SetAcceptKingDaughters is DEPRECATED and will be removed in the next release. Please use SetAcceptKinkDaughters instead. Renaming was done to improve code readability.");
   
-  SetDCAToVertexXY(dist);
-  SetDCAToVertexZ(dist);
-  SetDCAToVertex2D(kTRUE);
+  SetAcceptKinkDaughters(b);
 }
 
-void AliESDtrackCuts::SetDCAToVertexXY(Float_t dist)
-{
-  // deprecated, will be removed in next release
-
-  Printf("WARNING: AliESDtrackCuts::SetDCAToVertexXY is DEPRECATED and will be removed in the next release. Please use SetMaxDCAToVertexXY instead. Renaming was done to improve code readability.");
-  
-  SetMaxDCAToVertexXY(dist);
-}
-  
-void AliESDtrackCuts::SetDCAToVertexZ(Float_t dist)
+Bool_t AliESDtrackCuts::GetAcceptKingDaughters() const
 {
   // deprecated, will be removed in next release
 
-  Printf("WARNING: AliESDtrackCuts::SetDCAToVertexZ is DEPRECATED and will be removed in the next release. Please use SetMaxDCAToVertexZ instead. Renaming was done to improve code readability.");
+  Printf("WARNING: AliESDtrackCuts::GetAcceptKingDaughters is DEPRECATED and will be removed in the next release. Please use GetAcceptKinkDaughters instead. Renaming was done to improve code readability.");
   
-  SetMaxDCAToVertexZ(dist);
+  return GetAcceptKinkDaughters();
 }

diff --git a/ANALYSIS/AliESDtrackCuts.h b/ANALYSIS/AliESDtrackCuts.h
index 27865f773c855b684f01edcfd992c730147e32b5..cc00e692abaf5be05e99d441c4feacb04c1fbadc 100644 (file)
--- a/ANALYSIS/AliESDtrackCuts.h
+++ b/ANALYSIS/AliESDtrackCuts.h
@@ -63,7 +63,7 @@ public:
   void SetMaxChi2PerClusterITS(Float_t max=1e10) {fCutMaxChi2PerClusterITS=max;}
   void SetRequireTPCRefit(Bool_t b=kFALSE)       {fCutRequireTPCRefit=b;}
   void SetRequireITSRefit(Bool_t b=kFALSE)       {fCutRequireITSRefit=b;}
-  void SetAcceptKingDaughters(Bool_t b=kFALSE)   {fCutAcceptKinkDaughters=b;}
+  void SetAcceptKinkDaughters(Bool_t b=kFALSE)   {fCutAcceptKinkDaughters=b;}
   void SetMaxCovDiagonalElements(Float_t c1=1e10, Float_t c2=1e10, Float_t c3=1e10, Float_t c4=1e10, Float_t c5=1e10) 
     {fCutMaxC11=c1; fCutMaxC22=c2; fCutMaxC33=c3; fCutMaxC44=c4; fCutMaxC55=c5;}
 
@@ -77,12 +77,10 @@ public:
   void SetDCAToVertex2D(Bool_t b=kFALSE)              {fCutDCAToVertex2D = b;}
   
   // deprecated, will be removed in next release
-  void SetMaxDCAToVertex(Float_t dist=1e10);
   void SetMinNsigmaToVertex(Float_t sigma=1e10);
-  void SetDCAToVertex(Float_t dist=1e10);
-  void SetDCAToVertexXY(Float_t dist=1e10);
-  void SetDCAToVertexZ(Float_t dist=1e10);
   Float_t GetMinNsigmaToVertex() const;
+  void SetAcceptKingDaughters(Bool_t b=kFALSE);
+  Bool_t  GetAcceptKingDaughters() const;
 
   // getters
 
@@ -93,7 +91,7 @@ public:
   Float_t GetMaxChi2PerClusterITS()  const   { return fCutMaxChi2PerClusterITS;}
   Bool_t  GetRequireTPCRefit()       const   { return fCutRequireTPCRefit;}
   Bool_t  GetRequireITSRefit()       const   { return fCutRequireITSRefit;}
-  Bool_t  GetAcceptKingDaughters()   const   { return fCutAcceptKinkDaughters;}
+  Bool_t  GetAcceptKinkDaughters()   const   { return fCutAcceptKinkDaughters;}
   void    GetMaxCovDiagonalElements(Float_t& c1, Float_t& c2, Float_t& c3, Float_t& c4, Float_t& c5) 
       {c1 = fCutMaxC11; c2 = fCutMaxC22; c3 = fCutMaxC33; c4 = fCutMaxC44; c5 = fCutMaxC55;}
   Float_t GetMaxNsigmaToVertex()     const   { return fCutNsigmaToVertex;}

diff --git a/PWG0/CreateStandardCuts.C b/PWG0/CreateStandardCuts.C
index 4640f8f8f8561b74cdc7e04f1f28edbf173f7534..fb6c760593298992566e416d342471b328429d76 100644 (file)
--- a/PWG0/CreateStandardCuts.C
+++ b/PWG0/CreateStandardCuts.C
@@ -59,7 +59,7 @@ AliESDtrackCuts* CreateTrackCuts(AliPWG0Helper::AnalysisMode analysisMode, Bool_
   }
 
   esdTrackCuts->SetRequireTPCRefit(tpcRefit);
-  esdTrackCuts->SetAcceptKingDaughters(kFALSE);
+  esdTrackCuts->SetAcceptKinkDaughters(kFALSE);
 
   esdTrackCuts->SetMinNClustersTPC(50);
   esdTrackCuts->SetMaxChi2PerClusterTPC(3.5);