Removing dependence on PHOS and EMCAL rec. particles (Yu.Kharlov)

diff --git a/EMCAL/libEMCAL.pkg b/EMCAL/libEMCAL.pkg
index 46ec9e55029e5a8b7d43698aba2e58ae46ebb00c..a7bfb809ed25ed5e4591e984d318f016dbf48432 100644 (file)
--- a/EMCAL/libEMCAL.pkg
+++ b/EMCAL/libEMCAL.pkg
@@ -47,5 +47,3 @@ HDRS= $(SRCS:.cxx=.h)
 DHDR:=EMCALLinkDef.h
 
 EINCLUDE:=PYTHIA6
-
-EXPORT:=AliEMCALRecParticle.h AliEMCALFastRecParticle.h

diff --git a/PHOS/libPHOS.pkg b/PHOS/libPHOS.pkg
index eaede5d0e16866b62db78cc11170e277adcff916..f7f3e80c3f9aadeb54322522083d037c0d368ffb 100644 (file)
--- a/PHOS/libPHOS.pkg
+++ b/PHOS/libPHOS.pkg
@@ -32,8 +32,6 @@ EHDRS:=$(ROOTSYS)/include/TTree.h
 
 DHDR= PHOSLinkDef.h
 
-EXPORT:=AliPHOSRecParticle.h AliPHOSFastRecParticle.h
-
 
 
 

diff --git a/STEER/AliESDCaloTrack.cxx b/STEER/AliESDCaloTrack.cxx
index 87835182523adaadd8a4ccb56d9606b721362bee..4f36d26395e6978ea769148ba79b2b8fcd1750a7 100644 (file)
--- a/STEER/AliESDCaloTrack.cxx
+++ b/STEER/AliESDCaloTrack.cxx
@@ -16,8 +16,6 @@
 
 /* $Id$ */
 #include "AliESDCaloTrack.h"
-#include "AliPHOSRecParticle.h"
-#include "AliEMCALRecParticle.h"
 
 //-------------------------------------------------------------------------
 //   Class AliESDCaloTrack
@@ -28,19 +26,8 @@
 
 ClassImp(AliESDCaloTrack)
 
-AliESDCaloTrack::AliESDCaloTrack(AliPHOSRecParticle* recpart)
+AliESDCaloTrack::AliESDCaloTrack(TParticle* recpart)
 {
   // Convert AliPHOSRecParticle to AliESDCaloTrack
-  fPx = recpart->Px();
-  fPy = recpart->Py();
-  fPz = recpart->Pz();
+  fRecParticle = recpart;
 }
-
-AliESDCaloTrack::AliESDCaloTrack(AliEMCALRecParticle* recpart)
-{
-  // Convert AliEMCALRecParticle to AliESDCaloTrack
-  fPx = recpart->Px();
-  fPy = recpart->Py();
-  fPz = recpart->Pz();
-}
-

diff --git a/STEER/AliESDCaloTrack.h b/STEER/AliESDCaloTrack.h
index 99c27a1c1eee8147ea2412ad0f4ad8ce61203514..fbc8b23fa9cadc0cbf3fa18a121497835129dd46 100644 (file)
--- a/STEER/AliESDCaloTrack.h
+++ b/STEER/AliESDCaloTrack.h
@@ -13,26 +13,22 @@
 //-------------------------------------------------------------------------
 
 #include "TObject.h"
-class AliPHOSRecParticle;
-class AliEMCALRecParticle;
+#include "TParticle.h"
 
 class AliESDCaloTrack : public TObject {
 
 public:
   AliESDCaloTrack() {}
   virtual ~AliESDCaloTrack() {}
-  AliESDCaloTrack(AliPHOSRecParticle* recpart);
-  AliESDCaloTrack(AliEMCALRecParticle* recpart);
-  Float_t Px() { return fPx; }
-  Float_t Py() { return fPy; }
-  Float_t Pz() { return fPz; }
+  AliESDCaloTrack(TParticle* recpart);
+  Float_t Px() { return fRecParticle->Px(); }
+  Float_t Py() { return fRecParticle->Py(); }
+  Float_t Pz() { return fRecParticle->Pz(); }
 
 private:
-  Float_t fPx; // x-component of PHOS/EMCAL rec.particle
-  Float_t fPy; // y-component of PHOS/EMCAL rec.particle
-  Float_t fPz; // z-component of PHOS/EMCAL rec.particle
+  TParticle *fRecParticle; // reconstructed particle from PHOS or EMCAL
 
-  ClassDef(AliESDCaloTrack,1)  //ESD calorimeter track class 
+  ClassDef(AliESDCaloTrack,2)  //ESD calorimeter track class 
 };
 
 #endif