bug fixes: problem with v0s, if trackID != number of track, AliFlatESDFriend track...
authorsgweber <steffen.georg.weber@cern.ch>
Mon, 3 Nov 2014 10:49:27 +0000 (11:49 +0100)
committersgweber <steffen.georg.weber@cern.ch>
Mon, 3 Nov 2014 10:49:27 +0000 (11:49 +0100)
HLT/global/AliFlatESDEvent.cxx
HLT/global/AliFlatESDFriend.cxx
HLT/global/AliFlatESDFriend.h
HLT/global/AliFlatESDFriendTrack.h
HLT/global/AliFlatTPCseed.h
HLT/global/AliHLTGlobalCompareFlatComponent.cxx
HLT/global/AliHLTGlobalEsdConverterComponent.cxx
HLT/global/AliHLTGlobalEsdToFlatConverterComponent.cxx
HLT/global/AliHLTGlobalFlatEsdConverterComponent.cxx
HLT/global/AliHLTGlobalVertexerComponent.cxx

index 42e1481..3889e6c 100644 (file)
@@ -197,7 +197,8 @@ void AliFlatESDEvent::Reset()
   
   ULong64_t size = sizeof(AliFlatESDEvent);
   size += 2 * sizeof( AliFlatESDVertex );
-  size += esd->GetNumberOfTracks() * AliFlatESDTrack::EstimateSize();
+       // 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;
index 2eded5c..2209254 100644 (file)
@@ -61,7 +61,8 @@ void AliFlatESDFriend::Ls() const
   // -> Added objects have to be added here as well
   if(esdFriend == NULL) return 0;
   ULong64_t size = sizeof(AliFlatESDFriend);
-  size += esdFriend->GetNumberOfTracks() *  AliFlatESDFriendTrack::EstimateSize();
+       // one Long64_t per track for tracks table
+  size += esdFriend->GetNumberOfTracks() *  (AliFlatESDFriendTrack::EstimateSize() + sizeof(Long64_t) );
   return size;
 }
 
index cec1246..134ecae 100644 (file)
@@ -71,8 +71,23 @@ public:
   }
  
   const AliFlatESDFriendTrack  *GetFlatTrackEntry( Int_t i ) const { 
-    if( i<0 || i>fNTrackEntries ) return NULL;
-    return reinterpret_cast<const AliFlatESDFriendTrack*>( fContent + i );
+    const Long64_t *table = reinterpret_cast<const Long64_t*> (fContent + fTrackTablePointer);
+    if( i<0 || i>fNTrackEntries || table[i]<0 ) return NULL;
+    return reinterpret_cast<const AliFlatESDFriendTrack*>( fContent + table[i] );
+  }
+  
+  
+
+  AliFlatESDFriendTrack  *GetFlatTrackNonConst( Int_t i ){ 
+    const Long64_t *table = reinterpret_cast<const Long64_t*> (fContent + fTrackTablePointer);
+    if( i<0 || i>fNTracks || table[i]<0 ) return NULL;
+    return reinterpret_cast<AliFlatESDFriendTrack*>( fContent + table[i] );
+  }
+
+  AliFlatESDFriendTrack  *GetFlatTrackEntryNonConst( Int_t i ){ 
+    const Long64_t *table = reinterpret_cast<const Long64_t*> (fContent + fTrackTablePointer);
+    if( i<0 || i>fNTrackEntries || table[i]<0 ) return NULL;
+    return reinterpret_cast<AliFlatESDFriendTrack*>( fContent + table[i] );
   }
 
   // -- Size methods
@@ -86,17 +101,6 @@ private:
   AliFlatESDFriend(const AliFlatESDFriend&);
   AliFlatESDFriend& operator=(const AliFlatESDFriend& );  
 
