Undoing some unwanted method renames

In commit 6826c9114dfc107099ef06942a79f7b15a2ca495 some methods
were renamed to make the AOD and ESD interface more homogeneous.
The regexp used introduced some unwanted renames that are undone
here

diff --git a/HLT/ITS/tracking/AliITStrackerHLT.cxx b/HLT/ITS/tracking/AliITStrackerHLT.cxx
index f9f3e8c229c43b8a12a78c80b75be4168ecf79f4..a752066624d7456a77237a966c9771d8b9644a5d 100644 (file)
--- a/HLT/ITS/tracking/AliITStrackerHLT.cxx
+++ b/HLT/ITS/tracking/AliITStrackerHLT.cxx
@@ -199,9 +199,9 @@ AliITStrackerHLT::AliITStrackerHLT(const Char_t *geom)
   } // end loop on layers
 
   
-  Double_t xyzVtx[]={ fRecoParam->GetXdef(),
-                     fRecoParam->GetYdef(),
-                     fRecoParam->GetZdef()}; 
+  Double_t xyzVtx[]={ fRecoParam->GetXVdef(),
+                     fRecoParam->GetYVdef(),
+                     fRecoParam->GetZVdef()}; 
   Double_t ersVtx[]={ fRecoParam->GetSigmaXVdef(),
                      fRecoParam->GetSigmaYVdef(),
                      fRecoParam->GetSigmaZVdef()}; 

diff --git a/ITS/AliITSRecoParam.h b/ITS/AliITSRecoParam.h
index 86b42b7397f75c5e7574c49aadb630cc1ab384cf..62a2b207b306e7766bc5d03f869f2a30543e9f08 100644 (file)
--- a/ITS/AliITSRecoParam.h
+++ b/ITS/AliITSRecoParam.h
@@ -172,9 +172,9 @@ class AliITSRecoParam : public AliDetectorRecoParam
   void     SetSearchForExtraClusters(Bool_t opt=kTRUE){ fSearchForExtras=opt; }
   Double_t GetSearchForExtraClusters() const { return fSearchForExtras; }
 
-  Double_t GetXdef() const { return fXV; }
-  Double_t GetYdef() const { return fYV; }
-  Double_t GetZdef() const { return fZV; }
+  Double_t GetXVdef() const { return fXV; }
+  Double_t GetYVdef() const { return fYV; }
+  Double_t GetZVdef() const { return fZV; }
   Double_t GetSigmaXVdef() const { return fSigmaXV; }
   Double_t GetSigmaYVdef() const { return fSigmaYV; }
   Double_t GetSigmaZVdef() const { return fSigmaZV; }

diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx
index 97d2fbe38725fc91b49bf1497a3236a378bb6ab6..d7df282aa40886f7144165587f3707f1f827661b 100644 (file)
--- a/ITS/AliITStrackerMI.cxx
+++ b/ITS/AliITStrackerMI.cxx
@@ -217,9 +217,9 @@ fITSPid(0) {
   fPass=0;
   fConstraint[0]=1; fConstraint[1]=0;
 
-  Double_t xyzVtx[]={AliITSReconstructor::GetRecoParam()->GetXdef(),
-                    AliITSReconstructor::GetRecoParam()->GetYdef(),
-                    AliITSReconstructor::GetRecoParam()->GetZdef()}; 
+  Double_t xyzVtx[]={AliITSReconstructor::GetRecoParam()->GetXVdef(),
+                    AliITSReconstructor::GetRecoParam()->GetYVdef(),
+                    AliITSReconstructor::GetRecoParam()->GetZVdef()}; 
   Double_t ersVtx[]={AliITSReconstructor::GetRecoParam()->GetSigmaXVdef(),
                     AliITSReconstructor::GetRecoParam()->GetSigmaYVdef(),
                     AliITSReconstructor::GetRecoParam()->GetSigmaZVdef()}; 

diff --git a/ITS/AliITStrackerV2.cxx b/ITS/AliITStrackerV2.cxx
index bb01dbab8d2e145fdcbaba23ae69f1cdaa290c16..d80e89f8f05dcfcdc408f0a37557d7918f230812 100644 (file)
--- a/ITS/AliITStrackerV2.cxx
+++ b/ITS/AliITStrackerV2.cxx
@@ -58,9 +58,9 @@ AliITStrackerV2::AliITStrackerV2():
 
   fConstraint[0]=1; fConstraint[1]=0;
 
-  Double_t xyz[]={AliITSReconstructor::GetRecoParam()->GetXdef(),
-                 AliITSReconstructor::GetRecoParam()->GetYdef(),
-                 AliITSReconstructor::GetRecoParam()->GetZdef()}; 
+  Double_t xyz[]={AliITSReconstructor::GetRecoParam()->GetXVdef(),
+                 AliITSReconstructor::GetRecoParam()->GetYVdef(),
+                 AliITSReconstructor::GetRecoParam()->GetZVdef()}; 
   Double_t ers[]={AliITSReconstructor::GetRecoParam()->GetSigmaXVdef(),
                  AliITSReconstructor::GetRecoParam()->GetSigmaYVdef(),
                  AliITSReconstructor::GetRecoParam()->GetSigmaZVdef()}; 
@@ -86,9 +86,9 @@ AliITStrackerV2::AliITStrackerV2(const AliITStrackerV2 &t):
 
   fConstraint[0]=t.fConstraint[0]; fConstraint[1]=t.fConstraint[1];
 
-  Double_t xyz[]={AliITSReconstructor::GetRecoParam()->GetXdef(),
-                 AliITSReconstructor::GetRecoParam()->GetYdef(),
-                 AliITSReconstructor::GetRecoParam()->GetZdef()}; 
+  Double_t xyz[]={AliITSReconstructor::GetRecoParam()->GetXVdef(),
+                 AliITSReconstructor::GetRecoParam()->GetYVdef(),
+                 AliITSReconstructor::GetRecoParam()->GetZVdef()}; 
   Double_t ers[]={AliITSReconstructor::GetRecoParam()->GetSigmaXVdef(),
                  AliITSReconstructor::GetRecoParam()->GetSigmaYVdef(),
                  AliITSReconstructor::GetRecoParam()->GetSigmaZVdef()}; 
@@ -158,9 +158,9 @@ AliITStrackerV2::AliITStrackerV2(const Char_t *geom) :
 
   fConstraint[0]=1; fConstraint[1]=0;
 
-  Double_t xyz[]={AliITSReconstructor::GetRecoParam()->GetXdef(),
-                 AliITSReconstructor::GetRecoParam()->GetYdef(),
-                 AliITSReconstructor::GetRecoParam()->GetZdef()}; 
+  Double_t xyz[]={AliITSReconstructor::GetRecoParam()->GetXVdef(),
+                 AliITSReconstructor::GetRecoParam()->GetYVdef(),
+                 AliITSReconstructor::GetRecoParam()->GetZVdef()}; 
   Double_t ers[]={AliITSReconstructor::GetRecoParam()->GetSigmaXVdef(),
                  AliITSReconstructor::GetRecoParam()->GetSigmaYVdef(),
                  AliITSReconstructor::GetRecoParam()->GetSigmaZVdef()}; 

diff --git a/PWGCF/Correlations/JCORRAN/AliJBaseEventHeader.h b/PWGCF/Correlations/JCORRAN/AliJBaseEventHeader.h
index 34d91362be7af56bcfa54a0b77163537a3cd5a1f..c2a2fdc293def4bd994a9e201c1284a61763a89f 100644 (file)
--- a/PWGCF/Correlations/JCORRAN/AliJBaseEventHeader.h
+++ b/PWGCF/Correlations/JCORRAN/AliJBaseEventHeader.h
@@ -35,9 +35,9 @@ class AliJBaseEventHeader : public TNamed {
   //getter
   int    GetEventID() const {return fEventID;} 
   float  GetCentrality() const {return fCentrality;}
-  float  GetXertex() const {return fVtxX;}
-  float  GetYertex() const {return fVtxY;}
-  float  GetZertex() const {return fVtxZ;}
+  float  GetXVertex() const {return fVtxX;}
+  float  GetYVertex() const {return fVtxY;}
+  float  GetZVertex() const {return fVtxZ;}
   float  GetZertexErr() const {return fVtxZErr;}
 
   float  GetXVertexMC() const {return fVtxMCX;} 

diff --git a/PWGJE/macros/PID/AliTPCPIDmathFit.h b/PWGJE/macros/PID/AliTPCPIDmathFit.h
index 1458ec7d6d835e17c62363bec9adceb6ac6eb002..0b9512dc69e852b225b0ceb5c1431b5ebc1ae907 100644 (file)
--- a/PWGJE/macros/PID/AliTPCPIDmathFit.h
+++ b/PWGJE/macros/PID/AliTPCPIDmathFit.h
@@ -40,7 +40,7 @@ public:
   Int_t GetXbinIndex() const { return fXbinIndex; };
   const Double_t* GetXstatisticalWeight() const { return fXstatisticalWeight; };
   const Double_t* GetXstatisticalWeightError() const { return fXstatisticalWeightError; };
-  const Double_t* GetXaluesForRegularisation() const { return fXvaluesForRegularisation; };
+  const Double_t* GetXvaluesForRegularisation() const { return fXvaluesForRegularisation; };
   Int_t GetRegularisation() const { return fRegularisation; };
   Double_t GetRegularisationFactor() const { return fRegularisationFactor; };
   Double_t GetScaleFactorError() const { return fScaleFactorError; };

diff --git a/PWGJE/macros/PID/PID.C b/PWGJE/macros/PID/PID.C
index d3dcf06957f949c1af4d33de4e3a52a45dbdfab3..9b81b3ba934fdfe5c79cae5b6a6b9f2741285874 100644 (file)
--- a/PWGJE/macros/PID/PID.C
+++ b/PWGJE/macros/PID/PID.C
@@ -109,12 +109,12 @@ Double_t GetElectronFraction(const Double_t pT, const Double_t *par)
   if (pT < lastPtForCallOfGetElectronFraction) {
     for (Int_t xBin = 0; xBin < mathFit->GetNumXbinsRegularisation(); xBin++) {
       
-      const Double_t xCoord = TMath::Exp(mathFit->GetXaluesForRegularisation()[xBin]);
+      const Double_t xCoord = TMath::Exp(mathFit->GetXvaluesForRegularisation()[xBin]);
       const Int_t parIndexWithFraction = 3 + xBin * mathFit->GetNumParametersPerXbin(); 
       
       if (xCoord >= lowFittingBoundElectronFraction && xCoord <= electronFractionThresholdForFitting
           && par[parIndexWithFraction] > epsilon) { // Skip zero values (usually due to failed fits)
-        gFractionElectronsData->SetPoint(xBin, TMath::Exp(mathFit->GetXaluesForRegularisation()[xBin]), par[parIndexWithFraction]);
+        gFractionElectronsData->SetPoint(xBin, TMath::Exp(mathFit->GetXvaluesForRegularisation()[xBin]), par[parIndexWithFraction]);
         // Since the errors during the fitting are not reliable, use the following approximation on a statistical basis
         // (which indeed turns out to be rather good!)
         

diff --git a/PWGLF/STRANGENESS/Hypernuclei/AliAnalysisTaskNucleiv2.cxx b/PWGLF/STRANGENESS/Hypernuclei/AliAnalysisTaskNucleiv2.cxx
index 13befeae86d6241c98c6dd63907cd9ebf8aa66bc..79f1af8e28a46707b47815326366f24a4c7d5ded 100644 (file)
--- a/PWGLF/STRANGENESS/Hypernuclei/AliAnalysisTaskNucleiv2.cxx
+++ b/PWGLF/STRANGENESS/Hypernuclei/AliAnalysisTaskNucleiv2.cxx
@@ -735,9 +735,9 @@ void AliAnalysisTaskNucleiv2::UserExec(Option_t *)
   
   fHistEventMultiplicity->Fill(2); // analyzed events with PV
   
-  xPrimaryVertex=vtx->GetXv();
-  yPrimaryVertex=vtx->GetYv();
-  zPrimaryVertex=vtx->GetZv();  
+  xPrimaryVertex=vtx->GetX();
+  yPrimaryVertex=vtx->GetY();
+  zPrimaryVertex=vtx->GetZ();  
 
   if(TMath::Abs(zPrimaryVertex)>10) return;
   fHistEventMultiplicity->Fill(3);