]> git.uio.no Git - u/mrichter/AliRoot.git/commit - HLT/trigger/AliHLTTriggerLinkDef.h
Merge branch 'trigger'
authorslindal <slindal@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 31 Mar 2010 17:52:32 +0000 (17:52 +0000)
committerslindal <slindal@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 31 Mar 2010 17:52:32 +0000 (17:52 +0000)
commit739e2587a69a24bc722939224f9f5f2e1eb10376
tree4be8e6b406c8a7b609303ed5cb7fdc836c3f86a1
parent0903d3cd20fe5dbc54913675b91f3e24a5e69eb7
Merge branch 'trigger'

* trigger:
  Tested new CALO cluster Energy trigger class with 2 child instances, PHOS & EMCal
  Changed PHOS threshold trigger to CALO threshold trigger and made PHOS a child. Emcal not yet added
HLT/libAliHLTTrigger.pkg
HLT/trigger/AliHLTTriggerAgent.cxx
HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx [new file with mode: 0644]
HLT/trigger/AliHLTTriggerCaloClusterEnergy.h [new file with mode: 0644]
HLT/trigger/AliHLTTriggerEmcalClusterEnergy.cxx [new file with mode: 0644]
HLT/trigger/AliHLTTriggerEmcalClusterEnergy.h [new file with mode: 0644]
HLT/trigger/AliHLTTriggerLinkDef.h
HLT/trigger/AliHLTTriggerPhosClusterEnergy.cxx
HLT/trigger/AliHLTTriggerPhosClusterEnergy.h
HLT/trigger/test/testPhosClusterEnergyTrigger.C