From 6a225ffad293959c20fbff2935c250cc2e0d6edd Mon Sep 17 00:00:00 2001
From: mkrzewic <mikolaj.krzewicki@cern.ch>
Date: Fri, 4 Jul 2014 09:09:02 +0200
Subject: [PATCH] small fixes to make the coverter work

---
 HLT/global/AliFlatESDEvent.cxx                       | 2 +-
 HLT/global/AliFlatESDEvent.h                         | 4 ++--
 HLT/global/AliFlatESDTrack.cxx                       | 3 ++-
 HLT/global/AliFlatExternalTrackParam.h               | 1 +
 HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/HLT/global/AliFlatESDEvent.cxx b/HLT/global/AliFlatESDEvent.cxx
index d0669a43c80..60e83580982 100644
--- a/HLT/global/AliFlatESDEvent.cxx
+++ b/HLT/global/AliFlatESDEvent.cxx
@@ -73,7 +73,7 @@ AliFlatESDEvent::AliFlatESDEvent() :
 }
 
 // _______________________________________________________________________________________________________
-AliFlatESDEvent::AliFlatESDEvent(Bool_t)
+AliFlatESDEvent::AliFlatESDEvent(Bool_t):AliVVevent()
 {
   //special constructor, used to restore the vtable pointer
   //uses the special dummy constructors of contained objects
diff --git a/HLT/global/AliFlatESDEvent.h b/HLT/global/AliFlatESDEvent.h
index d11eed39588..8ca307d8fe7 100644
--- a/HLT/global/AliFlatESDEvent.h
+++ b/HLT/global/AliFlatESDEvent.h
@@ -48,7 +48,7 @@ class AliFlatESDEvent: public AliVVevent {
 
  
   AliFlatESDTrack *GetNextTrackPointer(){ 
-		return  reinterpret_cast<AliFlatESDTrack*> (fContent + fSize);
+    return reinterpret_cast<AliFlatESDTrack*> (fContent + fSize);
   }
 
   void StoreLastTrack(){ 
@@ -93,7 +93,7 @@ class AliFlatESDEvent: public AliVVevent {
 
   AliFlatESDTrack *GetTracks() {
 	return reinterpret_cast<AliFlatESDTrack*> (fContent + fTracksPointer);
-}
+  }
 
   const AliVVvertex* GetPrimaryVertex() const {return NULL;}
   const AliVVvertex* GetPrimaryVertexTPC() const {return NULL;}
diff --git a/HLT/global/AliFlatESDTrack.cxx b/HLT/global/AliFlatESDTrack.cxx
index b21b36eb90d..99c62066e28 100644
--- a/HLT/global/AliFlatESDTrack.cxx
+++ b/HLT/global/AliFlatESDTrack.cxx
@@ -75,7 +75,7 @@ AliFlatESDTrack::AliFlatESDTrack(Bool_t)
   if (trackParam) { new (trackParam) AliFlatExternalTrackParam(1); }
   
   AliFlatTPCCluster* clusterTPC = GetTPCClusters();
-  for (Int_t i=0; i<GetNumberOfTPCClusters(); i++)
+  for (Int_t i=0; i<fNTPCClusters; i++)
   {
     new (clusterTPC) AliFlatTPCCluster(1);
     clusterTPC += sizeof(AliFlatTPCCluster);
@@ -274,6 +274,7 @@ Int_t AliFlatESDTrack::FillExternalTrackParam(const AliExternalTrackParam* param
   //Printf("  DEBUG: CONTENT %d >> %p + 0x%07llx = %p", flag, fContent, fSize, fContent + fSize);
 
   AliFlatExternalTrackParam * current = reinterpret_cast<AliFlatExternalTrackParam*> (fContent + fSize);
+  new (current) AliFlatExternalTrackParam(1);
   current->SetAlpha(param->GetAlpha());
   current->SetX(param->GetX());
   current->SetY(param->GetY());
diff --git a/HLT/global/AliFlatExternalTrackParam.h b/HLT/global/AliFlatExternalTrackParam.h
index 4d54ab6e3dc..98b1a6cfc97 100644
--- a/HLT/global/AliFlatExternalTrackParam.h
+++ b/HLT/global/AliFlatExternalTrackParam.h
@@ -15,6 +15,7 @@
 class AliFlatExternalTrackParam: public AliVVexternalTrackParam
 {
   public:
+  AliFlatExternalTrackParam() {}
   AliFlatExternalTrackParam(Bool_t) {}
   virtual ~AliFlatExternalTrackParam() {}
   Float_t fAlpha;     // azimuthal angle of reference frame
diff --git a/HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx b/HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx
index a44e0a46fbd..19645811eaa 100644
--- a/HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx
+++ b/HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx
@@ -286,7 +286,7 @@ AliSysInfo::AddStamp("DoEvent.Start");
   size = 0;
 
   AliFlatESDEvent *flatEsd = reinterpret_cast<AliFlatESDEvent*>(outputPtr); 
-  new (flatEsd) AliFlatESDEvent;    
+  new (flatEsd) AliFlatESDEvent(); //standard ctor to initialize an empty event   
 
   /*
   pESD->Reset(); 
@@ -606,6 +606,7 @@ AliSysInfo::AddStamp("DoEvent.Start");
 	      const AliHLTTPCSpacePointData &cIn = clusterBlock->fSpacePoints[iCluster];
 
 	      AliFlatTPCCluster *c= flatTrack->GetTPCCluster( flatTrack->GetNumberOfTPCClusters() );;
+        new (c) AliFlatTPCCluster(1);
 	      c->fX = cIn.GetX();
 	      c->fY = cIn.GetY();
 	      c->fZ = cIn.GetZ();
-- 
2.43.0