Merge branch 'trackMatcher'
authorslindal <slindal@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 18 Feb 2010 17:12:56 +0000 (17:12 +0000)
committerslindal <slindal@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 18 Feb 2010 17:12:56 +0000 (17:12 +0000)
commit2a24cbbe235abddd6bb13b197ea1cfc95b364a36
tree76ee27aae17518f2e221a8f1ff285487cb66db29
parent9b98c4df3e334cd0f49724801e887d783c25553b
Merge branch 'trackMatcher'

* trackMatcher:
  -Tested and cleaned up
  -Added track matcher component
  Added AliHLTGlobalTrackMatcherComponent

Conflicts:
BASE/util/AliHLTCaloClusterDataStruct.h
BASE/util/AliHLTESDCaloClusterMaker.cxx
CALO/AliHLTCaloClusterAnalyser.cxx
PHOS/AliHLTPHOSGeometry.cxx
12 files changed:
HLT/BASE/util/AliHLTCaloClusterDataStruct.h
HLT/BASE/util/AliHLTESDCaloClusterMaker.cxx
HLT/BASE/util/AliHLTGlobalBarrelTrack.h
HLT/CALO/AliHLTCaloClusterAnalyser.cxx
HLT/CALO/AliHLTCaloClusterizer.cxx
HLT/global/AliHLTGlobalEsdConverterComponent.cxx
HLT/global/AliHLTGlobalTrackMatcher.cxx
HLT/global/AliHLTGlobalTrackMatcher.h
HLT/global/AliHLTGlobalTrackMatcherComponent.cxx [new file with mode: 0644]
HLT/global/AliHLTGlobalTrackMatcherComponent.h [new file with mode: 0644]
HLT/global/physics/AliHLTCaloHistoComponent.cxx
HLT/libAliHLTGlobal.pkg