make Whoami() compile nicely + other warning fixes

[u/mrichter/AliRoot.git] / STEER / STEERBase / AliVEvent.h

diff --git a/STEER/STEERBase/AliVEvent.h b/STEER/STEERBase/AliVEvent.h
index 4ba6650b1a543ce5a18730c1d133e30b4e7cb474..481064674a487c9f6d55671f4fd60975904cb46a 100644 (file)
--- a/STEER/STEERBase/AliVEvent.h
+++ b/STEER/STEERBase/AliVEvent.h
@@ -13,7 +13,6 @@
 // Origin: Markus Oldenburg, CERN, Markus.Oldenburg@cern.ch 
 //-------------------------------------------------------------------------
 
-#include "AliVVevent.h"
 #include <TObject.h>
 #include <TTree.h>
 #include <TGeoMatrix.h>
@@ -27,26 +26,25 @@
 #include "AliTOFHeader.h"
 #include "AliVTrdTrack.h"
 
+class AliVfriendEvent;
 class AliCentrality;
 class AliEventplane;
 class AliVVZERO;
 class AliVZDC;
 class AliVMFT;   // AU
+class AliESDkink;
+class AliESDv0;
+class AliESDVertex;
+class AliVTrack;
 
-class AliVEvent : public TObject, virtual public AliVVevent {
+class AliVEvent : public TObject {
  private:
   // disable some methods from AliVEvent interface
 
-  UInt_t    GetTimeStamp()     const { return 0; }
-  UInt_t    GetEventSpecie() const { return 0; }
   ULong64_t GetTriggerMaskNext50() const { return 0; }
 
-  Int_t GetNumberOfKinks() const { return 0; }
-
-  const AliVVtrack* GetVVTrack(Int_t /*i*/) const { return NULL; }
-  AliESDkink* GetKink(Int_t /*i*/) const { return NULL; }
-
 public:
+  enum EDataLayoutType { kESD, kMC, kAOD, kMixed, kFlat };
   enum EOfflineTriggerTypes { 
       kMB           = BIT(0), // Minimum bias trigger, i.e. interaction trigger, offline SPD or V0 selection
       kINT7         = BIT(1), // V0AND trigger, offline V0 selection
@@ -155,6 +153,7 @@ public:
  
   // Tracks
   virtual AliVParticle *GetTrack(Int_t i) const = 0;
+  virtual AliVTrack    *GetVTrack(Int_t /*i*/) const {return NULL;}
   //virtual Int_t        AddTrack(const AliVParticle *t) = 0;
   virtual Int_t        GetNumberOfTracks() const = 0;
   virtual Int_t        GetNumberOfV0s() const = 0;
@@ -179,9 +178,6 @@ public:
   const TGeoHMatrix* GetEMCALMatrix(Int_t /*i*/)   const {return NULL;}
   virtual AliVCaloTrigger *GetCaloTrigger(TString /*calo*/) const {return NULL;} 
 
-       
-  // Primary vertex
-  virtual const AliVVertex   *GetPrimaryVertex() const {return 0x0;}
   virtual Bool_t IsPileupFromSPD(Int_t /*minContributors*/, 
                                 Double_t /*minZdist*/, 
                                 Double_t /*nSigmaZdist*/, 
@@ -211,8 +207,30 @@ public:
   virtual AliVTrdTrack* GetTrdTrack(Int_t /* iTrack */) const { return 0x0; }
 
   virtual Int_t     GetNumberOfESDTracks()  const { return 0; }
+  virtual Int_t     GetEventNumberInFile() const {return 0;}
+
+  //used in calibration:
+  virtual Int_t            GetV0(AliESDv0&, Int_t /*iv0*/) const {return 0;}
+  virtual UInt_t           GetTimeStamp() const { return 0; }
+  virtual AliVfriendEvent* FindFriend() const { return 0; }
+  virtual UInt_t           GetEventSpecie() const { return 0; }
+  virtual AliESDkink*      GetKink(Int_t /*i*/) const { return NULL; }
+  virtual Int_t            GetNumberOfKinks() const { return 0; }
+
+  // Primary vertex
+  virtual const AliVVertex   *GetPrimaryVertex() const {return 0x0;}
+  //virtual const AliVVertex   *GetPrimaryVertexSPD() const {return 0x0;}
+  //virtual const AliVVertex   *GetPrimaryVertexTPC() const {return 0x0;}
+  //virtual const AliVVertex   *GetPrimaryVertexTracks() const {return 0x0;}
+
+  virtual Int_t GetPrimaryVertex( AliESDVertex & ) const {return 0;}
+  virtual Int_t GetPrimaryVertexTPC( AliESDVertex & ) const {return 0;}
+  virtual Int_t GetPrimaryVertexSPD( AliESDVertex & ) const {return 0;}
+  virtual Int_t GetPrimaryVertexTracks( AliESDVertex & ) const {return 0;}
 
   virtual void ConnectTracks() {}
+  virtual EDataLayoutType GetDataLayoutType() const = 0;
+  const char* Whoami();
 
   ClassDef(AliVEvent, 3)  // base class for AliEvent data
 };