-  AliFlatESDFriendTrack  *GetFlatTrackNonConst( Int_t i ){ 
-    const Long64_t *table = reinterpret_cast<const Long64_t*> (fContent + fTrackTablePointer);
-    if( i<0 || i>fNTracks || table[i]<0 ) return NULL;
-    return reinterpret_cast<AliFlatESDFriendTrack*>( fContent + table[i] );
-  }
-
-  AliFlatESDFriendTrack  *GetFlatTrackEntryNonConst( Int_t i ){ 
-    if( i<0 || i>fNTrackEntries ) return NULL;
-    return reinterpret_cast< AliFlatESDFriendTrack*>( fContent + i );
-  }
-
   size_t fContentSize;     // Size of fContent
   UInt_t fBitFlags; // bit flags
   Int_t fNTracks;                   // Number of tracks in vector
index 9254db7..08b2c34 100644 (file)
@@ -73,6 +73,9 @@ class AliFlatESDFriendTrack :public AliVfriendTrack
   AliFlatTPCseed* SetTPCseedStart();
   void SetTPCseedEnd( size_t tpcSeedSize );
 
+       
+       
+  const AliFlatTPCseed* GetFlatTPCseed( ) const{return reinterpret_cast<const AliFlatTPCseed*>(fContent+fTPCseedPointer); };
   
   const AliFlatESDFriendTrack *GetNextTrack() const { return reinterpret_cast<const AliFlatESDFriendTrack*>(fContent+fContentSize); }
   AliFlatESDFriendTrack *GetNextTrackNonConst() { return reinterpret_cast<AliFlatESDFriendTrack*>(fContent+fContentSize); }
@@ -107,7 +110,7 @@ class AliFlatESDFriendTrack :public AliVfriendTrack
   
   Byte_t fContent[1];                  // Variale size object, which contains all data
 
- // ClassDef(AliFlatESDFriendTrack, 0)
+  ClassDef(AliFlatESDFriendTrack, 0)
 
 };
 
index a2dd1f7..d5e2db8 100644 (file)
@@ -55,7 +55,12 @@ class AliFlatTPCseed
 
   void SetLabel( Int_t lab ){ fLabel=lab; }
 
-  void AddCluster( const AliTPCclusterMI *cl, const AliTPCTrackerPoint *p ){ if(cl) GetClustersNonConst()[fNTPCClusters++].SetTPCCluster( cl, p );  }
+  void AddCluster( const AliTPCclusterMI *cl, const AliTPCTrackerPoint *p ){
+               if(cl){
+                       GetClustersNonConst()[fNTPCClusters++].SetTPCCluster( cl, p );
+                       fContentSize+=sizeof(AliFlatTPCCluster);
+               }
+       }
 
 
   // --------------------------------------------------------------------------------
index 3d2d83c..76ee9be 100644 (file)
@@ -37,7 +37,7 @@
 #include "AliHLTGlobalCompareFlatComponent.h"
 #include "AliHLTITSClusterDataFormat.h"
 #include "AliHLTTPCDefinitions.h"
-#include "AliTPCseed.h"
+#include "AliFlatTPCseed.h"
 #include "AliExternalTrackParam.h"
 #include "TTree.h"
 #include "AliCDBEntry.h"
