X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2Fglobal%2FAliFlatESDEvent.cxx;h=3889e6cdb3dd5eacf7966c00f90de382b8fb12fa;hb=2e3382cc5851d7212bff666d39755026ef83196b;hp=9458e6bb20ef0d506edebe4541b3a246618f74be;hpb=1f5164764a4df6a3f92bf1704d100a7da1befeb3;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/global/AliFlatESDEvent.cxx b/HLT/global/AliFlatESDEvent.cxx
index 9458e6bb20e..3889e6cdb3d 100644
--- a/HLT/global/AliFlatESDEvent.cxx
+++ b/HLT/global/AliFlatESDEvent.cxx
@@ -69,7 +69,6 @@
 // _______________________________________________________________________________________________________
 AliFlatESDEvent::AliFlatESDEvent() 
   :
-  AliVVevent(),
   fContentSize(0),
   fMagneticField(0),
   fPeriodNumber(0),
@@ -97,35 +96,12 @@ AliFlatESDEvent::AliFlatESDEvent()
   fContent[0]=0;
 }
 
-
-AliFlatESDEvent::AliFlatESDEvent( AliVConstructorReinitialisationFlag f ) 
+#pragma GCC diagnostic ignored "-Weffc++" 
+AliFlatESDEvent::AliFlatESDEvent( AliVConstructorReinitialisationFlag /*f*/ ) 
   :
-  AliVVevent( 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  
   {
@@ -165,6 +141,7 @@ AliFlatESDEvent::AliFlatESDEvent( AliVConstructorReinitialisationFlag f )
     }
   }
 }
+#pragma GCC diagnostic warning "-Weffc++" 
 
 
 TString AliFlatESDEvent::GetFiredTriggerClasses() const 
@@ -220,7 +197,9 @@ void AliFlatESDEvent::Reset()
   
   ULong64_t size = sizeof(AliFlatESDEvent);
   size += 2 * sizeof( AliFlatESDVertex );
+	// one Long64_t per track for tracks table
   size += esd->GetNumberOfTracks() * ( AliFlatESDTrack::EstimateSize() + sizeof(Long64_t) );
+  size += AliESDRun::kNTriggerClasses * sizeof(AliFlatESDTrigger) ;
   if( fillV0s ) size += esd->GetNumberOfV0s()*sizeof(AliFlatESDV0);
   return size;
 }
@@ -229,6 +208,7 @@ Int_t AliFlatESDEvent::SetPrimaryVertexTracks( const AliESDVertex *vtx, size_t a
 {
   // fill primary vertex tracks
   if( !vtx ) return 0;
+	if(!vtx->GetStatus()) return 0;
   if( allocatedVtxMemory < sizeof(AliFlatESDVertex) ) return -1;
   fPrimaryVertexMask |= 0x1;
   fPrimaryVertexTracksPointer = fContentSize;
@@ -242,6 +222,7 @@ Int_t AliFlatESDEvent::SetPrimaryVertexSPD( const AliESDVertex *vtx, size_t allo
 {
   // fill primary vertex SPD
   if( !vtx ) return 0;
+	if(!vtx->GetStatus()) return 0;
   if( allocatedVtxMemory < sizeof(AliFlatESDVertex) ) return -1;
   fPrimaryVertexMask |= 0x2;
   fPrimaryVertexSPDPointer = fContentSize;
@@ -363,3 +344,13 @@ Int_t AliFlatESDEvent::SetFromESD( const size_t allocatedMemorySize, const AliES
   return 0;
 }
 
+AliVParticle* AliFlatESDEvent::GetTrack(Int_t i) const
+{
+  return const_cast<AliFlatESDTrack*>(GetFlatTrack(i));
+}
+  
+AliVEvent::EDataLayoutType AliFlatESDEvent::GetDataLayoutType() const 
+{
+  return AliVEvent::kFlat;
+}
+