added constructors to ReadFlatESD.C, fixed bugs in FlatESDConverter concerning timing...

diff --git a/HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx b/HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx
index 3c0799821e2f4d44d271b9f7dd52b41208186f66..a44e0a46fbda6575da3c2ec04db11ddec782cf19 100644 (file)
--- a/HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx
+++ b/HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx
@@ -562,6 +562,7 @@ AliSysInfo::AddStamp("DoEvent.Start");
        }
        
        AliFlatESDTrack *flatTrack = flatEsd->GetNextTrackPointer();
+       new(flatTrack) AliFlatESDTrack;
        //cout<<"flatTrack: "<<flatTrack<<endl;
 
        //cout<<"GetNumberOfTPCClusters before: "<<flatTrack->GetNumberOfTPCClusters()<<endl;

diff --git a/HLT/global/FlatESDConverter.C b/HLT/global/FlatESDConverter.C
index c78297d8edcc86161f5e88b96e4983e0a43465e7..79da4a9bcedb932f442bacbb2c3bef0387f40c96 100644 (file)
--- a/HLT/global/FlatESDConverter.C
+++ b/HLT/global/FlatESDConverter.C
@@ -22,6 +22,7 @@
 #include "./AliFlatTPCCluster.h"
 #include "./AliFlatExternalTrackParam.h"
 #include "Riostream.h"
