remove VV inheritance from STEER

diff --git a/STEER/ESD/AliESDEvent.cxx b/STEER/ESD/AliESDEvent.cxx
index 1c1172818d41e407549d34b1e3bc36f79581fe4a..f1d8bd842032a787ca3184c063254aad5c8dcdd5 100644 (file)
--- a/STEER/ESD/AliESDEvent.cxx
+++ b/STEER/ESD/AliESDEvent.cxx
@@ -124,7 +124,6 @@ ClassImp(AliESDEvent)
 
 //______________________________________________________________________________
 AliESDEvent::AliESDEvent():
-  AliVVevent(),
   AliVEvent(),
   fESDObjects(new TList()),
   fESDRun(0),
@@ -178,7 +177,6 @@ AliESDEvent::AliESDEvent():
 }
 //______________________________________________________________________________
 AliESDEvent::AliESDEvent(const AliESDEvent& esd):
-  AliVVevent(),
   AliVEvent(esd),
   fESDObjects(new TList()),
   fESDRun(new AliESDRun(*esd.fESDRun)),

diff --git a/STEER/ESD/AliESDEvent.h b/STEER/ESD/AliESDEvent.h
index 51ce09e8e0d5a6eb8a1b6f3d58f7fb84c4754661..f2694e13436b594fce3f85ee24ec1d7c6e3d758d 100644 (file)
--- a/STEER/ESD/AliESDEvent.h
+++ b/STEER/ESD/AliESDEvent.h
@@ -23,7 +23,6 @@
 
 
 #include "AliVEvent.h"
-#include "AliVVevent.h"
 // some includes for delegated methods
 #include "AliESDCaloTrigger.h"
 #include "AliESDRun.h"
@@ -33,10 +32,7 @@
 #include "AliESDACORDE.h"
 #include "AliESDAD.h"
 
-// AliESDtrack has to be included so that the compiler 
-// knows its inheritance tree (= that it is a AliVParticle).
 #include "AliESDtrack.h"
-// same for AliESDVertex (which is a AliVVertex)
 #include "AliESDVertex.h"
 // same for CaloCells and CaloClusters (which is a AliVCaloCells, AliVCluster)
 #include "AliESDCaloCluster.h"
@@ -77,7 +73,7 @@ class AliESDCosmicTrack;
 class TList;
 class TString;
 
-class AliESDEvent : public AliVEvent, virtual public AliVVevent {
+class AliESDEvent : public AliVEvent {
 public:
 
 
@@ -528,9 +524,6 @@ public:
   UInt_t GetDAQDetectorPattern() const {return fDAQDetectorPattern;}
   UInt_t GetDAQAttributes() const {return fDAQAttributes;}
 
-  // interface to AliVVevent
-  const AliVVtrack *GetVVTrack(Int_t i) const { return GetTrack(i); }
-
 protected:
   AliESDEvent(const AliESDEvent&);
   static Bool_t ResetWithPlacementNew(TObject *pObject);

diff --git a/STEER/ESD/AliESDtrack.cxx b/STEER/ESD/AliESDtrack.cxx
index 83ee3b9d240f01237502b0329777073fa049bf49..3862c80c8c18ef95f70c5b233be373ddfb806fd6 100644 (file)
--- a/STEER/ESD/AliESDtrack.cxx
+++ b/STEER/ESD/AliESDtrack.cxx
@@ -283,7 +283,6 @@ bool AliESDtrack::fgkOnlineMode=false;
 //_______________________________________________________________________
 AliESDtrack::AliESDtrack(const AliESDtrack& track):
   AliExternalTrackParam(track),
-  AliVVtrack(),
   fCp(0),
   fIp(0),
   fTPCInner(0),

diff --git a/STEER/ESD/AliESDtrack.h b/STEER/ESD/AliESDtrack.h
index e80a2869d094c8182364992ee44b8572944be8c1..cb8a09d75f62981b0e90c5c655d6b67951be285a 100644 (file)
--- a/STEER/ESD/AliESDtrack.h
+++ b/STEER/ESD/AliESDtrack.h
@@ -30,7 +30,6 @@
 #include <TBits.h>
 #include "AliExternalTrackParam.h"
 #include "AliVTrack.h"
-#include "AliVVtrack.h"
 #include "AliESDTOFCluster.h"
 #include "AliPID.h"
 #include "AliESDfriendTrack.h"
@@ -45,7 +44,7 @@ class AliDetectorPID;
 class TTreeSRedirector;
 class AliESDEvent;
 
-class AliESDtrack : public AliExternalTrackParam, public AliVVtrack {
+class AliESDtrack : public AliExternalTrackParam {
 public:
   //
   enum {kNITSchi2Std=3};
@@ -452,9 +451,6 @@ public:
   static Double_t GetLengthInActiveZone(const AliExternalTrackParam  *paramT, Double_t deltaY, Double_t deltaZ, Double_t bz, Double_t exbPhi =0 , TTreeSRedirector * pcstream =0 );
   Double_t GetLengthInActiveZone( Int_t mode, Double_t deltaY, Double_t deltaZ, Double_t bz, Double_t exbPhi =0 , TTreeSRedirector * pcstream =0 ) const;
 
-  // extra AliVVtrack interface
-  Double_t GetPt() const { return Pt(); }
-
 protected:
   
   AliExternalTrackParam *fCp; // Track parameters constrained to the primary vertex