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

diff --git a/HLT/global/AliFlatESDEvent.cxx b/HLT/global/AliFlatESDEvent.cxx
index 6c140d44e6e..3889e6cdb3d 100644
--- a/HLT/global/AliFlatESDEvent.cxx
+++ b/HLT/global/AliFlatESDEvent.cxx
@@ -96,34 +96,12 @@ AliFlatESDEvent::AliFlatESDEvent()
   fContent[0]=0;
 }
 
-
-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)
+#pragma GCC diagnostic ignored "-Weffc++" 
+AliFlatESDEvent::AliFlatESDEvent( AliVConstructorReinitialisationFlag /*f*/ ) 
+  :
+ fFriendEvent(NULL)
 {
   // Constructor for reinitialisation of vtable
-
   
   // Reinitialise trigger information  
   {
@@ -163,6 +141,7 @@ AliFlatESDEvent::AliFlatESDEvent( AliVConstructorReinitialisationFlag f )
     }
   }
 }
+#pragma GCC diagnostic warning "-Weffc++" 
 
 
 TString AliFlatESDEvent::GetFiredTriggerClasses() const 
@@ -218,6 +197,7 @@ 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);
@@ -228,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;
@@ -241,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;
@@ -366,3 +348,9 @@ AliVParticle* AliFlatESDEvent::GetTrack(Int_t i) const
 {
   return const_cast<AliFlatESDTrack*>(GetFlatTrack(i));
 }
+  
+AliVEvent::EDataLayoutType AliFlatESDEvent::GetDataLayoutType() const 
+{
+  return AliVEvent::kFlat;
+}
+