Merge branch 'flatdev' of https://git.cern.ch/reps/AliRoot into flatdev

diff --combined HLT/global/AliFlatESDEvent.cxx
index a6bd777a6a0428cc047de9d66028547999e36daa,f099ca921a1b0aa348e90a3dfd35e320b82dd5ae..da01b9330a0d721b16809b8c520db2cdf41365b0
--- 1/HLT/global/AliFlatESDEvent.cxx
--- 2/HLT/global/AliFlatESDEvent.cxx
+++ b/HLT/global/AliFlatESDEvent.cxx
@@@ -96,12 -96,34 +96,12 @@@ AliFlatESDEvent::AliFlatESDEvent(
    fContent[0]=0;
  }
  
 -
 +#pragma GCC diagnostic ignored "-Weffc++" 
  AliFlatESDEvent::AliFlatESDEvent( AliVConstructorReinitialisationFlag /*f*/ ) 
 -//  :
 -//  fContentSize(fContentSize),
 -//  fMagneticField(fMagneticField),
 -//  fPeriodNumber(fPeriodNumber),
 -//  fRunNumber(fRunNumber),
 -//  fOrbitNumber(fOrbitNumber),
 -//  fTimeStamp(fTimeStamp),
 -//  fEventSpecie(fEventSpecie),
 -//  fBunchCrossNumber(fBunchCrossNumber),
 -//  fPrimaryVertexMask(fPrimaryVertexMask),
 -//  fTriggerMask(fTriggerMask),
 -//  fTriggerMaskNext50(fTriggerMaskNext50),
 -//  fNTriggerClasses(fNTriggerClasses),
 -//  fNPrimaryVertices(fNPrimaryVertices),
 -//  fNTracks(fNTracks),
 -//  fNV0s(fNV0s),
 -//  fTriggerPointer(fTriggerPointer),
 -//  fPrimaryVertexTracksPointer(fPrimaryVertexTracksPointer),
 -//  fPrimaryVertexSPDPointer(fPrimaryVertexSPDPointer),
 -//  fTrackTablePointer(fTrackTablePointer),
 -//  fTracksPointer(fTracksPointer),
 -//  fV0Pointer(fV0Pointer),
 -//  fFriendEvent(NULL)
 +  :
 + fFriendEvent(NULL)
  {
    // Constructor for reinitialisation of vtable
 -
    
    // Reinitialise trigger information  
    {
@@@ -141,7 -163,6 +141,7 @@@
      }
    }
  }
 +#pragma GCC diagnostic warning "-Weffc++" 
  
  
  TString AliFlatESDEvent::GetFiredTriggerClasses() const 
@@@ -345,3 -366,9 +345,9 @@@ AliVParticle* AliFlatESDEvent::GetTrack
  {
    return const_cast<AliFlatESDTrack*>(GetFlatTrack(i));
  }
+   
+ AliVEvent::EDataLayoutType AliFlatESDEvent::GetDataLayoutType() const 
+ {
+   return AliVEvent::kFlat;
+ }
+ 

diff --combined HLT/global/AliFlatESDTrack.h
index 985b480cacdb5fb113d6380fb0a46634a137500e,09c348e1bf6d3af08b0794f4690504b2fc0be8fd..98c2316752546bd8a464caa75a76e7aa2b567901
--- 1/HLT/global/AliFlatESDTrack.h
--- 2/HLT/global/AliFlatESDTrack.h
+++ b/HLT/global/AliFlatESDTrack.h
@@@ -105,6 -105,9 +105,9 @@@ class AliFlatESDTrack :public AliVTrac
    // ---------------------------------------------------------------------------------
    // AliVParticle interface
    virtual Double_t Pt() const {const AliFlatExternalTrackParam* p=GetFlatTrackParam(); return (p)?p->GetPt():kVeryBig;}
+   virtual Double_t GetTgl()  const {const AliFlatExternalTrackParam* p=GetFlatTrackParam(); return (p)?p->GetTgl():kVeryBig;}
+   using AliVTrack::GetImpactParameters;
+   virtual void GetImpactParameters(Float_t &xy,Float_t &z) const {xy=0.; z=0.;}
    virtual Double_t Px() const {return 0.;}
    virtual Double_t Py() const {return 0.;}
    virtual Double_t Pz() const {return 0.;}
@@@ -176,14 -179,15 +179,14 @@@ inline AliFlatESDTrack::AliFlatESDTrack
    // Default constructor
  }
  
 -inline AliFlatESDTrack::AliFlatESDTrack( AliVConstructorReinitialisationFlag )
 -//  :
 -//  fTrackParamMask(fTrackParamMask ),
 -//  fNTPCClusters( fNTPCClusters ),
 -//  fNITSClusters( fNITSClusters ),
 -//  fContentSize( fContentSize )
 +#pragma GCC diagnostic ignored "-Weffc++" 
 +inline AliFlatESDTrack::AliFlatESDTrack( AliVConstructorReinitialisationFlag f )
 + :
 + AliVTrack(f)
  {
    // Constructor for reinitialisation of vtable
  }
 +#pragma GCC diagnostic warning "-Weffc++" 
  
  inline UInt_t AliFlatESDTrack::CountBits(Byte_t field, UInt_t mask) {
    // Count bits in field