From 996918c5488ae42ca7d80d56559668e8439bc17b Mon Sep 17 00:00:00 2001
From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 4 May 2012 13:38:42 +0000
Subject: [PATCH] Obsolete data member removed. Michael Weber

---
 ANALYSIS/AliAnalysisTaskESDfilter.cxx | 21 ---------------
 STEER/AOD/AliAODPid.cxx               | 37 ++-------------------------
 STEER/AOD/AliAODPid.h                 | 11 ++------
 3 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index a02635e5602..b525fc36776 100644
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -2282,27 +2282,6 @@ void AliAnalysisTaskESDfilter::SetDetectorRawSignals(AliAODPid *aodpid, AliESDtr
 
   aodpid->SetHMPIDsignal(track->GetHMPIDsignal());
 
- //Extrapolate track to EMCAL surface for AOD-level track-cluster matching
- Double_t emcpos[3] = {0.,0.,0.};
- Double_t emcmom[3] = {0.,0.,0.};
- aodpid->SetEMCALPosition(emcpos);
- aodpid->SetEMCALMomentum(emcmom);
-
- Double_t hmpPid[5] = {0};
- track->GetHMPIDpid(hmpPid);
- aodpid->SetHMPIDprobs(hmpPid);
-
- AliExternalTrackParam *outerparam = (AliExternalTrackParam*)track->GetOuterParam();
- if(!outerparam) return;
-
- //To be replaced by call to AliEMCALGeoUtils when the class becomes available
- Bool_t okpos = outerparam->GetXYZ(emcpos);
- Bool_t okmom = outerparam->GetPxPyPz(emcmom);
- if(!(okpos && okmom)) return;
-
- aodpid->SetEMCALPosition(emcpos);
- aodpid->SetEMCALMomentum(emcmom);
-
 }
 
 Double_t  AliAnalysisTaskESDfilter::Chi2perNDF(AliESDtrack* track)
diff --git a/STEER/AOD/AliAODPid.cxx b/STEER/AOD/AliAODPid.cxx
index f3a275a3bc9..58403805b0d 100644
--- a/STEER/AOD/AliAODPid.cxx
+++ b/STEER/AOD/AliAODPid.cxx
@@ -45,13 +45,11 @@ AliAODPid::AliAODPid():
   // default constructor
     for(Int_t i=0; i<kSPECIES; i++) fIntTime[i]   = 0; 
     for(Int_t i=0; i<5; i++) fHMPIDprobs[i] = 0.;
-    for(Int_t i=0; i<3; i++) fEMCALPosition[i]    = 0.;
     for(Int_t i=0; i<5; i++) fTOFpidResolution[i] = 0.;
     for(Int_t i=0; i<6; i++) {
       fTRDmomentum[i]      = 0.;
       fTRDncls[i]          = 0;
     }
-    for(Int_t i=0; i<3; i++) fEMCALMomentum[i]    = 0.;
     for(Int_t i=0; i<4; i++) fITSdEdxSamples[i]   = 0.;
 }
 
@@ -83,10 +81,7 @@ AliAODPid::AliAODPid(const AliAODPid& pid) :
   SetTRDsignal(fTRDnSlices, pid.fTRDslices);
     for(Int_t i=0; i<kSPECIES; i++) fIntTime[i]=pid.fIntTime[i];
     for(Int_t i=0; i<5; i++) fHMPIDprobs[i] = pid.fHMPIDprobs[i];
-    for(Int_t i=0; i<3; i++) {
-      fEMCALPosition[i]=pid.fEMCALPosition[i];
-      fEMCALMomentum[i]=pid.fEMCALMomentum[i];
-    }
+
     for(Int_t i=0; i<6; i++){ 
       fTRDmomentum[i]=pid.fTRDmomentum[i];
       fTRDncls[i] = 0;
@@ -139,11 +134,7 @@ AliAODPid& AliAODPid::operator=(const AliAODPid& pid)
     
     for(Int_t i = 0; i < 5; i++) fHMPIDprobs[i] = pid.fHMPIDprobs[i];
     
-    for(Int_t i = 0; i < 3; i++) {
-	fEMCALPosition[i]=pid.fEMCALPosition[i];
-	fEMCALMomentum[i]=pid.fEMCALMomentum[i];
-    }
-    SetTPCdEdxInfo(pid.fTPCdEdxInfo);
+     SetTPCdEdxInfo(pid.fTPCdEdxInfo);
   }
 
   return *this;
