From: vestbo <vestbo@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 23 May 2002 13:45:13 +0000 (+0000)
Subject: Switched on slow merging.
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=a96e18ecbf1d3e177edccd189ce443c1651d05a5;hp=3fe49b5bceb770afd22b52c650b236e65e07591c

Switched on slow merging.
---

diff --git a/HLT/src/AliLevel3.cxx b/HLT/src/AliLevel3.cxx
index ed9a6694728..de1a7b5d19a 100644
--- a/HLT/src/AliLevel3.cxx
+++ b/HLT/src/AliLevel3.cxx
@@ -232,8 +232,8 @@ void AliLevel3::ProcessEvent(Int_t first,Int_t last,Int_t event){
   }
   fBenchmark->Start("Global Merger");
   //fGlobalMerger->AddAllTracks();
-  fGlobalMerger->Merge();
-  //fGlobalMerger->SlowMerge();
+  //fGlobalMerger->Merge();
+  fGlobalMerger->SlowMerge();
   fBenchmark->Stop("Global Merger");
 
   if(fWriteOut) WriteResults(); 
@@ -256,7 +256,7 @@ void AliLevel3::ProcessSlice(Int_t slice){
   fTrackMerger->Reset();
   fTrackMerger->SetRows(fRow[0]);
   for(Int_t patch=fNPatch-1;patch>=0;patch--){
-    fFileHandler->Init(slice,patch,fRow[patch]);
+    fFileHandler->Init(slice,patch);
     UInt_t npoints=0;
     AliL3SpacePointData *points =0;
     UInt_t ndigits=0;
@@ -485,9 +485,9 @@ void AliLevel3::ProcessSlice(Int_t slice){
     memory->Free();
   }
   fBenchmark->Start("Patch Merger");
-//  fTrackMerger->SlowMerge();
+  fTrackMerger->SlowMerge();
   //fTrackMerger->AddAllTracks();
-  fTrackMerger->Merge();
+  //fTrackMerger->Merge();
   fBenchmark->Stop("Patch Merger");
   /*
   //write merged tracks