@@ -49,23 +49,27 @@ using namespace std;
 ClassImp(AliHLTGlobalCompareFlatComponent)
 
 void AliHLTGlobalCompareFlatComponent::printDiff( string name, double val1, double val2){
-       double relDiff = ( val1 != 0 || val2!=0 ) ? (val1-val2)/(fabs(val1) + fabs(val2)): 0;
+       double sum = fabs(val1) + fabs(val2);
+       double relDiff = ( val1 != 0 || val2!=0 ) ? (val1-val2)/sum: 0;
+       
        int diff = 0;
-       if (relDiff > 1e-6) diff = 1;
-       else if(relDiff < -1e-6) diff = -1;
+       if (relDiff > 1e-4 && sum > 1e-6) diff = 1;
+       else if(relDiff < -1e-4 && sum > 1e-6) diff = -1;
        outFile<<name<<"\t" << val1 << "\t" << val2 <<"\t" << diff << "\n";
 }
 
 
 
 void AliHLTGlobalCompareFlatComponent::printDiff( string name, int n , double* vals1, double* vals2 ){
+       double sum = 0;
        double relDiff = 0;
        int diff = 0;
        
        for(int i=0; i<n && diff == 0; i++){
-               relDiff = ( vals1[i] != 0 || vals2[i] !=0 ) ? (vals1[i]-vals2[i])/(fabs(vals1[i]) + fabs(vals2[i])): 0;
-               if (relDiff > 1e-6) diff = 1;
-               else if(relDiff < -1e-6) diff = -1;
+               sum = fabs(vals1[i]) + fabs(vals2[i]) ; 
+               relDiff = ( vals1[i] != 0 || vals2[i] !=0 ) ? (vals1[i]-vals2[i])/sum : 0;
+               if (relDiff > 1e-4 && sum > 1e-6) diff = 1;
+               else if(relDiff < -1e-4 && sum > 1e-6) diff = -1;
        }
                
        outFile<<name<<"\t";
@@ -282,6 +286,7 @@ Int_t AliHLTGlobalCompareFlatComponent::DoEvent(const AliHLTComponentEventData&
        
  cout<<"size event : "<<flatEsd[0]->GetSize() << " "<<flatEsd[1]->GetSize()<<endl;
  cout<<"nTracks : "<<flatEsd[0]->GetNumberOfTracks()<<" "<<flatEsd[1]->GetNumberOfTracks()<<endl;
+ cout<<"nV0s : "<<flatEsd[0]->GetNumberOfV0s()<<" "<<flatEsd[1]->GetNumberOfV0s()<<endl;
  
  cout<<"size friend : "<<flatFriend[0]->GetSize() << " "<<flatFriend[1]->GetSize()<<endl;
  cout<<"nFriendTracks : "<<flatFriend[0]->GetNumberOfTracks()<<" "<<flatFriend[1]->GetNumberOfTracks()<<endl;
@@ -444,44 +449,51 @@ Int_t AliHLTGlobalCompareFlatComponent::DoEvent(const AliHLTComponentEventData&
        
        
        // compare friend tracks
-       /*
+       
        if(flatFriend[0]->GetEntriesInTracks()  && flatFriend[1]->GetEntriesInTracks() ){
                outFile<<"------------------\nfriend tracks\n------------------\n";
                
-    AliFlatESDFriendTrack * track[2] = { const_cast<AliFlatESDFriendTrack*>(flatFriend[0]->GetFlatTrackEntry(0) ) , const_cast<AliFlatESDFriendTrack*>(flatFriend[1]->GetFlatTrackEntry(0) ) };
+    AliFlatESDFriendTrack * track[2] = { flatFriend[0]->GetFlatTrackEntryNonConst(0), flatFriend[1]->GetFlatTrackEntryNonConst(0)};
+               
+               
     for( Int_t t = 0; t < flatFriend[0]->GetEntriesInTracks()  && t < flatFriend[1]->GetEntriesInTracks()  ; t++ ){
+                       
+                       
+               //      cout<<"track0.size"<<track[0]->GetSize()<<endl;
+       //              cout<<"track1.size"<<track[1]->GetSize()<<endl;
+                       
+                       
                        if(!track[0] || !track[1]) continue;
       outFile<<"\nnew AliFlatESDFriendTrack\n";
                        printDiff( "AliFlatESDFriendTrack::GetSize",track[0]->GetSize(),track[1]->GetSize() ); 
                        
                        AliExternalTrackParam p[3][2]; 
-                       AliExternalTrackParam q =AliExternalTrackParam() ;
                        
                        const char* pNames[3] = {"TPCOut", "ITSOut", "TRDIn"};
                        
-               //      track[0]->GetTrackParamTPCOut(q );
-               //      track[1]->GetTrackParamTPCOut(p[0][1] );
+                       track[0]->GetTrackParamTPCOut(p[0][0] );
+                       track[1]->GetTrackParamTPCOut(p[0][1] );
                        
-               //      track[0]->GetTrackParamITSOut(p[1][0] );
-                       //track[1]->GetTrackParamITSOut(p[1][1] );
+                       track[0]->GetTrackParamITSOut(p[1][0] );
+                       track[1]->GetTrackParamITSOut(p[1][1] );
                        
                        
-                       //track[0]->GetTrackParamTRDIn(p[2][0] );
-                       //track[1]->GetTrackParamTRDIn(p[2][1] );
+                       track[0]->GetTrackParamTRDIn(p[2][0] );
+                       track[1]->GetTrackParamTRDIn(p[2][1] );
                        
-                                       for(int i = 0 ; i<7; i++){
-                                       outFile<<"\nnew AliExternalTrackParam" << pNames[i] << "\n";
-                                       printDiff( Form("AliExternalTrackParam%s::GetAlpha",pNames[i]),p[i][0].GetAlpha(),p[i][1].GetAlpha() ); 
-                                       printDiff( Form("AliExternalTrackParam%s::GetX",pNames[i]),p[i][0].GetX(),p[i][1].GetX() ); 
-                                       printDiff( Form("AliExternalTrackParam%s::GetY",pNames[i]),p[i][0].GetY(),p[i][1].GetY() ); 
-                                       printDiff( Form("AliExternalTrackParam%s::GetZ",pNames[i]),p[i][0].GetZ(),p[i][1].GetZ() ); 
-                                       printDiff( Form("AliExternalTrackParam%s::GetSnp",pNames[i]),p[i][0].GetSnp(),p[i][1].GetSnp() ); 
-                                       printDiff( Form("AliExternalTrackParam%s::GetTgl",pNames[i]),p[i][0].GetTgl(),p[i][1].GetTgl() ); 
-                                       printDiff( Form("AliExternalTrackParam%s::GetSigned1Pt",pNames[i]),p[i][0].GetSigned1Pt(),p[i][1].GetSigned1Pt() ); 
+                       for(int i = 0 ; i<3; i++){
+                               outFile<<"\nnew AliExternalTrackParam" << pNames[i] << "\n";
+                               printDiff( Form("AliExternalTrackParam%s::GetAlpha",pNames[i]),p[i][0].GetAlpha(),p[i][1].GetAlpha() ); 
+                               printDiff( Form("AliExternalTrackParam%s::GetX",pNames[i]),p[i][0].GetX(),p[i][1].GetX() ); 
+                               printDiff( Form("AliExternalTrackParam%s::GetY",pNames[i]),p[i][0].GetY(),p[i][1].GetY() ); 
+                               printDiff( Form("AliExternalTrackParam%s::GetZ",pNames[i]),p[i][0].GetZ(),p[i][1].GetZ() ); 
+                               printDiff( Form("AliExternalTrackParam%s::GetSnp",pNames[i]),p[i][0].GetSnp(),p[i][1].GetSnp() ); 
+                               printDiff( Form("AliExternalTrackParam%s::GetTgl",pNames[i]),p[i][0].GetTgl(),p[i][1].GetTgl() ); 
+                               printDiff( Form("AliExternalTrackParam%s::GetSigned1Pt",pNames[i]),p[i][0].GetSigned1Pt(),p[i][1].GetSigned1Pt() ); 
                                        
                                        
-                                       Double_t* cov[2] = { const_cast<Double_t*>( p[i][0].GetCovariance()) , const_cast<Double_t*>( p[i][1].GetCovariance() ) };
-                                       printDiff( Form("AliExternalTrackParam%s::GetCovariance",pNames[i]) , 15, cov[0], cov[1]); 
+                               Double_t* cov[2] = { const_cast<Double_t*>( p[i][0].GetCovariance()) , const_cast<Double_t*>( p[i][1].GetCovariance() ) };
+                               printDiff( Form("AliExternalTrackParam%s::GetCovariance",pNames[i]) , 15, cov[0], cov[1]); 
                        
                        }
                        
@@ -489,11 +501,14 @@ Int_t AliHLTGlobalCompareFlatComponent::DoEvent(const AliHLTComponentEventData&
                        
                        
                        
-                       AliTPCseed s[2];
+                       const AliFlatTPCseed* s[2]={ track[0]->GetFlatTPCseed(), track[1]->GetFlatTPCseed()};
+                       printDiff( "AliFlatTPCseed::GetSize",s[0]->GetSize(),s[1]->GetSize() ); 
+                       printDiff( "AliFlatTPCseed::GetLabel",s[0]->GetLabel(),s[1]->GetLabel() ); 
+                       printDiff( "AliFlatTPCseed::GetNClusters",s[0]->GetNClusters(),s[1]->GetNClusters() ); 
                        
                        
-                       track[0]->GetTPCseed(s[0] );
-                       track[1]->GetTPCseed(s[1] );
+                       //printf("track0: %p next: %p", track[0], track[0]->GetNextTrackNonConst() );
+                       //printf("track1: %p next: %p", track[1], track[1]->GetNextTrackNonConst() );
                        
       track[0] = track[0]->GetNextTrackNonConst();
                        track[1] = track[1]->GetNextTrackNonConst();    
@@ -502,7 +517,7 @@ Int_t AliHLTGlobalCompareFlatComponent::DoEvent(const AliHLTComponentEventData&
                }
        
        }
-       */
+       
        outFile.close();
  
  
index fe1cc92..10a0c78 100644 (file)
@@ -405,6 +405,7 @@ int AliHLTGlobalEsdConverterComponent::DoEvent(const AliHLTComponentEventData& e
       iResult=PushBack(pTree, kAliHLTDataTypeESDTree|kAliHLTDataOriginOut, 0);
     } else {
       cout<<"Write ESD block: n tracks "<<pESD->GetNumberOfTracks()<<endl;
+      cout<<"Write ESD block: n v0s "<<pESD->GetNumberOfV0s()<<endl;
       iResult=PushBack(pESD, kAliHLTDataTypeESDObject|kAliHLTDataOriginOut, 0);
     }
     fBenchmark.AddOutput(GetLastObjectSize());
@@ -436,7 +437,7 @@ int AliHLTGlobalEsdConverterComponent::DoEvent(const AliHLTComponentEventData& e
        fBenchmark.GetStatisticsData(statistics, names);
          fBenchmark.Reset();
   
-       AliSysInfo::AddStamp("AliHLTGlobalEsdConverterComponent::DoEvent.Stop", (int)(statistics[1]), (int)(statistics[2]),pESD->GetNumberOfV0s(),pESD->GetNumberOfTracks() );
+       AliSysInfo::AddStamp("AliHLTGlobalEsdConverterComponent::DoEvent.Stop", (int)(statistics[1]), (int)(statistics[2]),pESD->GetNumberOfTracks(),pESD->GetNumberOfV0s() );
   }
   
   for(Int_t i=0; i<fkNPartition; i++){
@@ -561,6 +562,30 @@ int AliHLTGlobalEsdConverterComponent::ProcessBlocks(TTree* pTree, AliESDEvent*
        c->SetTimeBin( (Int_t) padtime[2] );
       }
     } // end of loop over blocks of clusters    
+    
+    
+        // fill event info
+    {
+      for( Int_t iSlice=0; iSlice<36; iSlice++ ){
+       int iSector = iSlice;
+       int nclu = 0;
+       for( Int_t iPartition=0; iPartition<3; iPartition++){       
+         int slicepartition = iSlice*6+iPartition;
+         nclu+= fNPartitionClusters[slicepartition];
+       }
+       pESDfriend->SetNclustersTPC( iSector, nclu );
+       iSector = 36+iSlice;
+       nclu = 0;
+       for( Int_t iPartition=3; iPartition<6; iPartition++){       
+         int slicepartition = iSlice*6+iPartition;
+         nclu+= fNPartitionClusters[slicepartition];
+       }
+       pESDfriend->SetNclustersTPC( iSector, nclu );
+      }
+    }
+    
+    
+    
   }
 
   // 1) first read MC information (if present)
@@ -698,7 +723,7 @@ int AliHLTGlobalEsdConverterComponent::ProcessBlocks(TTree* pTree, AliESDEvent*
        iotrack.SetLabel(mcLabel);
        pESD->AddTrack(&iotrack);
        if (fVerbosity>0) element->Print();
-      
+
        if( pESDfriend ){ // create friend track
 
          AliHLTGlobalBarrelTrack gb(*element);
@@ -827,7 +852,7 @@ int AliHLTGlobalEsdConverterComponent::ProcessBlocks(TTree* pTree, AliESDEvent*
       }
     }
   }
-  
+
 
 
   // 3.1. now update ESD tracks with the ITSOut info
index 0dc32a2..cbd97e9 100644 (file)
@@ -236,7 +236,8 @@ Int_t AliHLTGlobalEsdToFlatConverterComponent::DoEvent(const AliHLTComponentEven
     if( esd ){
                        cout <<"ESD object found in input"<<endl;
                        esd->GetStdContent();
-                       cout <<"nr of track:"<<esd->GetNumberOfTracks()<<endl;
+                       cout <<"nr of tracks:"<<esd->GetNumberOfTracks()<<endl;
+                       cout <<"nr of v0s:"<<esd->GetNumberOfV0s()<<endl;
                        iResult=1;
     } else {
     }
@@ -246,13 +247,18 @@ Int_t AliHLTGlobalEsdToFlatConverterComponent::DoEvent(const AliHLTComponentEven
    esdFriend = dynamic_cast<AliESDfriend*>(const_cast<TObject*>(iter));
     if( esdFriend ){
                        cout <<"ESD friend object found in input"<<endl;
-                       cout <<"nr of friend track:"<<esdFriend->GetNumberOfTracks()<<endl;
+                       cout <<"nr of friend tracks:"<<esdFriend->GetNumberOfTracks()<<endl;
     } else {
     }
   }
        AliFlatESDEvent *flatEsd = reinterpret_cast<AliFlatESDEvent*>(outputPtr);
        new (flatEsd) AliFlatESDEvent;
-       flatEsd->SetFromESD(AliFlatESDEvent::EstimateSize(esd),esd, kTRUE); 
+       
+       Int_t converted1 = flatEsd->SetFromESD(AliFlatESDEvent::EstimateSize(esd),esd, kTRUE); 
+       
+       
+                       cout <<"XXX conversion successfull? "<<converted1<<endl;
+                       cout <<"nr of flat v0s:"<<flatEsd->GetNumberOfV0s()<<endl;
        
        if( maxOutputSize > flatEsd->GetSize() ){
     AliHLTComponentBlockData outBlock;
@@ -279,8 +285,24 @@ Int_t AliHLTGlobalEsdToFlatConverterComponent::DoEvent(const AliHLTComponentEven
     new (flatFriend) AliFlatESDFriend;
     freeSpace = freeSpaceTotal - flatFriend->GetSize();
                
-       flatFriend->SetFromESDfriend(AliFlatESDFriend::EstimateSize(esdFriend),esdFriend); 
+               Int_t converted = flatFriend->SetFromESDfriend(AliFlatESDFriend::EstimateSize(esdFriend),esdFriend); 
+               
+                       cout <<"nr of flat friend tracks:"<<flatFriend->GetNumberOfTracks()<<endl;
+                       cout <<"YYY friend conversion successfull? "<<converted<<endl;
+       
+    esd->SaveAs("tmp.root");
+    TFile * fTmp = new TFile ("tmp.root");
+    Int_t sizeIn = fTmp->GetSize();
+               delete fTmp;
                
+    esdFriend->SaveAs("tmp.root");
+    fTmp = new TFile("tmp.root");
+    sizeIn += fTmp->GetSize();
+               delete fTmp;
+       
+  AliSysInfo::AddStamp("AliHLTGlobalEsdToFlatConverterComponent::DoEvent.Stop",sizeIn, flatEsd->GetSize()+ flatFriend->GetSize(),flatEsd->GetNumberOfTracks(),flatEsd->GetNumberOfV0s());
+       
                    { // set up the output block description
     
       AliHLTComponentBlockData outBlock;
@@ -294,9 +316,12 @@ Int_t AliHLTGlobalEsdToFlatConverterComponent::DoEvent(const AliHLTComponentEven
                
                
  }
-               
-  AliSysInfo::AddStamp("AliHLTGlobalEsdToFlatConverterComponent::DoEvent.Stop",0, flatEsd->GetSize(),flatEsd->GetNumberOfV0s(),flatEsd->GetNumberOfTracks());
  
+               
+       
+       
+if(flatEsd->GetNumberOfTracks() > 20 )
+ flatEsd->SaveAs("flatEsdFromEsd.root");
  
   return iResult;
 }
index 7fd7221..05394bb 100644 (file)
@@ -577,7 +577,6 @@ int AliHLTGlobalFlatEsdConverterComponent::DoEvent( const AliHLTComponentEventDa
     fBenchmark.AddOutput(outBlock.fSize);
     size += outBlock.fSize;
   }
-
   
   // ---------------------------------------------
   //
@@ -815,9 +814,9 @@ int AliHLTGlobalFlatEsdConverterComponent::DoEvent( const AliHLTComponentEventDa
     TString names[10];
     fBenchmark.GetStatisticsData(statistics, names);
     fBenchmark.Reset();
-    AliSysInfo::AddStamp("AliHLTGlobalFlatEsdConverterComponent::DoEvent.Stop", (int)(statistics[1]), (int)(statistics[2]),flatEsd->GetNumberOfV0s(),flatEsd->GetNumberOfTracks() );
+    AliSysInfo::AddStamp("AliHLTGlobalFlatEsdConverterComponent::DoEvent.Stop", (int)(statistics[1]), (int)(statistics[2]),flatEsd->GetNumberOfTracks(),flatEsd->GetNumberOfV0s() );
   }
-  
+
   return 0;
 }
 
index f475a13..8f0f6b6 100644 (file)
@@ -172,7 +172,7 @@ int AliHLTGlobalVertexerComponent::DoEvent( const AliHLTComponentEventData& /*ev
                                            AliHLTComponentTriggerData& /*trigData*/ )
 {
   //cout<<"AliHLTGlobalVertexerComponent::DoEvent called"<<endl;
+
   if ( GetFirstInputBlock( kAliHLTDataTypeSOR ) || GetFirstInputBlock( kAliHLTDataTypeEOR ) )
     return 0;
 
@@ -219,12 +219,12 @@ int AliHLTGlobalVertexerComponent::DoEvent( const AliHLTComponentEventData& /*ev
 
       AliHLTTracksData* dataPtr = reinterpret_cast<AliHLTTracksData*>( pBlock->fPtr );
       int nTracks = dataPtr->fCount;
-
       AliHLTExternalTrackParam* currOutTrack = dataPtr->fTracklets;
       for( int itr=0; itr<nTracks; itr++ ){
        AliHLTGlobalBarrelTrack t(*currOutTrack);
        tracks.push_back( t );
-       trackId.push_back( currOutTrack->fTrackID );
+       //!SW trackId.push_back( currOutTrack->fTrackID );
+       trackId.push_back( itr );
        unsigned int dSize = sizeof( AliHLTExternalTrackParam ) + currOutTrack->fNPoints * sizeof( unsigned int );
        currOutTrack = ( AliHLTExternalTrackParam* )( (( Byte_t * )currOutTrack) + dSize );
       }
@@ -238,12 +238,13 @@ int AliHLTGlobalVertexerComponent::DoEvent( const AliHLTComponentEventData& /*ev
       fBenchmark.AddInput(pBlock->fSize);
 
       AliHLTTracksData* dataPtr = reinterpret_cast<AliHLTTracksData*>( pBlock->fPtr );
-      int nTracks = dataPtr->fCount;      
+      int nTracks = dataPtr->fCount;
       AliHLTExternalTrackParam* currOutTrack = dataPtr->fTracklets;
       for( int itr=0; itr<nTracks; itr++ ){
        AliHLTGlobalBarrelTrack t(*currOutTrack);
        tracks.push_back( t );
-       trackId.push_back( currOutTrack->fTrackID );
+       //!SW trackId.push_back( currOutTrack->fTrackID );
+       trackId.push_back( itr );
        unsigned int dSize = sizeof( AliHLTExternalTrackParam ) + currOutTrack->fNPoints * sizeof( unsigned int );
        currOutTrack = ( AliHLTExternalTrackParam* )( (( Byte_t * )currOutTrack) + dSize );
       }