remove AliHLTTPCCalibrationComponent from the AliHLTTPCAgent

[u/mrichter/AliRoot.git] / HLT / TPCLib / AliHLTTPCGlobalMerger.cxx

diff --git a/HLT/TPCLib/AliHLTTPCGlobalMerger.cxx b/HLT/TPCLib/AliHLTTPCGlobalMerger.cxx
index 4a079e70fc4f9dac8dd20128a0df936a1b4992b9..456ac325d882c0fae9328afc4a52418f2b7fdc69 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCGlobalMerger.cxx
+++ b/HLT/TPCLib/AliHLTTPCGlobalMerger.cxx
@@ -1,9 +1,28 @@
 // @(#) $Id$
+// Original: AliHLTGlobalMerger.cxx,v 1.13 2005/06/14 10:55:21 cvetan 
 
-// Author: Uli Frankenfeld <mailto:franken@fi.uib.no>
-//*-- Copyright &copy ALICE HLT Group 
+/**************************************************************************
+ * This file is property of and copyright by the ALICE HLT Project        * 
+ * ALICE Experiment at CERN, All rights reserved.                         *
+ *                                                                        *
+ * Primary Authors: Uli Frankenfeld, maintained by                          *
+ *                  Matthias Richter <Matthias.Richter@ift.uib.no>        *
+ *                  for The ALICE HLT Project.                            *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
 
-#include "AliHLTTPCStandardIncludes.h"
+/** @file   AliHLTTPCGlobalMerger.cxx
+    @author Uli Frankenfeld, maintained by Matthias Richter
+    @date   
+    @brief  The HLT TPC slice merger
+*/
 
 #include "AliHLTTPCLogging.h"
 #include "AliHLTTPCGlobalMerger.h"
@@ -11,16 +30,6 @@
 #include "AliHLTTPCTransform.h"
 #include "AliHLTTPCTrackArray.h"
 
-/** \class AliHLTTPCGlobalMerger
-<pre>
-//_____________________________________________________________
-// AliHLTTPCGlobalMerger
-//
-// The HLTTPC Slice merger
-//
-</pre>
-*/
-
 #if __GNUC__ >= 3
 using namespace std;
 #endif
@@ -28,13 +37,14 @@ using namespace std;
 ClassImp(AliHLTTPCGlobalMerger)
 
 AliHLTTPCGlobalMerger::AliHLTTPCGlobalMerger()
+  :
+  fNSlices(0),
+  fFirst(0),
+  fLast(0)
 {
   //Default constructor. Use Setup to specify and setup the necessary parameters and arrays.
   Is2Global(kTRUE);
   SetParameter(0,0,0,0,0);
-  fNSlices=0;
-  fFirst=0;
-  fLast=0;
 }
 
 
@@ -112,7 +122,7 @@ Double_t AliHLTTPCGlobalMerger::CheckTracks(AliHLTTPCTrack *innertrack,AliHLTTPC
   return diff;
 }
 
-void AliHLTTPCGlobalMerger::SlowMerge(Char_t *path)
+void AliHLTTPCGlobalMerger::SlowMerge(const Char_t *path)
 {
   //Tuning of parameters. This matches _all_ tracks between two neighbouring
   //slices, and merges the ones which are closest in space. The difference
@@ -274,7 +284,7 @@ void AliHLTTPCGlobalMerger::Merge()
          ismatched0[s0]=kFALSE;
          AliHLTTPCTrack *track0=ttt0->GetCheckedTrack(s0);
          if(!track0) continue;
-         track0->CalculateHelix();
+         //track0->CalculateHelix();    //This it done in TrackArray
          track0->CalculateEdgePoint(angle);
          if(track0->IsPoint()) 
            {
@@ -287,7 +297,7 @@ void AliHLTTPCGlobalMerger::Merge()
          ismatched1[s1]=kFALSE;
          AliHLTTPCTrack *track1=ttt1->GetCheckedTrack(s1);
          if(!track1) continue;
-         track1->CalculateHelix();
+         //track1->CalculateHelix();   //This is done in TrackArray
          track1->CalculateEdgePoint(angle);
          if(track1->IsPoint()) 
            {