make AliVVevent abstract (=0)

diff --git a/HLT/global/AliFlatESDEvent.h b/HLT/global/AliFlatESDEvent.h
index a15d0cd1efa52f77f770d5ba970ae0768cf6a187..719660b624c7d56a93bd7c04859d5d11bb7de65b 100644 (file)
--- a/HLT/global/AliFlatESDEvent.h
+++ b/HLT/global/AliFlatESDEvent.h
@@ -94,20 +94,23 @@ class AliFlatESDEvent: public AliVVevent {
   //const AliVVvertex* GetPrimaryVertex() const {return NULL;}
   //const AliVVvertex* GetPrimaryVertexTPC() const {return NULL;}
   AliFlatESDTrack* GetTrack(Int_t /*i*/) const {return NULL;}
-  AliVVkink* GetKink(Int_t /*i*/) const {return NULL;}
+  AliESDkink* GetKink(Int_t /*i*/) const { return NULL; }
   //AliFlatESDV0* GetV0(Int_t /*i*/) const {return NULL;}
-  Int_t GetNumberOfKinks() const {return 0;}
-  Int_t GetEventNumberInFile() const {return -1;}
-  const AliMultiplicity* GetMultiplicity() const {return NULL;} //by default SPDmult
+  Int_t GetNumberOfKinks() const { return 0; }
+  Int_t GetEventNumberInFile() const { return -1; }
+  const AliMultiplicity* GetMultiplicity() const { return NULL; } //by default SPDmult
   Int_t GetRunNumber() const {return -1;}
   TString GetFiredTriggerClasses() const {TString string; return string;}
   TObject* FindListObject(const char* /*name*/) const {return NULL;}
-  ULong64_t GetTriggerMask() const {return 0;}
+  AliVVfriendEvent* FindFriend() const { return NULL; }
+   ULong64_t GetTriggerMask() const {return 0;}
   Double_t GetMagneticField() const {return 0;}
   UInt_t GetTimeStamp() const { return 0;}
   UInt_t GetEventSpecie() const { return 0;}
+  void ConnectTracks(){}
   void ReadFromTree(TTree* /*tree*/, Option_t* /*opt*/) {};
-  
+  TList* GetList() const;
+
   // --------------------------------------------------------------------------------
   // -- Size methods
   static ULong64_t EstimateSize(AliESDEvent*esd, Bool_t useESDFriends = kTRUE, Bool_t fillV0s=kTRUE);

diff --git a/STEER/STEERBase/AliVVevent.h b/STEER/STEERBase/AliVVevent.h
index c6f15fdea12f1ba77235a1a30fedf6b3aff4ea96..3a8ad8eb025263c3dff17e60911f48c73df6be66 100644 (file)
--- a/STEER/STEERBase/AliVVevent.h
+++ b/STEER/STEERBase/AliVVevent.h
@@ -17,6 +17,7 @@ class AliVVtrack;
 class AliMultiplicity;
 class AliVVkink;
 class AliVVfriendEvent;
+class AliESDkink;
 class TTree;
 
 class AliVVevent {
@@ -24,7 +25,7 @@ class AliVVevent {
   // --------------------------------------------------------------------------------
   // -- Constructor / Destructors
   AliVVevent() {}
-  virtual ~AliVVevent() {} 
+  virtual ~AliVVevent() {}
 
   // --------------------------------------------------------------------------------
   virtual void Reset() = 0;
@@ -37,26 +38,25 @@ class AliVVevent {
   virtual const AliVVvertex* GetPrimaryVertexTracks() const {return NULL;}
   virtual const AliVVvertex* GetPrimaryVertexTPC() const {return NULL;}  
   */
-  virtual AliVVtrack* GetTrack(Int_t /*i*/) const {return NULL;}
-  virtual AliVVkink* GetKink(Int_t /*i*/) const {return NULL;}
-  virtual AliVVtrack* GetV0(Int_t /*i*/) const {return NULL;}
-  virtual Int_t GetNumberOfTracks() const {return 0;}
-  virtual Int_t GetNumberOfV0s() const {return 0;}
-  virtual Int_t GetNumberOfKinks() const {return 0;}
-  virtual Int_t GetEventNumberInFile() const {return -1;}
-  virtual const AliMultiplicity* GetMultiplicity() const {return NULL;} //by default SPDmult
-  virtual Int_t GetRunNumber() const {return -1;}
-  virtual TString GetFiredTriggerClasses() const {TString string; return string;}
-  virtual TObject* FindListObject(const char* /*name*/) const {return NULL;}
-  virtual ULong64_t GetTriggerMask() const {return 0;}
-  virtual Double_t GetMagneticField() const {return 0;}
-  virtual UInt_t GetTimeStamp() const { return 0;}
-  virtual UInt_t GetEventSpecie() const { return 0;}
-  virtual ULong64_t GetSize() {return 0;}
-  virtual AliVVfriendEvent* FindFriend() const { return NULL; }
-  virtual void ConnectTracks() {}
+  virtual AliVVtrack* GetTrack(Int_t /*i*/) const = 0;
+  virtual AliESDkink* GetKink(Int_t /*i*/) const = 0;
+  //virtual AliVVtrack* GetV0(Int_t /*i*/) const = 0;
+  virtual Int_t GetNumberOfTracks() const =0;
+  virtual Int_t GetNumberOfV0s() const = 0;
+  virtual Int_t GetNumberOfKinks() const = 0;
+  virtual Int_t GetEventNumberInFile() const = 0;
+  virtual const AliMultiplicity* GetMultiplicity() const = 0; //by default SPDmult
+  virtual Int_t GetRunNumber() const = 0;
+  virtual TString GetFiredTriggerClasses() const = 0;
+  virtual TObject* FindListObject(const char* /*name*/) const = 0;
+  virtual ULong64_t GetTriggerMask() const = 0;
+  virtual Double_t GetMagneticField() const = 0;
+  virtual UInt_t GetTimeStamp() const = 0;
+  virtual UInt_t GetEventSpecie() const = 0;  
+  virtual AliVVfriendEvent* FindFriend() const = 0;
+  virtual void ConnectTracks() = 0;
   virtual void ReadFromTree(TTree* /*tree*/, Option_t* /*opt*/) = 0;
-  virtual TList* GetList() const {return 0;}
+  virtual TList* GetList() const = 0;
 
   ClassDef(AliVVevent,0)  // base class for event data