+#include "AliSysInfo.h"
 #endif   
 
 void FlatESDConverter(const char* filename="AliESDs.root", const char* filenameFriends="AliESDfriends.root",const char* filenameOut="out.dat", Bool_t useESDFriends = kTRUE, Bool_t useHLTtree = kFALSE,Int_t verbose = 0) {
@@ -55,14 +56,14 @@ void FlatESDConverter(const char* filename="AliESDs.root", const char* filenameF
   // -- Event Loop
   for (Int_t idxEvent = 0; idxEvent < esdTree->GetEntries(); idxEvent++) {
   
-  AliSysInfo::AddStamp("getEntry",0,0,edxEvent);
+  AliSysInfo::AddStamp("getEntry",0,0,idxEvent);
     esdTree->GetEntry(idxEvent);
     // -- Book memory for AliFlatESDEvent
    // -- TEST >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
     Byte_t *mem = new Byte_t[AliFlatESDEvent::EstimateSize(esd, useESDFriends)];
     
-AliSysInfo::AddStamp("DoEvent.Start",0,0,edxEvent);
+AliSysInfo::AddStamp("DoEvent.Start",0,0,idxEvent);
     flatEsd = reinterpret_cast<AliFlatESDEvent*>(mem);    
        new (flatEsd) AliFlatESDEvent(1);
 
@@ -70,7 +71,7 @@ AliSysInfo::AddStamp("DoEvent.Start",0,0,edxEvent);
     flatEsd->Fill(esd, useESDFriends);  
     
     
-AliSysInfo::AddStamp("DoEvent.Start",0,0,edxEvent);
+AliSysInfo::AddStamp("DoEvent.Stop",0,flatEsd->GetSize(),idxEvent);
 if(verbose){
      Printf("TEST: Event %d || Tracks %d | FRIEND Tracks %d || estimated size %llu || sizeof(AliFlatESDEvent) %llu", 
           idxEvent, esd->GetNumberOfTracks(), esdFriend->GetNumberOfTracks(), 
@@ -137,7 +138,7 @@ Int_t nCl = track->GetNumberOfTPCClusters();
       
        if (cl2) {
          //cout<<" normalCl fX fY fZ fPadRow fSigmaY2 fSigmaZ2 fCharge fQMax" <<endl;
-                               cout<< idxRow <<" "<< cl2->GetX()<<" "<< cl2->GetY()<<" "<< cl2->GetZ()<<" "<< cl2->GetSigmaY2()<<" "<< cl2->GetSigmaZ2()<<" "<< cl2->GetQ()<<" "<< cl2->GetMax()<<" "<< cl2->GetRow()<<" "<< cl2->GetPad() <<endl<<endl;
+                               cout<< idxRow <<" "<< cl2->GetX()<<" "<< cl2->GetY()<<" "<< cl2->GetZ()<<" "<< cl2->GetSigmaY2()<<" "<< cl2->GetSigmaZ2()<<" "<< cl2->GetQ()<<" "<< cl2->GetMax()<<" "<< cl2->GetRow() <<endl<<endl;
        }
                else
                        cout<<idxRow<<"---------------------------------"<<endl<<endl;  
@@ -145,13 +146,6 @@ Int_t nCl = track->GetNumberOfTPCClusters();
     }
        }
        
-       
-       
-/*
-       for (Int_t idxCluster = 0; idxCluster < track->GetNumberOfTPCClusters(); ++idxCluster){
-         
-         }
-       */  
       }
       track = track->GetNextTrack();
     }

diff --git a/HLT/global/ReadFlatESD.C b/HLT/global/ReadFlatESD.C
index da1e80662c7ed7ae2f92bd0c2fbcc44b46d5f36a..917460b87310ec79e794ac06f4ad62f0c2ecd674 100644 (file)
--- a/HLT/global/ReadFlatESD.C
+++ b/HLT/global/ReadFlatESD.C
@@ -30,7 +30,7 @@ void ReadFlatESD(const char* filename="outFlatESD.dat", Bool_t verbose=kFALSE) {
     is.seekg (0, is.end);
     int length = is.tellg();
     is.seekg (0, is.beg);
-    std::cout << "length"<<length<<endl;
+    std::cout << "length "<<length<<endl;
     char * buffer = new char [length];
     
     std::cout << "Reading " << length << " characters... ";
@@ -47,12 +47,15 @@ void ReadFlatESD(const char* filename="outFlatESD.dat", Bool_t verbose=kFALSE) {
     char *curr = buffer;
     char *endBuff = buffer+length;
     int iEvent = 0;
+    
     while( curr < endBuff ){
-      cout<<"Reading event "<<iEvent<<":"<<endl;
+      cout<<endl<<"Reading event "<<iEvent<<":"<<endl;
+    Printf("curr: %p \t endBuff: %p \t diff %p ", curr, endBuff, endBuff-curr);
       AliFlatESDEvent *flatEsd = reinterpret_cast<AliFlatESDEvent *>(curr);
                        new (flatEsd) AliFlatESDEvent(1);
 
-      cout<<"vtx SPD: "<<(Bool_t) flatEsd->GetPrimaryVertexSPD()
+      
+cout<<"vtx SPD: "<<(Bool_t) flatEsd->GetPrimaryVertexSPD()
          <<" vtx tracks: "<<(Bool_t) flatEsd->GetPrimaryVertexTracks() 
          <<" ntracks: "<<flatEsd->GetNumberOfTracks()
          <<" nV0's: "<<flatEsd->GetNumberOfV0s()
@@ -65,6 +68,7 @@ void ReadFlatESD(const char* filename="outFlatESD.dat", Bool_t verbose=kFALSE) {
 if(verbose){
        static const int nExt = 4;
          AliFlatESDTrack *track = flatEsd->GetTracks();
+         new (track)AliFlatESDTrack(1);
     for (Int_t idxTrack = 0; idxTrack < flatEsd->GetNumberOfTracks() && track; ++idxTrack) { 
 
                AliFlatExternalTrackParam* ext[nExt] ={
@@ -89,64 +93,45 @@ cout<<endl<<iExt<<endl;
 
 
                cout<<" alpha"<<iExt<<" :"  << (ext[iExt] ? ext[iExt]->GetAlpha() : -9999) <<endl;
-                       
-
-               
 cout<<" GetX"<<iExt<<" :"  << (ext[iExt] ? ext[iExt]->GetX(): -9999) <<endl;
-
-
-               
        cout<<" 1/pt"<<iExt<<" :"  <<  (ext[iExt] ? ext[iExt]->GetSigned1Pt(): -9999)  <<endl;
                        
 
 }
        
                cout<<" nTPCclusters: "<<track->GetNumberOfTPCClusters()<< endl;
+               cout<<" nITSclusters: "<<track->GetNumberOfITSClusters()<< endl;
 
-               cout<<" nITSclusters: "<<track->GetNumberOfITSClusters()<< endl;
-
+// read clusters
 
-// compare clusters
-       if(  track->GetNumberOfTPCClusters()){
-               for (Int_t idxCluster = 0; idxCluster < track->GetNumberOfTPCClusters(); ++idxCluster){
-                       AliFlatTPCCluster * cl = track->GetTPCCluster(idxCluster);
-
-                               cout<<" clusterNr fX fY fZ fPadRow fSigmaY2 fSigmaZ2 fCharge fQMax" <<endl;
-                               cout<< idxCluster<<" "<< cl->GetX()<<" "<< cl->GetY()<<" "<< cl->GetZ()<<" "<< cl->GetPadRow()<<" "<< cl->GetSigmaY2()<<" "<< cl->GetSigmaZ2()<<" "<< cl->GetCharge()<<" "<< cl->GetQMax() <<endl;
-                               
-               }
-         }
+       Int_t nCl = track->GetNumberOfTPCClusters();
+       if(nCl && verbose > 1){
+       
+      for (Int_t idxRow = 0; idxRow <  nCl; idxRow++){
+      cout<<"rowNr "<< idxRow<<endl;
+      
+      AliFlatTPCCluster * cl = track->GetTPCCluster(idxRow);
+
+                               cout<<" idx fX fY fZ  fSigmaY2 fSigmaZ2 fCharge fQMax fPadRow" <<endl;
+                               if(cl) cout<< idxRow <<" "<< cl->GetX()<<" "<< cl->GetY()<<" "<< cl->GetZ()<<" "<< cl->GetSigmaY2()<<" "<< cl->GetSigmaZ2()<<" "<< cl->GetCharge()<<" "<< cl->GetQMax() <<" "<< cl->GetPadRow()<<endl;
+                               else cout <<"----------------------------------------------------"<<endl;
+    }
+       }
      
+      cout<<"get next track"<<endl;
       track = track->GetNextTrack();
+               new (track)AliFlatESDTrack(1);
          
          
          }
 }
 
-
-
-
-
-
-
-
-
-
-
+    Printf("curr: %p \t + %d = %p , diff:%p", curr, flatEsd->GetSize() ,curr+ flatEsd->GetSize(), endBuff-(curr+ flatEsd->GetSize())   );
       curr=curr+ flatEsd->GetSize();
       iEvent++;
     }
 
 
-
-
-
-
-
-
-
-
-
     delete[] buffer;
   }
   else {