make Whoami() compile nicely + other warning fixes

diff --git a/HLT/global/AliFlatESDEvent.cxx b/HLT/global/AliFlatESDEvent.cxx
index f452b997373e0fcc8034d6d2f96c9f8e3a4b385a..f099ca921a1b0aa348e90a3dfd35e320b82dd5ae 100644 (file)
--- a/HLT/global/AliFlatESDEvent.cxx
+++ b/HLT/global/AliFlatESDEvent.cxx
@@ -366,3 +366,9 @@ AliVParticle* AliFlatESDEvent::GetTrack(Int_t i) const
 {
   return const_cast<AliFlatESDTrack*>(GetFlatTrack(i));
 }
+  
+AliVEvent::EDataLayoutType AliFlatESDEvent::GetDataLayoutType() const 
+{
+  return AliVEvent::kFlat;
+}
+

diff --git a/HLT/global/AliFlatESDEvent.h b/HLT/global/AliFlatESDEvent.h
index f897ab8b79c35d25aecb5f87afc9bb8a3d7647a5..3b3d536250e2a4cc8eed87cfe59db00a870086bf 100644 (file)
--- a/HLT/global/AliFlatESDEvent.h
+++ b/HLT/global/AliFlatESDEvent.h
@@ -150,6 +150,7 @@ class AliFlatESDEvent :public AliVEvent {
   virtual Int_t EventIndexForEMCALCell(Int_t) const {return 0;}
   virtual AliVVZERO* GetVZEROData() const {return NULL;}
   virtual AliVZDC   *GetZDCData() const {return NULL;}
+  virtual AliVEvent::EDataLayoutType GetDataLayoutType() const;
 
  private:
 

diff --git a/STEER/AOD/AliAODEvent.cxx b/STEER/AOD/AliAODEvent.cxx
index 910093597de163ef12ba9aa47179228b6132a0f1..c946e29717bd53f3d66638e52753668276eda6c3 100644 (file)
--- a/STEER/AOD/AliAODEvent.cxx
+++ b/STEER/AOD/AliAODEvent.cxx
@@ -1072,3 +1072,5 @@ void AliAODEvent::ConnectTracks() {
   fTracksConnected = kTRUE;
 }
 
+AliVEvent::EDataLayoutType AliAODEvent::GetDataLayoutType() const {return AliVEvent::kAOD;}
+

diff --git a/STEER/AOD/AliAODEvent.h b/STEER/AOD/AliAODEvent.h
index 20ae27daca730110e032c3e702780692bc13f020..5f3e3afa29a84315d40659cae420a1937d16f8f9 100644 (file)
--- a/STEER/AOD/AliAODEvent.h
+++ b/STEER/AOD/AliAODEvent.h
@@ -158,6 +158,8 @@ class AliAODEvent : public AliVEvent {
   {new((*fVertices)[fVertices->GetEntriesFast()]) AliAODVertex(*vtx); return fVertices->GetEntriesFast()-1;}
   
   // primary vertex
+  using AliVEvent::GetPrimaryVertex;
+  using AliVEvent::GetPrimaryVertexSPD;
   virtual AliAODVertex *GetPrimaryVertex() const { return GetVertex(0); }
   virtual AliAODVertex *GetPrimaryVertexSPD() const;
 
@@ -173,6 +175,7 @@ class AliAODEvent : public AliVEvent {
   // V0
   TClonesArray *GetV0s()                 const { return fV0s; }
   Int_t         GetNumberOfV0s()         const { return fV0s->GetEntriesFast(); }
+  using AliVEvent::GetV0;
   AliAODv0     *GetV0(Int_t nV0)         const { return (AliAODv0*)fV0s->UncheckedAt(nV0); }
   Int_t         AddV0(const AliAODv0* v0)
   {new((*fV0s)[fV0s->GetEntriesFast()]) AliAODv0(*v0); return fV0s->GetEntriesFast()-1;}
@@ -309,6 +312,7 @@ class AliAODEvent : public AliVEvent {
   //ZDC
   AliAODZDC   *GetZDCData() const { return fAODZDC; }
 
+  virtual AliVEvent::EDataLayoutType GetDataLayoutType() const;
 
   private :
 

diff --git a/STEER/AOD/AliAODTrack.h b/STEER/AOD/AliAODTrack.h
index 7e2a92f604c6e35ab602619aba3e1dae60081d47..4233423ce7c55fd89e983ebad5788491e34bde02 100644 (file)
--- a/STEER/AOD/AliAODTrack.h
+++ b/STEER/AOD/AliAODTrack.h
@@ -201,6 +201,7 @@ class AliAODTrack : public AliVTrack {
   //
   Int_t   GetTOFBunchCrossing(Double_t b=0, Bool_t tpcPIDonly=kFALSE) const;
   //
+  using AliVTrack::GetP;
   template <typename T> void GetP(T *p) const {
     p[0]=fMomentum[0]; p[1]=fMomentum[1]; p[2]=fMomentum[2];}
 

diff --git a/STEER/ESD/AliESDEvent.cxx b/STEER/ESD/AliESDEvent.cxx
index 3103e7aa3dd08b11cc682dc3b9209695a8544b41..76a4631831ae105a63d3894c0b64bd128fbd05a7 100644 (file)
--- a/STEER/ESD/AliESDEvent.cxx
+++ b/STEER/ESD/AliESDEvent.cxx
@@ -2435,3 +2435,5 @@ AliESDfriend* AliESDEvent::FindFriend() const
   return static_cast<AliESDfriend*>(FindListObject("AliESDfriend")); 
 }
 
+AliVEvent::EDataLayoutType AliESDEvent::GetDataLayoutType() const {return AliVEvent::kESD;}
+

diff --git a/STEER/ESD/AliESDEvent.h b/STEER/ESD/AliESDEvent.h
index 793bea82bc2dfb16d353f0e5a2a3415b91c56195..db0bcae1f37d1dad705f7218e982ad84d3e0d825 100644 (file)
--- a/STEER/ESD/AliESDEvent.h
+++ b/STEER/ESD/AliESDEvent.h
@@ -554,6 +554,8 @@ public:
   UInt_t GetDAQDetectorPattern() const {return fDAQDetectorPattern;}
   UInt_t GetDAQAttributes() const {return fDAQAttributes;}
 
+  virtual AliVEvent::EDataLayoutType GetDataLayoutType() const;
+
 protected:
   AliESDEvent(const AliESDEvent&);
   static Bool_t ResetWithPlacementNew(TObject *pObject);
@@ -624,5 +626,6 @@ protected:
 
   ClassDef(AliESDEvent,23)  //ESDEvent class 
 };
+  
 #endif 
 

diff --git a/STEER/STEERBase/AliMCEvent.cxx b/STEER/STEERBase/AliMCEvent.cxx
index 3c59ae6c8ff93769e696a9894b2bd5b3e2a1487f..be23a424aafc39f6d3caf1a29ca4542cf9144975 100644 (file)
--- a/STEER/STEERBase/AliMCEvent.cxx
+++ b/STEER/STEERBase/AliMCEvent.cxx
@@ -855,7 +855,6 @@ Bool_t  AliMCEvent::GetCocktailGenerator(Int_t index,TString &nameGen){
    return 1;
 }
 
-
-
+AliVEvent::EDataLayoutType AliMCEvent::GetDataLayoutType() const {return AliVEvent::kMC;}
 
 ClassImp(AliMCEvent)

diff --git a/STEER/STEERBase/AliMCEvent.h b/STEER/STEERBase/AliMCEvent.h
index 3e6cc1993b70f087fd2769257e0306f65414f3cf..94f3867e2899f6a2edf51815ae46cf38d7dc61e7 100644 (file)
--- a/STEER/STEERBase/AliMCEvent.h
+++ b/STEER/STEERBase/AliMCEvent.h
@@ -99,6 +99,7 @@ public:
     virtual Int_t     GetNumberOfV0s()       const {return -1;}
     virtual Int_t     GetNumberOfCascades()  const {return -1;}
     // Vertex
+    using AliVEvent::GetPrimaryVertex;
     virtual const AliVVertex *GetPrimaryVertex() const;
     
     //
@@ -148,7 +149,8 @@ public:
 
   virtual AliVVZERO    *GetVZEROData() const {return 0;}
   virtual AliVZDC      *GetZDCData()   const {return 0;}
-    
+
+  virtual AliVEvent::EDataLayoutType GetDataLayoutType() const;
 
 private:
     virtual void      ReorderAndExpandTreeTR();
@@ -179,6 +181,5 @@ private:
     ClassDef(AliMCEvent, 2)              // AliVEvent realisation for MC data
 };
 
-
 #endif 
 

diff --git a/STEER/STEERBase/AliMixedEvent.cxx b/STEER/STEERBase/AliMixedEvent.cxx
index 39257885126095097eb2985439358e7c37042f74..db0eb63d4025951fbcb1e414f5df9eaf3d5433be 100644 (file)
--- a/STEER/STEERBase/AliMixedEvent.cxx
+++ b/STEER/STEERBase/AliMixedEvent.cxx
@@ -355,3 +355,8 @@ Double_t AliMixedEvent::GetMagneticField() const
     AliVEvent* evt = (AliVEvent*) (fEventList.At(0));
     return evt->GetMagneticField();
 }
+
+AliVEvent::EDataLayoutType AliMixedEvent::GetDataLayoutType() const
+{
+  return AliVEvent::kMixed;
+}

diff --git a/STEER/STEERBase/AliMixedEvent.h b/STEER/STEERBase/AliMixedEvent.h
index 2abee7c4b68ab94267e528660fbd0beecc69395f..1ed37e055290bcd381a59db45bce5fd99573f9b0 100644 (file)
--- a/STEER/STEERBase/AliMixedEvent.h
+++ b/STEER/STEERBase/AliMixedEvent.h
@@ -114,11 +114,13 @@ public:
   virtual AliCentrality* GetCentrality() {return 0;}
   virtual AliEventplane* GetEventplane() {return 0;}
   // Primary vertex
+    using AliVEvent::GetPrimaryVertex;
     virtual const AliVVertex   *GetPrimaryVertex() const {return fMeanVertex;}
     virtual Bool_t ComputeVtx(const TObjArray *vertices, Double_t *pos,Double_t *sig,Int_t *nContributors);
   // VZERO
   virtual AliVVZERO *GetVZEROData() const {return 0;}
   virtual AliVZDC     *GetZDCData() const {return 0;}
+  virtual EDataLayoutType GetDataLayoutType() const;
 private:
   TList   fEventList;            //! List of Events
   Int_t   fNEvents;              //! Number of Events 

diff --git a/STEER/STEERBase/AliVEvent.cxx b/STEER/STEERBase/AliVEvent.cxx
index 5d78ffead5badfce30db8abb549fe85f9fee4555..975366f2ee295baf96e2b55e5bd603cb62c3634d 100644 (file)
--- a/STEER/STEERBase/AliVEvent.cxx
+++ b/STEER/STEERBase/AliVEvent.cxx
@@ -34,5 +34,21 @@ AliVEvent& AliVEvent::operator=(const AliVEvent& vEvnt)
   return *this; 
 }
 
+const char* AliVEvent::Whoami()
+{
+  switch (GetDataLayoutType())
+  {
+    case AliVEvent::kESD :
+      return "ESD";
+    case AliVEvent::kFlat :
+      return "Flat";
+    case AliVEvent::kAOD :
+      return "AOD";
+    case AliVEvent::kMC :
+      return "MC";
+    default:
+      return "unknown";
+  }
+}
 
 ClassImp(AliVEvent)

diff --git a/STEER/STEERBase/AliVEvent.h b/STEER/STEERBase/AliVEvent.h
index 99fd31b347d2602171bc95330aec5841793a8f63..481064674a487c9f6d55671f4fd60975904cb46a 100644 (file)
--- a/STEER/STEERBase/AliVEvent.h
+++ b/STEER/STEERBase/AliVEvent.h
@@ -44,6 +44,7 @@ class AliVEvent : public TObject {
   ULong64_t GetTriggerMaskNext50() const { return 0; }
 
 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
@@ -228,6 +229,8 @@ public:
   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
 };