Inheritance AliVEvent : virtual public AliVVevent added, since root interpretor can...

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

diff --git a/STEER/ESD/AliESDEvent.h b/STEER/ESD/AliESDEvent.h
index e0e1c3fd3f2242a00ebd5f5f20fc88975b2cc97a..0c8d7972a681e1b84df5017d48c3bae859da838a 100644 (file)
--- a/STEER/ESD/AliESDEvent.h
+++ b/STEER/ESD/AliESDEvent.h
@@ -77,7 +77,7 @@ class AliESDCosmicTrack;
 class TList;
 class TString;
 
-class AliESDEvent : public AliVEvent, public AliVVevent {
+class AliESDEvent : public AliVEvent, virtual public AliVVevent {
 public:
 
 

diff --git a/STEER/ESD/AliESDtrack.cxx b/STEER/ESD/AliESDtrack.cxx
index c239a588ab2e999f4bf891b4007545c94b9d1431..3862c80c8c18ef95f70c5b233be373ddfb806fd6 100644 (file)
--- a/STEER/ESD/AliESDtrack.cxx
+++ b/STEER/ESD/AliESDtrack.cxx
@@ -3303,4 +3303,3 @@ Double_t  AliESDtrack::GetdEdxInfo(Int_t regionID, Int_t calibID, Int_t qID, Int
   return fTPCdEdxInfo->GetdEdxInfo(fIp, regionID, calibID, qID, valueID);
 }
 
-AliESDtrack tmpp;

diff --git a/STEER/STEERBase/AliVEvent.cxx b/STEER/STEERBase/AliVEvent.cxx
index d9b85238139654c711c06b1daebafee381e9bdb3..cd7c9674c95adc3f7f2950d6ec01db03a44d0310 100644 (file)
--- a/STEER/STEERBase/AliVEvent.cxx
+++ b/STEER/STEERBase/AliVEvent.cxx
@@ -24,7 +24,7 @@
 
 
 AliVEvent::AliVEvent(const AliVEvent& vEvnt) :
-  TObject(vEvnt) { } // Copy constructor
+  AliVVevent(), TObject(vEvnt)  { } // Copy constructor
 
 AliVEvent& AliVEvent::operator=(const AliVEvent& vEvnt)
 { if (this!=&vEvnt) { 

diff --git a/STEER/STEERBase/AliVEvent.h b/STEER/STEERBase/AliVEvent.h
index f943ebe206dec15ef8648cbd8b971a7df136060b..8bfebff07a50c7c35a0a2f3afded5d38cf2d7fda 100644 (file)
--- a/STEER/STEERBase/AliVEvent.h
+++ b/STEER/STEERBase/AliVEvent.h
@@ -13,6 +13,7 @@
 // Origin: Markus Oldenburg, CERN, Markus.Oldenburg@cern.ch 
 //-------------------------------------------------------------------------
 
+#include "AliVVevent.h"
 #include <TObject.h>
 #include <TTree.h>
 #include <TGeoMatrix.h>
@@ -32,7 +33,16 @@ class AliVVZERO;
 class AliVZDC;
 class AliVMFT;   // AU
 
-class AliVEvent : public TObject {
+class AliVEvent : public TObject, virtual public AliVVevent {
+ private:
+  // disable some methods from AliVEvent interface
+
+  UInt_t    GetTimeStamp()     const { return 0; }
+  UInt_t    GetEventSpecie() const { return 0; } 
+  Int_t GetNumberOfKinks() const { return 0; }
+
+  AliVVtrack* GetVVTrack(Int_t /*i*/) const { return NULL; }
+  AliESDkink* GetKink(Int_t /*i*/) const { return NULL; }
 
 public:
   enum EOfflineTriggerTypes { 

diff --git a/STEER/STEERBase/AliVVevent.cxx b/STEER/STEERBase/AliVVevent.cxx
index cf9f28a449fe4921ef9ea49424cffaa63a2b1059..85c8690d7cd8578cf4bb9c1bb05ad0032ea8ea6c 100644 (file)
--- a/STEER/STEERBase/AliVVevent.cxx
+++ b/STEER/STEERBase/AliVVevent.cxx
@@ -33,4 +33,3 @@
 
 #include "AliVVevent.h"
 
-ClassImp( AliVVevent )

diff --git a/STEER/STEERBase/AliVVevent.h b/STEER/STEERBase/AliVVevent.h
index cbe8574e9dee76887bc36642cb99b5cc538889d3..b5b9f151a9749ffc134fe8e04a3d01846fcac0fe 100644 (file)
--- a/STEER/STEERBase/AliVVevent.h
+++ b/STEER/STEERBase/AliVVevent.h
@@ -10,42 +10,56 @@
  */
 #include "Rtypes.h"
 #include "TString.h"
-
 class TList;
 //class AliVVvertex;
 class AliVVtrack;
 class AliMultiplicity;
-class AliVVkink;
 class AliVVfriendEvent;
 class AliESDkink;
 class TTree;
 
-class AliVVevent {
- public:
+class AliVVevent{
+ public:  
+  // --------------------------------------------------------------------------------
+  // -- Constructor / Destructor
   // --------------------------------------------------------------------------------
-  // -- Constructor / Destructors
+
   AliVVevent() {}
-  virtual ~AliVVevent() {}
 
-  
-  // --------------------------------------------------------------------------------
-  virtual void Reset() = 0;
+ protected:
+
+  ~AliVVevent() {}
 
+ public:
+  // --------------------------------------------------------------------------------
+  // -- Methods, common for AliVEvent and AliVVevent interface
   // --------------------------------------------------------------------------------
-  // Access methods
 
-  virtual Double_t  GetMagneticField() const = 0;
+  // Access methods
+  
+  virtual Double_t  GetMagneticField() const = 0;  
   virtual UInt_t    GetPeriodNumber()  const = 0;
   virtual Int_t     GetRunNumber()     const = 0;
   virtual UInt_t    GetOrbitNumber()   const = 0;
   virtual UShort_t  GetBunchCrossNumber() const = 0;
-  virtual UInt_t    GetTimeStamp()     const = 0;
   virtual ULong64_t GetTriggerMask()   const = 0;
-  virtual TString GetFiredTriggerClasses() const = 0;
-  virtual UInt_t GetEventSpecie() const = 0;  
+  virtual TString   GetFiredTriggerClasses() const = 0;
   
   virtual Int_t GetNumberOfTracks() const = 0;
   virtual Int_t GetNumberOfV0s() const = 0;
+ 
+  // Other methods
+
+  virtual void Reset() = 0;
+  virtual void ConnectTracks() = 0;
+
+  // --------------------------------------------------------------------------------
+  // -- Methods, specific for AliVVevent (are disabled in AliVEvent interface)
+  // --------------------------------------------------------------------------------
+
+  virtual UInt_t    GetTimeStamp()   const = 0;
+  virtual UInt_t    GetEventSpecie() const = 0;  
+ 
   virtual Int_t GetNumberOfKinks() const = 0;
   
   /* 
@@ -54,22 +68,19 @@ class AliVVevent {
   virtual const AliVVvertex* GetPrimaryVertexTracks() const {return NULL;}
   virtual const AliVVvertex* GetPrimaryVertexTPC() const {return NULL;}  
   */
+  
   virtual AliVVtrack* GetVVTrack(Int_t /*i*/) const = 0;
   virtual AliESDkink* GetKink(Int_t /*i*/) const = 0;
   //virtual AliVVtrack* GetV0(Int_t /*i*/) const = 0;
 
-  virtual void ConnectTracks() = 0;
-
-  // ESD interfaces, not yet implemented in flat esd (may be not needed, may be need some changes)
+ 
+  // some ESD interfaces, not yet implemented in flat esd (may be not needed, may be need some changes)
 
   //virtual Int_t GetEventNumberInFile() const = 0;
-  //virtual const AliMultiplicity* GetMultiplicity() const = 0; //by default SPDmult
-  //virtual TObject* FindListObject(const char* /*name*/) const = 0;
+  //virtual const AliMultiplicity* GetMultiplicity() const = 0; //by default SPDmult  
   //virtual AliVVfriendEvent* FindFriend() const = 0;
-  //virtual void ReadFromTree(TTree* /*tree*/, Option_t* /*opt*/) = 0;
-  //virtual TList* GetList() const = 0;
 
-  ClassDef(AliVVevent,0)  // base class for event data
+  ClassDef(AliVVevent, 1)
 
 };
 #endif