@@ -160,30 +151,6 @@ void AliAODPid::SetIntegratedTimes(Double_t timeint[kSPECIES])
  // Returns the array with integrated times for each particle hypothesis
 for(Int_t i=0; i<kSPECIES; i++) fIntTime[i]=timeint[i];
 }
-//_______________________________________________________________________________
-void AliAODPid::GetEMCALPosition(Double_t emcalpos[3]) const
-{
- // Returns the array with extrapolated track position at the EMCAL surface
-  for(Int_t i=0; i<3; i++) emcalpos[i]=fEMCALPosition[i];
-}
-//_______________________________________________________________________________
-void AliAODPid::SetEMCALPosition(Double_t emcpos[3])
-{
- // Sets the array with extrapolated track position at the EMCAL surface
-  for(Int_t i=0; i<3; i++) fEMCALPosition[i]=emcpos[i];
-}
-//_______________________________________________________________________________
-void AliAODPid::GetEMCALMomentum(Double_t emcalmom[3]) const
-{
- // Returns the array with extrapolated track momentum at the EMCAL surface
-  for(Int_t i=0; i<3; i++) emcalmom[i]=fEMCALMomentum[i];
-}
-//_______________________________________________________________________________
-void AliAODPid::SetEMCALMomentum(Double_t emcmom[3])
-{
- // Sets the array with extrapolated track momentum at the EMCAL surface
-  for(Int_t i=0; i<3; i++) fEMCALMomentum[i]=emcmom[i];
-}
 //______________________________________________________________________________
 void AliAODPid::SetTOFpidResolution(Double_t tofPIDres[5])
 {
diff --git a/STEER/AOD/AliAODPid.h b/STEER/AOD/AliAODPid.h
index 9d80df9df2a..7fdf7b04595 100644
--- a/STEER/AOD/AliAODPid.h
+++ b/STEER/AOD/AliAODPid.h
@@ -40,8 +40,6 @@ class AliAODPid : public TObject {
   void      SetIntegratedTimes(Double_t timeint[5]);
   void      SetHMPIDsignal(Double_t hmpid)                     {fHMPIDsignal=hmpid;}
   void      SetHMPIDprobs(Double_t hmpPid[5]);
-  void      SetEMCALPosition(Double_t emcalpos[3]);
-  void      SetEMCALMomentum(Double_t emcalmom[3]);
 
   Double_t  GetITSsignal()       const {return  fITSsignal;}
   void      GetITSdEdxSamples(Double_t *s) const;
@@ -65,8 +63,6 @@ class AliAODPid : public TObject {
   void      GetHMPIDprobs(Double_t *p) const;
 
   void      GetIntegratedTimes(Double_t timeint[5])  const; 
-  void      GetEMCALPosition  (Double_t emcalpos[3]) const;
-  void      GetEMCALMomentum  (Double_t emcalmom[3]) const;
   void      GetTOFpidResolution (Double_t tofRes[5]) const;
 
  private :
@@ -85,13 +81,10 @@ class AliAODPid : public TObject {
   Double32_t  fIntTime[5];       // track time hypothesis
   Double32_t  fHMPIDsignal;      // detector raw signal
   Double32_t  fHMPIDprobs[5];    // detector pid probabilities
-  Double32_t  fEMCALPosition[3]; // global position of track
-				 // extrapolated to EMCAL surface
-  Double32_t  fEMCALMomentum[3]; // momentum of track
-				 // extrapolated to EMCAL surface
+ 
   AliTPCdEdxInfo * fTPCdEdxInfo; // object containing dE/dx information for different pad regions
 
-  ClassDef(AliAODPid, 9);
+  ClassDef(AliAODPid, 10);
 };
 
 //_____________________________________________________________
-- 
2.39.3