moving AliHLTKalmanTrack to libALiHLTUtil in order to get HLTbase free from

AliRoot dependencies.

diff --git a/HLT/BASE/HLTbaseLinkDef.h b/HLT/BASE/HLTbaseLinkDef.h
index 881cc0fd4be16e7e27616d01ac88f75cd84ad4b1..3b69a1d7960716c2818012fb2edb8b20b07d8740 100644 (file)
--- a/HLT/BASE/HLTbaseLinkDef.h
+++ b/HLT/BASE/HLTbaseLinkDef.h
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 #ifdef __CINT__
 #pragma link off all globals;
 #pragma link off all classes;
@@ -51,7 +51,6 @@
 #pragma link C++ class AliHLTTriggerMenuItem+;
 #pragma link C++ class AliHLTTriggerMenuSymbol+;
 #pragma link C++ class AliHLTRunStatistics+;
-#pragma link C++ class AliHLTKalmanTrack+;
 #pragma link C++ struct AliHLTComponentDataType+;
 #pragma link C++ struct AliHLTEventDDL+;
 #endif

diff --git a/HLT/BASE/AliHLTKalmanTrack.cxx b/HLT/BASE/util/AliHLTKalmanTrack.cxx
similarity index 93%
rename from HLT/BASE/AliHLTKalmanTrack.cxx
rename to HLT/BASE/util/AliHLTKalmanTrack.cxx
index 78b2fcc25ed53c00f97fd324567339f5e08f195a..e53154beb452785df705af94d57f5b43cba97b4c 100644 (file)
--- a/HLT/BASE/AliHLTKalmanTrack.cxx
+++ b/HLT/BASE/util/AliHLTKalmanTrack.cxx
@@ -17,6 +17,9 @@
 #include "AliHLTKalmanTrack.h"
 #include "AliHLTExternalTrackParam.h"
 
+/** ROOT macro for the implementation of ROOT specific class methods */
+ClassImp(AliHLTKalmanTrack)
+
 AliHLTKalmanTrack::AliHLTKalmanTrack( const AliHLTExternalTrackParam &t)
   : AliKalmanTrack()
 {

diff --git a/HLT/BASE/AliHLTKalmanTrack.h b/HLT/BASE/util/AliHLTKalmanTrack.h
similarity index 88%
rename from HLT/BASE/AliHLTKalmanTrack.h
rename to HLT/BASE/util/AliHLTKalmanTrack.h
index 490115f22c53c63cb2eed4806f8c467084f18acb..c4bf3d05425a594a6dbdd51aeb6a072bfa95a822 100644 (file)
--- a/HLT/BASE/AliHLTKalmanTrack.h
+++ b/HLT/BASE/util/AliHLTKalmanTrack.h
@@ -1,3 +1,4 @@
+
 //* This file is property of and copyright by the ALICE HLT Project        * 
 //* ALICE Experiment at CERN, All rights reserved.                         *
 //* See cxx source for full Copyright notice                               *
@@ -22,6 +23,9 @@ class AliHLTKalmanTrack :public AliKalmanTrack
   Double_t GetPredictedChi2(const AliCluster * /*c*/) const { return 0; }
   Bool_t PropagateTo(Double_t /*xr*/, Double_t /*x0*/, Double_t /*rho*/){ return 0; }
   Bool_t Update(const AliCluster* /*c*/, Double_t /*chi2*/, Int_t /*index*/){ return 0; }
+
+ private:
+  ClassDef(AliHLTKalmanTrack, 0) // Temporary class to convert AliHLTExternalTrackParam to ESD tracks
 };
 
 

diff --git a/HLT/libAliHLTITS.pkg b/HLT/libAliHLTITS.pkg
index dfe07e2c3ec423f85d66c82291da9cb4e7c8d0eb..6a81784929763c192d27abd60f19e0de3d0fe449 100644 (file)
--- a/HLT/libAliHLTITS.pkg
+++ b/HLT/libAliHLTITS.pkg
@@ -24,7 +24,7 @@ MODULE_HDRS:=         $(CLASS_HDRS) \
 
 MODULE_DHDR:=          
 
-EINCLUDE := HLT/BASE HLT/ITS HLT/TPCLib HLT/ITS/tracking HLT/MUON/src TPC ITS MUON STEER RAW
+EINCLUDE := HLT/BASE HLT/BASE/util HLT/ITS HLT/TPCLib HLT/ITS/tracking ITS STEER RAW
 
 LIBRARY_DEP := -lHLTbase -lAliHLTUtil -lRAWDatarec -lRAWDatabase -lITSrec -lITSbase -lESD -lSTEER -lSTEERBase -L$(shell root-config --libdir) -lEG
 

diff --git a/HLT/libAliHLTUtil.pkg b/HLT/libAliHLTUtil.pkg
index 6569b007d944fc36b0219464e4f84499b1a8b490..b48b00185c51de2918ec3934c9b9050df182ef02 100644 (file)
--- a/HLT/libAliHLTUtil.pkg
+++ b/HLT/libAliHLTUtil.pkg
@@ -16,6 +16,7 @@ CLASS_HDRS:=          AliHLTFilePublisher.h \
                AliHLTDataGenerator.h \
                AliHLTBlockFilterComponent.h \
                AliHLTCompStatCollector.h \
+                AliHLTKalmanTrack.h \
                AliHLTAgentUtil.h
 
 #              AliHLTMCGeneratorComponent.h

diff --git a/HLT/libHLTbase.pkg b/HLT/libHLTbase.pkg
index 058f499a82b6f9a0088d03f9511e636d896f7b33..c808e39c3952f6ac7e837c70f538e27653696d13 100644 (file)
--- a/HLT/libHLTbase.pkg
+++ b/HLT/libHLTbase.pkg
@@ -50,8 +50,7 @@ CLASS_HDRS:=          AliHLTComponent.h \
                 AliHLTTriggerMenu.h                         \
                 AliHLTTriggerMenuItem.h                     \
                 AliHLTTriggerMenuSymbol.h                   \
-                AliHLTRunStatistics.h \
-                AliHLTKalmanTrack.h
+                AliHLTRunStatistics.h