diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt
index a0f038d21caa942107fcafc27f9288d4dae4031f..f036fad3b041fffb2a271ef81305f456bf901a6b 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt
@@ -39,7 +39,7 @@ atlas_add_component( TrigMuonHypo
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTrigMuon MuonIdHelpersLib MuonRecHelperToolsLib TrigInDetEvent TrigMuonEvent TrigSteeringEvent TrigInterfacesLib DecisionHandling AthViews xAODMuon xAODTracking GaudiKernel MuonSegment MuonSegmentMakerUtils TrigConfHLTData TrigT1Interfaces TrigT1Result )
-atlas_add_test( TrigMuonHypoConfig SCRIPT python -m TrigMuonHypo.testTrigMuonHypoConfig
+atlas_add_test( TrigMuonHypoConfig SCRIPT python -m TrigMuonHypo.TrigMuonHypoConfig
POST_EXEC_SCRIPT nopost.sh )
# Install files from the package:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoConfigMT.py b/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoConfigMT.py
deleted file mode 100755
index 18c48d4c66f319c90c029e707fe3b2317c69b3f6..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoConfigMT.py
+++ /dev/null
@@ -1,725 +0,0 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-
-from TrigMuonHypo.TrigMuonHypoConf import TrigMufastHypoAlg, TrigMufastHypoTool, TrigmuCombHypoAlg, TrigmuCombHypoTool, TrigMuonEFMSonlyHypoAlg, TrigMuonEFMSonlyHypoTool, TrigMuisoHypoAlg, TrigMuisoHypoTool, TrigMuonEFCombinerHypoAlg, TrigMuonEFCombinerHypoTool
-from TrigMuonHypo.TrigMuonHypoMonitoringMT import *
-from AthenaCommon.SystemOfUnits import GeV
-#from MuonByteStream.MuonByteStreamFlags import muonByteStreamFlags
-#from TrigMuonBackExtrapolator.TrigMuonBackExtrapolatorConfig import *
-from AthenaCommon.AppMgr import ToolSvc
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-import re
-
-#ToolSvc += MuonBackExtrapolatorForAlignedDet()
-#ToolSvc += MuonBackExtrapolatorForMisalignedDet()
-
-trigMuonEFSAThresholds = {
- '0GeV' : [ [0,9.9], [ 0.100 ] ],
- '2GeV' : [ [0,9.9], [ 2.000 ] ],
- '3GeV' : [ [0,9.9], [ 3.000 ] ],
- '4GeV' : [ [0,1.05,1.5,2.0,9.9], [ 3.0, 2.5, 2.5, 2.5] ],
- '4GeV_barrelOnly' : [ [0,1.05,1.5,2.0,9.9], [ 3.0,1000.0,1000.0,1000.0]],
- '5GeV' : [ [0,1.05,1.5,2.0,9.9], [ 4.6, 3.3, 4.0, 4.5] ],
- '6GeV' : [ [0,1.05,1.5,2.0,9.9], [ 5.4, 4.5, 4.9, 5.3] ],
- '7GeV' : [ [0,1.05,1.5,2.0,9.9], [ 6.3, 5.6, 5.6, 6.3] ],
- '8GeV' : [ [0,1.05,1.5,2.0,9.9], [ 7.2, 6.7, 6.4, 7.3] ],
- '10GeV' : [ [0,1.05,1.5,2.0,9.9], [ 8.9, 9.0, 8.4, 9.2] ],
- '11GeV' : [ [0,1.05,1.5,2.0,9.9], [ 9.8, 10.1, 9.3, 10.1] ],
- '12GeV' : [ [0,1.05,1.5,2.0,9.9], [ 10.6, 11.0, 10.2, 11.0] ],
- '13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.4, 12.0, 11.1, 12.0] ],
- '14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.2, 13.0, 12.1, 13.0] ],
- '15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.0, 14.0, 13.0, 14.0] ],
- '18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 15.7, 16.6, 15.4, 16.3] ],
- '20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 17.5, 18.5, 17.0, 18.0] ],
- '22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 19.1, 20.0, 18.4, 19.6] ],
- '24GeV' : [ [0,1.05,1.5,2.0,9.9], [ 20.4, 20.8, 19.3, 21.0] ],
- '30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.0, 24.5, 23.0, 26.0] ],
- '40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 32.5] ],
- '40GeV_barrelOnly' : [ [0,1.05,1.5,2.0,9.9], [ 31.5,1000.0,1000.0,1000.0]],
- '40GeV_uptoEC2' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 1000.0]],
- '50GeV' : [ [0,1.05,1.5,2.0,9.9], [ 45.0, 45.0, 45.0, 45.0] ],
- '50GeV_barrelOnly' : [ [0,1.05,1.5,2.0,9.9], [ 45.0,1000.0,1000.0,1000.0]],
- '60GeV' : [ [0,1.05,1.5,2.0,9.9], [ 54.0, 54.0, 54.0, 54.0] ],
- '60GeV_barrelOnly' : [ [0,1.05,1.5,2.0,9.9], [ 54.0,1000.0,1000.0,1000.0]],
- '70GeV' : [ [0,1.05,1.5,2.0,9.9], [ 63.0, 63.0, 63.0, 63.0] ],
- '80GeV' : [ [0,1.05,1.5,2.0,9.9], [ 72.0, 72.0, 72.0, 72.0] ],
- '100GeV' : [ [0,1.05,1.5,2.0,9.9], [ 90.0, 90.0, 90.0, 90.0] ],
- }
-
-
-efCombinerThresholds = {
- '2GeV' : [ [0,9.9], [2.000] ],
- '3GeV' : [ [0,9.9], [3.000] ],
- '4GeV' : [ [0,1.05,1.5,2.0,9.9], [ 3.93, 3.91, 3.88, 3.88] ],
- '5GeV' : [ [0,1.05,1.5,2.0,9.9], [ 4.91, 4.86, 4.84, 4.83] ],
- '6GeV' : [ [0,1.05,1.5,2.0,9.9], [ 5.88, 5.81, 5.78, 5.76] ],
- '7GeV' : [ [0,1.05,1.5,2.0,9.9], [ 6.85, 6.77, 6.74, 6.74] ],
- '8GeV' : [ [0,1.05,1.5,2.0,9.9], [ 7.82, 7.74, 7.70, 7.72] ],
- '10GeV' : [ [0,1.05,1.5,2.0,9.9], [ 9.77, 9.67, 9.62, 9.57] ],
- '11GeV' : [ [0,1.05,1.5,2.0,9.9], [ 10.74, 10.64, 10.58, 10.53] ],
- '12GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.70, 11.59, 11.53, 11.49] ],
- '13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.67, 12.55, 12.49, 12.46] ],
- '14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.65, 13.52, 13.46, 13.42] ],
- '15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 14.63, 14.49, 14.42, 14.38] ],
- '18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 17.53, 17.39, 17.34, 17.28] ],
- '20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 19.47, 19.33, 19.30, 19.22] ],
- '22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 21.40, 21.27, 21.25, 21.16] ],
- '24GeV' : [ [0,1.05,1.5,2.0,9.9], [ 23.34, 23.19, 23.14, 23.06] ],
- '26GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.29, 25.15, 25.14, 25.05] ],
- '27GeV' : [ [0,1.05,1.5,2.0,9.9], [ 26.26, 26.12, 26.11, 26.02] ],
- '28GeV' : [ [0,1.05,1.5,2.0,9.9], [ 27.23, 27.09, 27.07, 26.99] ],
- '30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 29.17, 29.03, 29.00, 28.92] ],
- '32GeV' : [ [0,1.05,1.5,2.0,9.9], [ 31.10, 30.96, 30.91, 30.84] ],
- '34GeV' : [ [0,1.05,1.5,2.0,9.9], [ 33.04, 32.88, 32.81, 32.74] ],
- '36GeV' : [ [0,1.05,1.5,2.0,9.9], [ 34.96, 34.78, 34.69, 34.63] ],
- '38GeV' : [ [0,1.05,1.5,2.0,9.9], [ 36.87, 36.67, 36.55, 36.48] ],
- '40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 38.76, 38.54, 38.38, 38.31] ],
- '50GeV' : [ [0,1.05,1.5,2.0,9.9], [ 45.00, 45.00, 45.00, 45.00] ],
- '60GeV' : [ [0,1.05,1.5,2.0,9.9], [ 54.00, 54.00, 54.00, 54.00] ],
- '70GeV' : [ [0,1.05,1.5,2.0,9.9], [ 63.00, 63.00, 63.00, 63.00] ],
- '80GeV' : [ [0,1.05,1.5,2.0,9.9], [ 72.00, 72.00, 72.00, 72.00] ],
- '100GeV' : [ [0,1.05,1.5,2.0,9.9], [ 90.00, 90.00, 90.00, 90.00] ],
- # original + 2015 tuning
- '2GeV_v15a' : [ [0,9.9], [2.000] ],
- '3GeV_v15a' : [ [0,9.9], [3.000] ],
- '4GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 3.94, 3.91, 3.77, 3.72] ],
- '5GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 4.91, 4.86, 4.84, 4.83] ],
- '6GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 5.92, 5.86, 5.70, 5.64] ],
- '7GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 6.85, 6.77, 6.74, 6.74] ],
- '8GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 7.89, 7.81, 7.60, 7.53] ],
- '10GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 9.84, 9.77, 9.54, 9.47] ],
- '11GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 10.74, 10.64, 10.58, 10.53] ],
- '12GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 11.70, 11.59, 11.53, 11.49] ],
- '13GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 12.80, 12.67, 12.43, 12.38] ],
- '14GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 13.75, 13.62, 13.38, 13.36] ],
- '15GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 14.63, 14.49, 14.42, 14.38] ],
- '16GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 15.65, 15.50, 15.39, 15.37] ], # Lidia - extrapolated not optimized
- '18GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 17.68, 17.51, 17.34, 17.34] ],
- '20GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 19.65, 19.42, 19.16, 19.19] ],
- '22GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.57, 21.32, 21.07, 21.11] ],
- '24GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 23.53, 23.21, 22.99, 23.03] ],
- '26GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 25.49, 25.15, 24.90, 24.95] ],
- '27GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 26.26, 26.12, 26.11, 26.02] ],
- '28GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 27.23, 27.09, 27.07, 26.99] ],
- '30GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 29.17, 29.03, 29.00, 28.92] ],
- '32GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 31.10, 30.96, 30.91, 30.84] ],
- '34GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 33.04, 32.88, 32.81, 32.74] ],
- '35GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 34.14, 33.82, 33.65, 33.65] ], # Lidia - extrapolated not optimized
- '36GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 35.23, 34.75, 34.48, 34.55] ],
- '38GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 36.87, 36.67, 36.55, 36.48] ],
- '40GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 38.76, 38.54, 38.38, 38.31] ],
- '50GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 45.00, 45.00, 45.00, 45.00] ],
- '60GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 54.00, 54.00, 54.00, 54.00] ],
- '70GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 63.00, 63.00, 63.00, 63.00] ],
- '80GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 72.00, 72.00, 72.00, 72.00] ],
- '100GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 90.00, 90.00, 90.00, 90.00] ],
- }
-
-efCaloTagThresholds = {
- '0GeV' : [ [0,9.9], [ 0.1, 0.1, 0.1, 0.1 ] ],
- '2GeV' : [ [0,9.9], [ 2.0, 2.0, 2.0, 2.0 ] ],
- '3GeV' : [ [0,9.9], [ 3.0, 3.0, 3.0, 3.0 ] ],
- '4GeV' : [ [0,1.05,1.5,2.0,9.9], [ 4.0, 4.0, 4.0, 4.0 ] ],
- '5GeV' : [ [0,1.05,1.5,2.0,9.9], [ 5.0, 5.0, 5.0, 5.0 ] ],
- '6GeV' : [ [0,1.05,1.5,2.0,9.9], [ 6.0, 6.0, 6.0, 6.0 ] ],
- '7GeV' : [ [0,1.05,1.5,2.0,9.9], [ 7.0, 7.0, 7.0, 7.0 ] ],
- '8GeV' : [ [0,1.05,1.5,2.0,9.9], [ 8.0, 8.0, 8.0, 8.0 ] ],
- '10GeV' : [ [0,1.05,1.5,2.0,9.9], [ 10.0, 10.0, 10.0, 10.0 ] ],
- '11GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.0, 11.0, 11.0, 11.0 ] ],
- '12GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.0, 12.0, 12.0, 12.0 ] ],
- '13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.0, 13.0, 13.0, 13.0 ] ],
- '14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 14.0, 14.0, 14.0, 14.0 ] ],
- '15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 15.0, 15.0, 15.0, 15.0 ] ],
- '18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 18.0, 18.0, 18.0, 18.0 ] ],
- '20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 20.0, 20.0, 20.0, 20.0 ] ],
- '22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 22.0, 22.0, 22.0, 22.0 ] ],
- '24GeV' : [ [0,1.05,1.5,2.0,9.9], [ 24.0, 24.0, 24.0, 24.0 ] ],
- '30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 30.0, 30.0, 30.0, 30.0 ] ],
- '40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0 ] ],
- '50GeV' : [ [0,1.05,1.5,2.0,9.9], [ 50.0, 50.0, 50.0, 50.0 ] ],
- '60GeV' : [ [0,1.05,1.5,2.0,9.9], [ 60.0, 60.0, 60.0, 60.0 ] ],
- '70GeV' : [ [0,1.05,1.5,2.0,9.9], [ 70.0, 70.0, 70.0, 70.0 ] ],
- '80GeV' : [ [0,1.05,1.5,2.0,9.9], [ 80.0, 80.0, 80.0, 80.0 ] ],
- '100GeV' : [ [0,1.05,1.5,2.0,9.9], [ 100.0,100.0,100.0,100.0 ] ]
-}
-
-
-muCombThresholds = {
- '2GeV' : [ [0,9.9], [ 2.000] ],
- '3GeV' : [ [0,9.9], [ 3.000] ],
- '4GeV' : [ [0,1.05,1.5,2.0,9.9], [ 3.0, 2.5, 2.5, 2.5] ],
- '5GeV' : [ [0,1.05,1.5,2.0,9.9], [ 4.9, 4.8, 4.8, 4.8] ],
- '6GeV' : [ [0,1.05,1.5,2.0,9.9], [ 5.8, 5.8, 5.8, 5.6] ],
- '7GeV' : [ [0,1.05,1.5,2.0,9.9], [ 6.8, 6.7, 6.7, 6.6] ],
- '8GeV' : [ [0,1.05,1.5,2.0,9.9], [ 7.8, 7.7, 7.7, 7.7] ],
- '10GeV' : [ [0,1.05,1.5,2.0,9.9], [ 9.8, 9.5, 9.6, 9.7] ],
- '11GeV' : [ [0,1.05,1.5,2.0,9.9], [ 10.8, 10.4, 10.6, 10.6] ],
- '12GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.7, 11.3, 11.4, 11.5] ],
- '13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.6, 12.2, 12.2, 12.4] ],
- '14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.6, 13.1, 13.1, 13.5] ],
- '15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 14.5, 14.0, 14.0, 14.5] ],
- '18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 17.5, 16.6, 16.6, 16.8] ],
- '20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 19.5, 18.5, 18.5, 18.5] ],
- '22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 21.4, 20.3, 20.3, 20.1] ],
- '24GeV' : [ [0,1.05,1.5,2.0,9.9], [ 23.2, 22.2, 22.2, 21.8] ],
- '25GeV' : [ [0,1.05,1.5,2.0,9.9], [ 24.2, 23.2, 23.2, 22.6] ],
- '26GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.3, 24.1, 24.1, 23.5] ],
- '27GeV' : [ [0,1.05,1.5,2.0,9.9], [ 26.2, 25.1, 25.1, 24.4] ],
- '28GeV' : [ [0,1.05,1.5,2.0,9.9], [ 27.1, 26.0, 26.0, 25.2] ],
- '30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 29.0, 28.0, 28.0, 27.0] ],
- '32GeV' : [ [0,1.05,1.5,2.0,9.9], [ 30.7, 29.9, 29.9, 28.7] ],
- '34GeV' : [ [0,1.05,1.5,2.0,9.9], [ 32.5, 31.8, 31.8, 30.4] ],
- '36GeV' : [ [0,1.05,1.5,2.0,9.9], [ 34.2, 33.6, 33.6, 32.1] ],
- '38GeV' : [ [0,1.05,1.5,2.0,9.9], [ 35.8, 35.4, 35.4, 33.6] ],
- '40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.5, 37.0, 37.0, 35.0] ],
- '40GeV_slow' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0] ],
- '50GeV' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0] ],
- '60GeV' : [ [0,1.05,1.5,2.0,9.9], [ 45.0, 45.0, 45.0, 45.0] ],
- '60GeV_slow' : [ [0,1.05,1.5,2.0,9.9], [ 47.0, 47.0, 47.0, 47.0] ],
- '70GeV' : [ [0,1.05,1.5,2.0,9.9], [ 49.0, 49.0, 49.0, 49.0] ],
- '80GeV' : [ [0,1.05,1.5,2.0,9.9], [ 56.0, 56.0, 56.0, 56.0] ],
- '100GeV' : [ [0,1.05,1.5,2.0,9.9], [ 70.0, 70.0, 70.0, 70.0] ],
- # original + 2015 tuning
- '2GeV_v15a' : [ [0,9.9], [ 2.000] ],
- '3GeV_v15a' : [ [0,9.9], [ 3.000] ],
- '4GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 3.86, 3.77, 3.69, 3.70] ],
- '5GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 4.9, 4.8, 4.8, 4.8] ],
- '6GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 5.87, 5.79, 5.70, 5.62] ],
- '7GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 6.8, 6.7, 6.7, 6.6] ],
- '8GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 7.80, 7.72, 7.59, 7.46] ],
- '10GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 9.73, 9.63, 9.45, 9.24] ],
- '11GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 10.8, 10.4, 10.6, 10.6] ],
- '12GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 11.7, 11.3, 11.4, 11.5] ],
- '13GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 12.62, 12.48, 12.24, 11.88] ],
- '14GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 13.57, 13.44, 13.21, 12.77] ],
- '15GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 14.5, 14.0, 14.0, 14.5] ],
- '16GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 15.47, 15.09, 14.98, 15.08] ], # Lidia - extrapolated not optimized
- '18GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 17.41, 17.27, 16.95, 16.25] ],
- '20GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 19.31, 19.19, 18.80, 17.95] ],
- '22GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.19, 21.07, 20.68, 19.71] ],
- '24GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 23.08, 22.99, 22.56, 21.39] ],
- '25GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 24.2, 23.2, 23.2, 22.6] ],
- '26GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 24.95, 24.86, 24.39, 23.13] ],
- '27GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 26.2, 25.1, 25.1, 24.4] ],
- '28GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 27.1, 26.0, 26.0, 25.2] ],
- '30GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 29.0, 28.0, 28.0, 27.0] ],
- '32GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 30.7, 29.9, 29.9, 28.7] ],
- '34GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 32.5, 31.8, 31.8, 30.4] ],
- '36GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 34.03, 34.29, 33.58, 31.36] ],
- '38GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 35.8, 35.4, 35.4, 33.6] ],
- '40GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 37.5, 37.0, 37.0, 35.0] ],
- '40GeV_slow_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0] ],
- '50GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0] ],
- '60GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 45.0, 45.0, 45.0, 45.0] ],
- '60GeV_slow_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 47.0, 47.0, 47.0, 47.0] ],
- '70GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 49.0, 49.0, 49.0, 49.0] ],
- '80GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 56.0, 56.0, 56.0, 56.0] ],
- '100GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 70.0, 70.0, 70.0, 70.0] ],
- }
-
-
-muFastThresholds = {
- #
- # original + 2010 tuning
- '2GeV' : [ [0,9.9], [ 2.000] ],
- '3GeV' : [ [0,9.9], [ 3.000] ],
- '4GeV' : [ [0,1.05,1.5,2.0,9.9], [ 3.0, 2.5, 2.5, 2.5] ],
- '4GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 3.0, 1.8, 2.0, 2.5] ],
- '5GeV' : [ [0,1.05,1.5,2.0,9.9], [ 4.6, 3.3, 4.0, 4.5] ],
- '6GeV' : [ [0,1.05,1.5,2.0,9.9], [ 5.4, 4.5, 4.9, 5.3] ],
- '6GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 5.2, 4.0, 4.0, 4.5] ],
- '7GeV' : [ [0,1.05,1.5,2.0,9.9], [ 6.3, 5.6, 5.6, 6.3] ],
- '8GeV' : [ [0,1.05,1.5,2.0,9.9], [ 7.2, 6.7, 6.4, 7.3] ],
- '10GeV' : [ [0,1.05,1.5,2.0,9.9], [ 8.9, 9.0, 8.4, 9.2] ],
- '10GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 8.5, 7.0, 7.0, 8.0] ],
- '11GeV' : [ [0,1.05,1.5,2.0,9.9], [ 9.8, 10.1, 9.3, 10.1] ],
- '12GeV' : [ [0,1.05,1.5,2.0,9.9], [ 10.6, 11.0, 10.2, 11.0] ],
- '13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.4, 12.0, 11.1, 12.0] ],
- '14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.2, 13.0, 12.1, 13.0] ],
- '15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.0, 14.0, 13.0, 14.0] ],
- '18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 15.7, 16.6, 15.4, 16.3] ],
- '20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 17.5, 18.5, 17.0, 18.0] ],
- '20GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 16.2, 12.9, 13.2, 15.5] ],
- '22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 19.1, 20.0, 18.4, 19.6] ],
- '30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.0, 24.5, 23.0, 26.0] ],
- '30GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 22.3, 17.1, 18.6, 22.2] ],
- '40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 32.5] ],
- '40GeV_barrelOnly' : [ [0,1.05,1.5,2.0,9.9], [ 31.5,1000.0,1000.0,1000.0] ],
- '40GeV_uptoEC2' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 1000.0] ],
- '40GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 27.1, 23.6, 24.2, 26.4] ],
- '40GeV_slow' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0] ],
- '50GeV' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 32.5] ],
- '60GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.8, 36., 34.2, 39.] ],
- '60GeV_slow' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 45.0, 40.0] ],
- '70GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.8, 36.0, 34.2, 39.0] ],
- '80GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.8, 36.0, 34.2, 39.0] ],
- '100GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.8, 36.0, 34.2, 39.0] ],
- #
- # 2011a tuning (95%, based on 2010 repro data)
- '4GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 3.41, 3.21, 3.39, 3.53] ],
- '4GeV_barrelOnly_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 3.41, 1000., 1000., 1000.] ],
- '6GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 5.04, 4.81, 5.01, 5.25] ],
- '10GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 8.08, 7.68, 8.28, 8.90] ],
- '13GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 10.00, 9.33, 10.28, 11.42] ],
- '15GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 11.31, 10.52, 12.00, 13.24] ],
- '18GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 12.95, 12.32, 13.92, 15.51] ],
- '20GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 13.94, 13.50, 15.28, 16.79] ],
- '22GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 14.85, 14.48, 16.36, 18.45] ],
- '24GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 15.68, 15.51, 17.49, 19.82] ],
- '30GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 17.83, 18.32, 20.46, 23.73] ],
- '40GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 29.54] ],
- '40GeV_uptoEC2_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 1000.] ],
- '40GeV_barrelOnly_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 1000., 1000., 1000.] ],
- '50GeV_barrelOnly_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 1000., 1000., 1000.] ],
- '60GeV_barrelOnly_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 1000., 1000., 1000.] ],
- # 2011b tuning (90%, based on 2010 repro data)
- '40GeV_v11b' : [ [0,1.05,1.5,2.0,9.9], [ 26.88, 26.54, 29.22, 32.18] ],
- '40GeV_uptoEC2_v11b' : [ [0,1.05,1.5,2.0,9.9], [ 26.88, 26.54, 29.22, 1000.] ],
- '40GeV_barrelOnly_v11b' : [ [0,1.05,1.5,2.0,9.9], [ 26.88, 1000., 1000., 1000.] ],
- # 2011a tuning + 2015 tuning
- '4GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 3.38, 1.25, 3.17, 3.41] ],
- '4GeV_barrelOnly_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 3.38, 1000., 1000., 1000.] ],
- '6GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 5.17, 3.25, 4.69, 5.14] ],
- '8GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 6.63, 5.17, 6.39, 6.81] ],
- '10GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 8.28, 6.35, 7.19, 8.58] ],
- '13GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 10.42, 7.16, 7.81, 10.80] ],
- '14GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 11.15, 7.58, 8.43, 11.61] ],
- '15GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 11.31, 10.52, 12.00, 13.24] ],
- '18GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 14.33, 9.45, 10.96, 14.35] ],
- '20GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 15.87, 10.73, 12.21, 15.87] ],
- '22GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 17.00, 10.77, 13.38, 17.05] ],
- '24GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 18.24, 11.35, 14.49, 17.91] ],
- '26GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 19.52, 11.61, 15.42, 19.35] ],
- '30GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 17.83, 18.32, 20.46, 23.73] ],
- '36GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 23.94, 12.25, 19.80, 23.17] ],
- '40GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 29.54] ],
- '60GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 29.54] ],
- '80GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 29.54] ],
- '40GeV_uptoEC2_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 1000.] ],
- '40GeV_barrelOnly_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 1000., 1000., 1000.] ],
- '50GeV_barrelOnly_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 1000., 1000., 1000.] ],
- '60GeV_barrelOnly_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 1000., 1000., 1000.] ],
- }
-
-
-muFastThresholdsForECWeakBRegion = {
- #
- # original + 2010 tuning
- '2GeV' : [ 2.0, 2.0 ],
- '3GeV' : [ 3.0, 3.0 ],
- '4GeV' : [ 2.5, 2.5 ],
- '4GeV_V2' : [ 1.8, 2.0 ],
- '5GeV' : [ 3.3, 4.0 ],
- '6GeV' : [ 4.5, 4.9 ],
- '6GeV_V2' : [ 4.0, 4.0 ],
- '7GeV' : [ 5.6, 5.6 ],
- '8GeV' : [ 6.7, 6.4 ],
- '10GeV' : [ 9.0, 8.4 ],
- '10GeV_V2' : [ 7.0, 7.0 ],
- '11GeV' : [ 10.1, 9.3 ],
- '12GeV' : [ 11.0, 10.2 ],
- '13GeV' : [ 12.0, 11.1 ],
- '14GeV' : [ 13.0, 12.1 ],
- '15GeV' : [ 14.0, 13.0 ],
- '18GeV' : [ 16.6, 15.4 ],
- '20GeV' : [ 18.5, 17.0 ],
- '20GeV_V2' : [ 12.9, 13.2 ],
- '22GeV' : [ 20.0, 18.4 ],
- '30GeV' : [ 24.5, 23.0 ],
- '30GeV_V2' : [ 17.1, 18.6 ],
- '40GeV' : [ 30.0, 28.5 ],
- '40GeV_barrelOnly' : [ 1000.0, 1000.0 ],
- '40GeV_uptoEC2' : [ 30.0, 28.5 ],
- '40GeV_V2' : [ 23.6, 24.2 ],
- '40GeV_slow' : [ 40.0, 40.0 ],
- '50GeV' : [ 30.0, 28.5 ],
- '60GeV' : [ 30.0, 28.5 ],
- '60GeV_slow' : [ 60.0, 60.0 ],
- '70GeV' : [ 30.0, 28.5 ],
- '80GeV' : [ 30.0, 28.5 ],
- '100GeV' : [ 30.0, 28.5 ],
- #
- # 2011a tuning (95%, based on 2010 repro data)
- '4GeV_v11a' : [ 2.11, 2.97 ],
- '4GeV_barrelOnly_v11a' : [ 1000., 1000. ],
- '6GeV_v11a' : [ 4.37, 3.77 ],
- '10GeV_v11a' : [ 6.61, 5.34 ],
- '13GeV_v11a' : [ 6.81, 6.97 ],
- '15GeV_v11a' : [ 7.61, 7.81 ],
- '18GeV_v11a' : [ 9.01, 9.83 ],
- '20GeV_v11a' : [ 10.15, 11.88 ],
- '22GeV_v11a' : [ 10.72, 12.54 ],
- '24GeV_v11a' : [ 11.66, 13.97 ],
- '30GeV_v11a' : [ 14.41, 17.43 ],
- '40GeV_v11a' : [ 15.07, 18.02 ],
- '40GeV_uptoEC2_v11a' : [ 15.07, 18.02 ],
- '40GeV_barrelOnly_v11a' : [ 1000., 1000. ],
- '50GeV_barrelOnly_v11a' : [ 1000., 1000. ],
- '60GeV_barrelOnly_v11a' : [ 1000., 1000. ],
- # 2011b tuning (90%, based on 2010 repro data)
- '40GeV_v11b' : [ 26.54, 29.22 ],
- '40GeV_uptoEC2_v11b' : [ 26.54, 29.22 ],
- '40GeV_barrelOnly_v11b' : [ 1000., 1000. ],
- '50GeV_barrelOnly_v11b' : [ 1000., 1000. ],
- '60GeV_barrelOnly_v11b' : [ 1000., 1000. ],
- # 2011a tuning + 2015 tuning
- '4GeV_v15a' : [ 2.72, 1.58],
- '4GeV_barrelOnly_v15a' : [ 1000., 1000. ],
- '6GeV_v15a' : [ 3.91, 2.22],
- '8GeV_v15a' : [ 4.65, 3.26],
- '10GeV_v15a' : [ 5.96, 4.24],
- '13GeV_v15a' : [ 6.65, 4.64],
- '14GeV_v15a' : [ 6.78, 5.03],
- '15GeV_v15a' : [ 7.61, 7.81 ],
- '18GeV_v15a' : [ 8.48, 7.26],
- '20GeV_v15a' : [ 8.63, 7.26],
- '22GeV_v15a' : [ 9.53, 7.77],
- '24GeV_v15a' : [ 9.02, 8.31],
- '26GeV_v15a' : [ 9.89, 8.77],
- '30GeV_v15a' : [ 14.41, 17.43 ],
- '36GeV_v15a' : [ 10.78, 10.66],
- '40GeV_v15a' : [ 15.07, 18.02 ],
- '60GeV_v15a' : [ 15.07, 18.02 ],
- '80GeV_v15a' : [ 15.07, 18.02 ],
- '40GeV_uptoEC2_v15a' : [ 15.07, 18.02 ],
- '40GeV_barrelOnly_v15a' : [ 1000., 1000. ],
- '50GeV_barrelOnly_v15a' : [ 1000., 1000. ],
- '60GeV_barrelOnly_v15a' : [ 1000., 1000. ],
- }
-
-# This class is copied from MufastHypoConfig.
-class TrigMufastHypoConfig(TrigMufastHypoAlg) :
-
- __slots__ = []
-
- def TrigMufastHypoToolFromName( self, name, thresholdHLT ):
-
- from AthenaCommon.Constants import DEBUG
- tool = TrigMufastHypoTool( thresholdHLT )
- tool.OutputLevel = DEBUG
-
- # Separete HLT_NmuX to bname[0]=HLT and bname[1]=NmuX
- bname = thresholdHLT.split('_')
-
- threshold = bname[1]
- thresholds = TrigMufastHypoConfig().decodeThreshold( threshold )
- print "TrigMufastHypoConfig: Decoded ", thresholdHLT, " to ", thresholds
- TrigMufastHypoConfig().ConfigurationHypoTool( name, thresholdHLT, thresholds )
-
- # Setup MonTool for monitored variables in AthenaMonitoring package
- TriggerFlags.enableMonitoring = ["Validation"]
-
- try:
- if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
- tool.MonTool = TrigMufastHypoMonitoring( name + "Monitoring_" + thresholdHLT )
- except AttributeError:
- tool.MonTool = ""
- print name, ' Monitoring Tool failed'
-
- return tool
-
- def decodeThreshold( self, threshold ):
- """ decodes the thresholds of the form mu6, 2mu6, ... """
- print "decoding ", threshold
-
- if threshold[0].isdigit(): # If the form is NmuX, return as list [X,X,X...N times...]
- assert threshold[1:3] == "mu", "Two digit multiplicity not supported"
- return [ threshold[3:] ] * int( threshold[0] )
-
- if threshold.count('mu') > 1: # If theform is muXmuY, return as [X,Y]
- return threshold.strip('mu').split('mu')
-
- # If the form is muX(inclusive), return as 1 element list
- return [ threshold[2:] ]
-
- def ConfigurationHypoTool( self, name, thresholdHLT, thresholds ):
-
- tool = TrigMufastHypoTool( thresholdHLT )
-
- datayear = '2017'
-
- nt = len(thresholds)
- print "TrigMufastHypoConfig: Set ", nt, " thresholds"
- tool.PtBins = [ [ 0, 2.5 ] ] * nt
- tool.PtThresholds = [ [ 5.49 * GeV ] ] * nt
- tool.PtThresholdForECWeakBRegionA = [ 3. * GeV ] * nt
- tool.PtThresholdForECWeakBRegionB = [ 3. * GeV ] * nt
-
- for th, thvalue in enumerate(thresholds):
- if datayear == '2015'or datayear == '2016' or datayear == '2017':
- thvaluename = thvalue + 'GeV_v15a'
- else:
- thvaluename = thvalue + 'GeV'
- print "Number of threshold = ", th, ", Value of threshold = ", thvaluename
-
- try:
- tool.AcceptAll = False
- values = muFastThresholds[thvaluename]
- tool.PtBins[th] = values[0]
- tool.PtThresholds[th] = [ x * GeV for x in values[1] ]
- print "TrigMufastHypoConfig: Configuration of threshold[", th, "] ", tool.PtThresholds[th]
- print "TrigMufastHypoConfig: Configuration of PtBins[", th, "] ", tool.PtBins[th]
- if thvaluename in muFastThresholdsForECWeakBRegion:
- spThres = muFastThresholdsForECWeakBRegion[thvaluename]
- tool.PtThresholdForECWeakBRegionA[th] = spThres[0] * GeV
- tool.PtThresholdForECWeakBRegionB[th] = spThres[1] * GeV
- print 'TrigMufastHypoConfig: -> Thresholds for A[', th, ']/B[', th, ']=',tool.PtThresholdForECWeakBRegionA[th],'/',tool.PtThresholdForECWeakBRegionB[th]
- else:
- print 'TrigMufastHypoConfig: No special thresholds for EC weak Bfield regions for',thvaluename
- print 'TrigMufastHypoConfig: -> Copy EC1 for region A, EC2 for region B'
- spThres = values[0][1]
- if thvaluename == '2GeV' or thvaluename == '3GeV':
- tool.PtThresholdForECWeakBRegionA[th] = spThres[0] * GeV
- tool.PtThresholdForECWeakBRegionB[th] = spThres[0] * GeV
- else:
- tool.PtThresholdForECWeakBRegionA[th] = spThres[1] * GeV
- tool.PtThresholdForECWeakBRegionB[th] = spThres[2] * GeV
- print 'TrigMufastHypoConfig: -> Thresholds for A[', th, ']/B[', th, ']=',tool.PtThresholdForECWeakBRegionA[th],'/',tool.PtThresholdForECWeakBRegionB[th]
-
- except LookupError:
- if (thvaluename=='passthrough'):
- tool.PtBins[th] = [-10000.,10000.]
- tool.PtThresholds[th] = [ -1. * GeV ]
- else:
- raise Exception('MuFast Hypo Misconfigured: threshold %r not supported' % thvaluename)
-
- return thvaluename
-
-
-# This class is copied from MucombHypoConfig.
-class TrigmuCombHypoConfig(TrigmuCombHypoAlg):
-
- __slots__ = []
-
- # thresholdHLT: name threshold, for example HLT_mu6 etc
- def TrigmuCombHypoToolFromName( self, name, thresholdHLT ):
-
- from AthenaCommon.Constants import DEBUG
- tool = TrigmuCombHypoTool( thresholdHLT )
- tool.OutputLevel = DEBUG
-
- # Separete HLT_NmuX to bname[0]=HLT and bname[1]=NmuX
- bname = thresholdHLT.split('_')
-
- threshold = bname[1]
- thresholds = TrigMufastHypoConfig().decodeThreshold( threshold )
- tight = False
-
- TrigmuCombHypoConfig().ConfigurationHypoTool( name, thresholdHLT, thresholds, tight )
- print """ Configuration SUCCESS: Configure threshold """, threshold, """ at TrigmuCombHypoTool """
-
- # Setup MonTool for monitored variables in AthenaMonitoring package
- TriggerFlags.enableMonitoring = ["Validation"]
-
- try:
- if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
- tool.MonTool = TrigmuCombHypoMonitoring( name + "Monitoring_" + thresholdHLT )
- except AttributeError:
- tool.MonTool = ""
- print name, ' Monitoring Tool failed'
-
- return tool
-
- def ConfigurationHypoTool( self, name, thresholdHLT, thresholds, tight ):
-
- tool = TrigmuCombHypoTool( thresholdHLT )
- print 'MucombHypoConfig configured for threshold: ',thresholds
-
- datayear = "2017"
-
- nt = len(thresholds)
- print "TrigMufastHypoConfig: Set ", nt, " thresholds"
- tool.PtBins = [ [ 0, 2.5 ] ] * nt
- tool.PtThresholds = [ [ 5.83 * GeV ] ] * nt
-
- for th, thvalue in enumerate(thresholds):
- if datayear == '2015'or datayear == '2016' or datayear == '2017':
- thvaluename = thvalue + 'GeV_v15a'
- else:
- thvaluename = thvalue + 'GeV'
- print "Number of threshold = ", th, ", Value of threshold = ", thvaluename
-
- try:
- values = muCombThresholds[thvaluename]
- tool.PtBins[th] = values[0]
- tool.PtThresholds[th] = [ x * GeV for x in values[1] ]
- except LookupError:
- if (threshold=='passthrough'):
- tool.AcceptAll = True
- tool.PtBins[th] = [-10000.,10000.]
- tool.PtThresholds[th] = [ -1. * GeV ]
- tool.ApplyStrategyDependentCuts = True
- tool.ApplyPikCuts = False
- else:
- raise Exception('MuComb Hypo Misconfigured: threshold %r not supported' % thvaluename)
-
- if (tight == True):
- tool.ApplyPikCuts = True
- tool.MaxPtToApplyPik = 25.
- tool.MaxChi2IDPik = 3.5
-
- return thvaluename
-
-# This class is copied from MuisoHypoConfig.
-class TrigMuisoHypoConfig(TrigMuisoHypoAlg) :
-
- __slots__ = []
-
- def TrigMuisoHypoToolFromName( self, name, thresholdHLT ):
-
- from AthenaCommon.Constants import DEBUG
- tool = TrigMuisoHypoTool( thresholdHLT )
- tool.OutputLevel = DEBUG
-
- # Separete HLT_NmuX to bname[0]=HLT and bname[1]=NmuX
- bnames = thresholdHLT.split('_')
-
- threshold = bnames[1]
- print "TrigMuisoHypoConfig: Decoded ", thresholdHLT
-
- # If configured with passthrough, set AcceptAll flag on
- tool.AcceptAll = False
- for bname in bnames:
- if 'passthrough' in bname:
- tool.AcceptAll = True
- print 'MuisoHypoConfig configured in pasthrough mode'
-
- if "FTK" in name: # allows us to use different working points in FTK mode
- tool.IDConeSize = 2;
- tool.MaxIDIso_1 = 0.12
- tool.MaxIDIso_2 = 0.12
- tool.MaxIDIso_3 = 0.12
- else:
- tool.IDConeSize = 2;
- tool.MaxIDIso_1 = 0.1
- tool.MaxIDIso_2 = 0.1
- tool.MaxIDIso_3 = 0.1
-
- print 'MuisoHypoConfig configuration done'
-
- # Setup MonTool for monitored variables in AthenaMonitoring package
- TriggerFlags.enableMonitoring = ["Validation"]
-
- try:
- if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
- tool.MonTool = TrigMuisoHypoMonitoring( name + "Monitoring_" + thresholdHLT )
- except AttributeError:
- tool.MonTool = ""
- print name, ' Monitoring Tool failed'
-
- return tool
-
-########MT EF hypo
-class TrigMuonEFMSonlyHypoConfig(TrigMuonEFMSonlyHypoAlg) :
- __slots__ = []
- # nath: name threshold, for example HLT_mu6 etc
- def TrigMuonEFMSonlyHypoToolFromName( self, name, nath ):
- from AthenaCommon.Constants import DEBUG
- tool = TrigMuonEFMSonlyHypoTool( nath )
- tool.OutputLevel = DEBUG
- bname = nath.split('_')
- threshold=bname[1]
- thresholds=TrigMuonEFMSonlyHypoConfig().decodeThreshold(threshold)
- TrigMuonEFMSonlyHypoConfig().ConfigurationHypoTool( name, nath, thresholds )
- # Setup MonTool for monitored variables in AthenaMonitoring package
- try:
- TriggerFlags.enableMonitoring = ["Validation"]
- if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
- tool.MonTool = TrigMuonEFMSonlyHypoMonitoring(name+"Monitoring_"+nath)
- except AttributeError:
- tool.MonTool = ""
- print name, ' Monitoring Tool failed'
-
- return tool
- def decodeThreshold( self, threshold ):
- """ decodes the thresholds of the form mu6, 2mu6, ... """
- print "decoding ", threshold
- if threshold[0].isdigit(): # If the form is NmuX, return as list [X,X,X...N times...]
- assert threshold[1:3] == "mu", "Two digit multiplicity not supported"
- return [ threshold[3:] ] * int( threshold[0] )
-
- if threshold.count('mu') > 1: # If theform is muXmuY, return as [X,Y]
- return threshold.strip('mu').split('mu')
-
- # If the form is muX(inclusive), return as 1 element list
- return [ threshold[2:] ]
- def ConfigurationHypoTool( self, name, nath, thresholds ):
-
- tool = TrigMuonEFMSonlyHypoTool( nath )
- nt = len(thresholds)
- print "TrigMuonEFMSonlyHypoConfig: Set ", nt, " thresholds"
- tool.PtBins = [ [ 0, 2.5 ] ] * nt
- tool.PtThresholds = [ [ 5.49 * GeV ] ] * nt
- for th, thvalue in enumerate(thresholds):
- thvaluename = thvalue + 'GeV'
- try:
- tool.AcceptAll = False
- values = trigMuonEFSAThresholds[thvaluename]
- tool.PtBins[th] = values[0]
- tool.PtThresholds[th] = [ x * GeV for x in values[1] ]
- except LookupError:
- if (threshold=='passthrough'):
- tool.PtBins[th] = [-10000.,10000.]
- tool.PtThresholds[th] = [ -1. * GeV ]
- else:
- raise Exception('MuonEFMSonly Hypo Misconfigured: threshold %r not supported' % threshold)
- return thvaluename
-
-
-
-############ EF combined hypo #################
-
-class TrigMuonEFCombinerHypoConfig(TrigMuonEFCombinerHypoAlg) :
- __slots__ = []
- # nath: name threshold, for example HLT_mu6 etc
- def TrigMuonEFCombinerHypoToolFromName( self, name, nath ):
- from AthenaCommon.Constants import DEBUG
- tool = TrigMuonEFCombinerHypoTool( nath )
- tool.OutputLevel = DEBUG
- bname = nath.split('_')
- threshold=bname[1]
- thresholds=TrigMuonEFCombinerHypoConfig().decodeThreshold(threshold)
- TrigMuonEFCombinerHypoConfig().ConfigurationHypoTool( name, nath, thresholds )
- # Setup MonTool for monitored variables in AthenaMonitoring package
- try:
- TriggerFlags.enableMonitoring = ["Validation"]
- if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
- tool.MonTool = TrigMuonEFCombinerHypoMonitoring(name+"Monitoring_"+nath)
- except AttributeError:
- tool.MonTool = ""
- print name, ' Monitoring Tool failed'
-
- return tool
- def decodeThreshold( self, threshold ):
- """ decodes the thresholds of the form mu6, 2mu6, ... """
- print "decoding ", threshold
- if threshold[0].isdigit(): # If the form is NmuX, return as list [X,X,X...N times...]
- assert threshold[1:3] == "mu", "Two digit multiplicity not supported"
- return [ threshold[3:] ] * int( threshold[0] )
-
- if threshold.count('mu') > 1: # If theform is muXmuY, return as [X,Y]
- return threshold.strip('mu').split('mu')
-
- # If the form is muX(inclusive), return as 1 element list
- return [ threshold[2:] ]
- def ConfigurationHypoTool( self, name, nath, thresholds ):
-
- tool = TrigMuonEFCombinerHypoTool( nath )
- nt = len(thresholds)
- print "TrigMuonEFCombinerHypoConfig: Set ", nt, " thresholds"
- tool.PtBins = [ [ 0, 2.5 ] ] * nt
- tool.PtThresholds = [ [ 5.49 * GeV ] ] * nt
- for th, thvalue in enumerate(thresholds):
- thvaluename = thvalue + 'GeV'
- try:
- tool.AcceptAll = False
- values = efCombinerThresholds[thvaluename]
- tool.PtBins[th] = values[0]
- tool.PtThresholds[th] = [ x * GeV for x in values[1] ]
- except LookupError:
- if (threshold=='passthrough'):
- tool.PtBins[th] = [-10000.,10000.]
- tool.PtThresholds[th] = [ -1. * GeV ]
- else:
- raise Exception('MuonEFCB Hypo Misconfigured: threshold %r not supported' % threshold)
- return thvaluename
-
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx
index f8e7abb472df74ef597c0c1e0b0ae6e79c68511c..f76069948ae550c0116302364316975270d8b596 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx
@@ -7,12 +7,6 @@
#include "TrigMuonHypo/MucombHypo.h"
#include "TrigMuonHypo/MucombStauHypo.h"
#include "TrigMuonHypo/MuisoHypo.h"
-#include "TrigMuonHypo/TrigMufastHypoAlg.h"
-#include "TrigMuonHypo/TrigMufastHypoTool.h"
-#include "TrigMuonHypo/TrigmuCombHypoAlg.h"
-#include "TrigMuonHypo/TrigmuCombHypoTool.h"
-#include "TrigMuonHypo/TrigMuisoHypoAlg.h"
-#include "TrigMuonHypo/TrigMuisoHypoTool.h"
#include "TrigMuonHypo/TrigMooreHypo.h"
#include "TrigMuonHypo/TrigMuonEFSegmentFinderHypo.h"
#include "TrigMuonHypo/TrigMuonEFTrackBuilderHypo.h"
@@ -24,8 +18,6 @@
#include "TrigMuonHypo/TrigMuonEFSegmentHypo.h"
#include "TrigMuonHypo/TrigMuonEFTrackIsolationMultiHypo.h"
#include "TrigMuonHypo/TrigMuonEFTrackIsolationHypo.h"
-#include "TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h"
-#include "TrigMuonHypo/TrigMuonEFTrackIsolationHypoTool.h"
#include "TrigMuonHypo/TrigMuonEFCaloIsolationHypo.h"
#include "TrigMuonHypo/TrigL2DimuonMassHypo.h"
#include "TrigMuonHypo/StauHypo.h"
@@ -39,10 +31,6 @@
#include "TrigMuonHypo/TrigMuonEFExtrapolatorNSWHypo.h"
#include "TrigMuonHypo/TrigMuonEFCombinerDiMuonMassHypo.h"
#include "TrigMuonHypo/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.h"
-#include "TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h"
-#include "TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h"
-#include "TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h"
-#include "TrigMuonHypo/TrigMuonEFCombinerHypoTool.h"
#include "TrigMuonHypo/TrigMuonCaloTagHypo.h"
#include "TrigMuonHypo/TrigMuonIDTrackMultiHypo.h"
@@ -55,12 +43,6 @@ DECLARE_COMPONENT( MufastCALHypo )
DECLARE_COMPONENT( MucombHypo )
DECLARE_COMPONENT( MucombStauHypo )
DECLARE_COMPONENT( MuisoHypo )
-DECLARE_COMPONENT( TrigMufastHypoAlg )
-DECLARE_COMPONENT( TrigMufastHypoTool )
-DECLARE_COMPONENT( TrigmuCombHypoAlg )
-DECLARE_COMPONENT( TrigmuCombHypoTool )
-DECLARE_COMPONENT( TrigMuisoHypoAlg )
-DECLARE_COMPONENT( TrigMuisoHypoTool )
DECLARE_COMPONENT( TrigMooreHypo )
DECLARE_COMPONENT( TrigMuonEFSegmentFinderHypo )
DECLARE_COMPONENT( TrigMuonEFTrackBuilderHypo )
@@ -72,8 +54,6 @@ DECLARE_COMPONENT( TrigMuonEFCombinerMultiHypo )
DECLARE_COMPONENT( TrigMuonEFSegmentHypo )
DECLARE_COMPONENT( TrigMuonEFTrackIsolationMultiHypo )
DECLARE_COMPONENT( TrigMuonEFTrackIsolationHypo )
-DECLARE_COMPONENT( TrigMuonEFTrackIsolationHypoAlg )
-DECLARE_COMPONENT( TrigMuonEFTrackIsolationHypoTool )
DECLARE_COMPONENT( TrigMuonEFCaloIsolationHypo )
DECLARE_COMPONENT( TrigL2DimuonMassHypo )
DECLARE_COMPONENT( StauHypo )
@@ -87,9 +67,5 @@ DECLARE_COMPONENT( MufastNSWHypo )
DECLARE_COMPONENT( TrigMuonEFExtrapolatorNSWHypo )
DECLARE_COMPONENT( TrigMuonEFCombinerDiMuonMassHypo )
DECLARE_COMPONENT( TrigMuonEFCombinerDiMuonMassPtImpactsHypo )
-DECLARE_COMPONENT( TrigMuonEFMSonlyHypoAlg )
-DECLARE_COMPONENT( TrigMuonEFMSonlyHypoTool )
-DECLARE_COMPONENT( TrigMuonEFCombinerHypoAlg )
-DECLARE_COMPONENT( TrigMuonEFCombinerHypoTool )
DECLARE_COMPONENT( TrigMuonCaloTagHypo )
DECLARE_COMPONENT( TrigMuonIDTrackMultiHypo )
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt b/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6784ca2c1da52a472c7bf4367c2946f2701fb35e
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt
@@ -0,0 +1,32 @@
+################################################################################
+# Package: TrigMuonHypoMT
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TrigMuonHypoMT )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Event/xAOD/xAODTrigMuon
+ Trigger/TrigSteer/DecisionHandling
+ Control/AthViews
+ PRIVATE
+ Event/xAOD/xAODMuon
+ GaudiKernel )
+
+# External dependencies:
+find_package( CLHEP )
+
+# Component(s) in the package:
+atlas_add_component( TrigMuonHypoMT
+ src/*.cxx
+ src/components/*.cxx
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTrigMuon TrigInterfacesLib DecisionHandling AthViews xAODMuon GaudiKernel )
+
+atlas_add_test( TrigMuonHypoMTConfig SCRIPT python -m TrigMuonHypoMT.TrigMuonHypoMTConfig
+ POST_EXEC_SCRIPT nopost.sh )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
similarity index 59%
rename from Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
index 3ae64032f6ba5673b90a3768cc0f5327adbd76e4..0a050915deb74401cd63a3807056c082b81ddce8 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
@@ -1,16 +1,12 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-from TrigMuonHypo.TrigMuonHypoConf import TrigMufastHypoAlg, TrigMufastHypoTool, TrigmuCombHypoAlg, TrigmuCombHypoTool, TrigMuonEFMSonlyHypoAlg, TrigMuonEFMSonlyHypoTool, TrigMuisoHypoAlg, TrigMuisoHypoTool, TrigMuonEFCombinerHypoTool
-from TrigMuonHypo.TrigMuonHypoMonitoringMT import *
+from TrigMuonHypoMT.TrigMuonHypoMTConf import TrigMufastHypoAlg, TrigMufastHypoTool, TrigmuCombHypoAlg, TrigmuCombHypoTool, TrigMuonEFMSonlyHypoAlg, TrigMuonEFMSonlyHypoTool, TrigMuisoHypoAlg, TrigMuisoHypoTool, TrigMuonEFCombinerHypoAlg, TrigMuonEFCombinerHypoTool
+from TrigMuonHypoMT.TrigMuonHypoMonitoringMT import *
from AthenaCommon.SystemOfUnits import GeV
-from MuonByteStream.MuonByteStreamFlags import muonByteStreamFlags
-from TrigMuonBackExtrapolator.TrigMuonBackExtrapolatorConfig import *
from AthenaCommon.AppMgr import ToolSvc
from TriggerJobOpts.TriggerFlags import TriggerFlags
import re
-ToolSvc += MuonBackExtrapolatorForAlignedDet()
-ToolSvc += MuonBackExtrapolatorForMisalignedDet()
trigMuonEFSAThresholds = {
'0GeV' : [ [0,9.9], [ 0.100 ] ],
@@ -47,37 +43,6 @@ trigMuonEFSAThresholds = {
efCombinerThresholds = {
- '2GeV' : [ [0,9.9], [2.000] ],
- '3GeV' : [ [0,9.9], [3.000] ],
- '4GeV' : [ [0,1.05,1.5,2.0,9.9], [ 3.93, 3.91, 3.88, 3.88] ],
- '5GeV' : [ [0,1.05,1.5,2.0,9.9], [ 4.91, 4.86, 4.84, 4.83] ],
- '6GeV' : [ [0,1.05,1.5,2.0,9.9], [ 5.88, 5.81, 5.78, 5.76] ],
- '7GeV' : [ [0,1.05,1.5,2.0,9.9], [ 6.85, 6.77, 6.74, 6.74] ],
- '8GeV' : [ [0,1.05,1.5,2.0,9.9], [ 7.82, 7.74, 7.70, 7.72] ],
- '10GeV' : [ [0,1.05,1.5,2.0,9.9], [ 9.77, 9.67, 9.62, 9.57] ],
- '11GeV' : [ [0,1.05,1.5,2.0,9.9], [ 10.74, 10.64, 10.58, 10.53] ],
- '12GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.70, 11.59, 11.53, 11.49] ],
- '13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.67, 12.55, 12.49, 12.46] ],
- '14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.65, 13.52, 13.46, 13.42] ],
- '15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 14.63, 14.49, 14.42, 14.38] ],
- '18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 17.53, 17.39, 17.34, 17.28] ],
- '20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 19.47, 19.33, 19.30, 19.22] ],
- '22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 21.40, 21.27, 21.25, 21.16] ],
- '24GeV' : [ [0,1.05,1.5,2.0,9.9], [ 23.34, 23.19, 23.14, 23.06] ],
- '26GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.29, 25.15, 25.14, 25.05] ],
- '27GeV' : [ [0,1.05,1.5,2.0,9.9], [ 26.26, 26.12, 26.11, 26.02] ],
- '28GeV' : [ [0,1.05,1.5,2.0,9.9], [ 27.23, 27.09, 27.07, 26.99] ],
- '30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 29.17, 29.03, 29.00, 28.92] ],
- '32GeV' : [ [0,1.05,1.5,2.0,9.9], [ 31.10, 30.96, 30.91, 30.84] ],
- '34GeV' : [ [0,1.05,1.5,2.0,9.9], [ 33.04, 32.88, 32.81, 32.74] ],
- '36GeV' : [ [0,1.05,1.5,2.0,9.9], [ 34.96, 34.78, 34.69, 34.63] ],
- '38GeV' : [ [0,1.05,1.5,2.0,9.9], [ 36.87, 36.67, 36.55, 36.48] ],
- '40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 38.76, 38.54, 38.38, 38.31] ],
- '50GeV' : [ [0,1.05,1.5,2.0,9.9], [ 45.00, 45.00, 45.00, 45.00] ],
- '60GeV' : [ [0,1.05,1.5,2.0,9.9], [ 54.00, 54.00, 54.00, 54.00] ],
- '70GeV' : [ [0,1.05,1.5,2.0,9.9], [ 63.00, 63.00, 63.00, 63.00] ],
- '80GeV' : [ [0,1.05,1.5,2.0,9.9], [ 72.00, 72.00, 72.00, 72.00] ],
- '100GeV' : [ [0,1.05,1.5,2.0,9.9], [ 90.00, 90.00, 90.00, 90.00] ],
# original + 2015 tuning
'2GeV_v15a' : [ [0,9.9], [2.000] ],
'3GeV_v15a' : [ [0,9.9], [3.000] ],
@@ -114,70 +79,8 @@ efCombinerThresholds = {
'100GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 90.00, 90.00, 90.00, 90.00] ],
}
-efCaloTagThresholds = {
- '0GeV' : [ [0,9.9], [ 0.1, 0.1, 0.1, 0.1 ] ],
- '2GeV' : [ [0,9.9], [ 2.0, 2.0, 2.0, 2.0 ] ],
- '3GeV' : [ [0,9.9], [ 3.0, 3.0, 3.0, 3.0 ] ],
- '4GeV' : [ [0,1.05,1.5,2.0,9.9], [ 4.0, 4.0, 4.0, 4.0 ] ],
- '5GeV' : [ [0,1.05,1.5,2.0,9.9], [ 5.0, 5.0, 5.0, 5.0 ] ],
- '6GeV' : [ [0,1.05,1.5,2.0,9.9], [ 6.0, 6.0, 6.0, 6.0 ] ],
- '7GeV' : [ [0,1.05,1.5,2.0,9.9], [ 7.0, 7.0, 7.0, 7.0 ] ],
- '8GeV' : [ [0,1.05,1.5,2.0,9.9], [ 8.0, 8.0, 8.0, 8.0 ] ],
- '10GeV' : [ [0,1.05,1.5,2.0,9.9], [ 10.0, 10.0, 10.0, 10.0 ] ],
- '11GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.0, 11.0, 11.0, 11.0 ] ],
- '12GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.0, 12.0, 12.0, 12.0 ] ],
- '13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.0, 13.0, 13.0, 13.0 ] ],
- '14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 14.0, 14.0, 14.0, 14.0 ] ],
- '15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 15.0, 15.0, 15.0, 15.0 ] ],
- '18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 18.0, 18.0, 18.0, 18.0 ] ],
- '20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 20.0, 20.0, 20.0, 20.0 ] ],
- '22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 22.0, 22.0, 22.0, 22.0 ] ],
- '24GeV' : [ [0,1.05,1.5,2.0,9.9], [ 24.0, 24.0, 24.0, 24.0 ] ],
- '30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 30.0, 30.0, 30.0, 30.0 ] ],
- '40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0 ] ],
- '50GeV' : [ [0,1.05,1.5,2.0,9.9], [ 50.0, 50.0, 50.0, 50.0 ] ],
- '60GeV' : [ [0,1.05,1.5,2.0,9.9], [ 60.0, 60.0, 60.0, 60.0 ] ],
- '70GeV' : [ [0,1.05,1.5,2.0,9.9], [ 70.0, 70.0, 70.0, 70.0 ] ],
- '80GeV' : [ [0,1.05,1.5,2.0,9.9], [ 80.0, 80.0, 80.0, 80.0 ] ],
- '100GeV' : [ [0,1.05,1.5,2.0,9.9], [ 100.0,100.0,100.0,100.0 ] ]
-}
-
muCombThresholds = {
- '2GeV' : [ [0,9.9], [ 2.000] ],
- '3GeV' : [ [0,9.9], [ 3.000] ],
- '4GeV' : [ [0,1.05,1.5,2.0,9.9], [ 3.0, 2.5, 2.5, 2.5] ],
- '5GeV' : [ [0,1.05,1.5,2.0,9.9], [ 4.9, 4.8, 4.8, 4.8] ],
- '6GeV' : [ [0,1.05,1.5,2.0,9.9], [ 5.8, 5.8, 5.8, 5.6] ],
- '7GeV' : [ [0,1.05,1.5,2.0,9.9], [ 6.8, 6.7, 6.7, 6.6] ],
- '8GeV' : [ [0,1.05,1.5,2.0,9.9], [ 7.8, 7.7, 7.7, 7.7] ],
- '10GeV' : [ [0,1.05,1.5,2.0,9.9], [ 9.8, 9.5, 9.6, 9.7] ],
- '11GeV' : [ [0,1.05,1.5,2.0,9.9], [ 10.8, 10.4, 10.6, 10.6] ],
- '12GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.7, 11.3, 11.4, 11.5] ],
- '13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.6, 12.2, 12.2, 12.4] ],
- '14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.6, 13.1, 13.1, 13.5] ],
- '15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 14.5, 14.0, 14.0, 14.5] ],
- '18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 17.5, 16.6, 16.6, 16.8] ],
- '20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 19.5, 18.5, 18.5, 18.5] ],
- '22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 21.4, 20.3, 20.3, 20.1] ],
- '24GeV' : [ [0,1.05,1.5,2.0,9.9], [ 23.2, 22.2, 22.2, 21.8] ],
- '25GeV' : [ [0,1.05,1.5,2.0,9.9], [ 24.2, 23.2, 23.2, 22.6] ],
- '26GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.3, 24.1, 24.1, 23.5] ],
- '27GeV' : [ [0,1.05,1.5,2.0,9.9], [ 26.2, 25.1, 25.1, 24.4] ],
- '28GeV' : [ [0,1.05,1.5,2.0,9.9], [ 27.1, 26.0, 26.0, 25.2] ],
- '30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 29.0, 28.0, 28.0, 27.0] ],
- '32GeV' : [ [0,1.05,1.5,2.0,9.9], [ 30.7, 29.9, 29.9, 28.7] ],
- '34GeV' : [ [0,1.05,1.5,2.0,9.9], [ 32.5, 31.8, 31.8, 30.4] ],
- '36GeV' : [ [0,1.05,1.5,2.0,9.9], [ 34.2, 33.6, 33.6, 32.1] ],
- '38GeV' : [ [0,1.05,1.5,2.0,9.9], [ 35.8, 35.4, 35.4, 33.6] ],
- '40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.5, 37.0, 37.0, 35.0] ],
- '40GeV_slow' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0] ],
- '50GeV' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0] ],
- '60GeV' : [ [0,1.05,1.5,2.0,9.9], [ 45.0, 45.0, 45.0, 45.0] ],
- '60GeV_slow' : [ [0,1.05,1.5,2.0,9.9], [ 47.0, 47.0, 47.0, 47.0] ],
- '70GeV' : [ [0,1.05,1.5,2.0,9.9], [ 49.0, 49.0, 49.0, 49.0] ],
- '80GeV' : [ [0,1.05,1.5,2.0,9.9], [ 56.0, 56.0, 56.0, 56.0] ],
- '100GeV' : [ [0,1.05,1.5,2.0,9.9], [ 70.0, 70.0, 70.0, 70.0] ],
# original + 2015 tuning
'2GeV_v15a' : [ [0,9.9], [ 2.000] ],
'3GeV_v15a' : [ [0,9.9], [ 3.000] ],
@@ -218,63 +121,6 @@ muCombThresholds = {
muFastThresholds = {
- #
- # original + 2010 tuning
- '2GeV' : [ [0,9.9], [ 2.000] ],
- '3GeV' : [ [0,9.9], [ 3.000] ],
- '4GeV' : [ [0,1.05,1.5,2.0,9.9], [ 3.0, 2.5, 2.5, 2.5] ],
- '4GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 3.0, 1.8, 2.0, 2.5] ],
- '5GeV' : [ [0,1.05,1.5,2.0,9.9], [ 4.6, 3.3, 4.0, 4.5] ],
- '6GeV' : [ [0,1.05,1.5,2.0,9.9], [ 5.4, 4.5, 4.9, 5.3] ],
- '6GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 5.2, 4.0, 4.0, 4.5] ],
- '7GeV' : [ [0,1.05,1.5,2.0,9.9], [ 6.3, 5.6, 5.6, 6.3] ],
- '8GeV' : [ [0,1.05,1.5,2.0,9.9], [ 7.2, 6.7, 6.4, 7.3] ],
- '10GeV' : [ [0,1.05,1.5,2.0,9.9], [ 8.9, 9.0, 8.4, 9.2] ],
- '10GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 8.5, 7.0, 7.0, 8.0] ],
- '11GeV' : [ [0,1.05,1.5,2.0,9.9], [ 9.8, 10.1, 9.3, 10.1] ],
- '12GeV' : [ [0,1.05,1.5,2.0,9.9], [ 10.6, 11.0, 10.2, 11.0] ],
- '13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.4, 12.0, 11.1, 12.0] ],
- '14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.2, 13.0, 12.1, 13.0] ],
- '15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.0, 14.0, 13.0, 14.0] ],
- '18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 15.7, 16.6, 15.4, 16.3] ],
- '20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 17.5, 18.5, 17.0, 18.0] ],
- '20GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 16.2, 12.9, 13.2, 15.5] ],
- '22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 19.1, 20.0, 18.4, 19.6] ],
- '30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.0, 24.5, 23.0, 26.0] ],
- '30GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 22.3, 17.1, 18.6, 22.2] ],
- '40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 32.5] ],
- '40GeV_barrelOnly' : [ [0,1.05,1.5,2.0,9.9], [ 31.5,1000.0,1000.0,1000.0] ],
- '40GeV_uptoEC2' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 1000.0] ],
- '40GeV_V2' : [ [0,1.05,1.5,2.0,9.9], [ 27.1, 23.6, 24.2, 26.4] ],
- '40GeV_slow' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 40.0, 40.0] ],
- '50GeV' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 32.5] ],
- '60GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.8, 36., 34.2, 39.] ],
- '60GeV_slow' : [ [0,1.05,1.5,2.0,9.9], [ 40.0, 40.0, 45.0, 40.0] ],
- '70GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.8, 36.0, 34.2, 39.0] ],
- '80GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.8, 36.0, 34.2, 39.0] ],
- '100GeV' : [ [0,1.05,1.5,2.0,9.9], [ 37.8, 36.0, 34.2, 39.0] ],
- #
- # 2011a tuning (95%, based on 2010 repro data)
- '4GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 3.41, 3.21, 3.39, 3.53] ],
- '4GeV_barrelOnly_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 3.41, 1000., 1000., 1000.] ],
- '6GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 5.04, 4.81, 5.01, 5.25] ],
- '10GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 8.08, 7.68, 8.28, 8.90] ],
- '13GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 10.00, 9.33, 10.28, 11.42] ],
- '15GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 11.31, 10.52, 12.00, 13.24] ],
- '18GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 12.95, 12.32, 13.92, 15.51] ],
- '20GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 13.94, 13.50, 15.28, 16.79] ],
- '22GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 14.85, 14.48, 16.36, 18.45] ],
- '24GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 15.68, 15.51, 17.49, 19.82] ],
- '30GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 17.83, 18.32, 20.46, 23.73] ],
- '40GeV_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 29.54] ],
- '40GeV_uptoEC2_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 1000.] ],
- '40GeV_barrelOnly_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 1000., 1000., 1000.] ],
- '50GeV_barrelOnly_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 1000., 1000., 1000.] ],
- '60GeV_barrelOnly_v11a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 1000., 1000., 1000.] ],
- # 2011b tuning (90%, based on 2010 repro data)
- '40GeV_v11b' : [ [0,1.05,1.5,2.0,9.9], [ 26.88, 26.54, 29.22, 32.18] ],
- '40GeV_uptoEC2_v11b' : [ [0,1.05,1.5,2.0,9.9], [ 26.88, 26.54, 29.22, 1000.] ],
- '40GeV_barrelOnly_v11b' : [ [0,1.05,1.5,2.0,9.9], [ 26.88, 1000., 1000., 1000.] ],
# 2011a tuning + 2015 tuning
'4GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 3.38, 1.25, 3.17, 3.41] ],
'4GeV_barrelOnly_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 3.38, 1000., 1000., 1000.] ],
@@ -303,64 +149,6 @@ muFastThresholds = {
muFastThresholdsForECWeakBRegion = {
#
- # original + 2010 tuning
- '2GeV' : [ 2.0, 2.0 ],
- '3GeV' : [ 3.0, 3.0 ],
- '4GeV' : [ 2.5, 2.5 ],
- '4GeV_V2' : [ 1.8, 2.0 ],
- '5GeV' : [ 3.3, 4.0 ],
- '6GeV' : [ 4.5, 4.9 ],
- '6GeV_V2' : [ 4.0, 4.0 ],
- '7GeV' : [ 5.6, 5.6 ],
- '8GeV' : [ 6.7, 6.4 ],
- '10GeV' : [ 9.0, 8.4 ],
- '10GeV_V2' : [ 7.0, 7.0 ],
- '11GeV' : [ 10.1, 9.3 ],
- '12GeV' : [ 11.0, 10.2 ],
- '13GeV' : [ 12.0, 11.1 ],
- '14GeV' : [ 13.0, 12.1 ],
- '15GeV' : [ 14.0, 13.0 ],
- '18GeV' : [ 16.6, 15.4 ],
- '20GeV' : [ 18.5, 17.0 ],
- '20GeV_V2' : [ 12.9, 13.2 ],
- '22GeV' : [ 20.0, 18.4 ],
- '30GeV' : [ 24.5, 23.0 ],
- '30GeV_V2' : [ 17.1, 18.6 ],
- '40GeV' : [ 30.0, 28.5 ],
- '40GeV_barrelOnly' : [ 1000.0, 1000.0 ],
- '40GeV_uptoEC2' : [ 30.0, 28.5 ],
- '40GeV_V2' : [ 23.6, 24.2 ],
- '40GeV_slow' : [ 40.0, 40.0 ],
- '50GeV' : [ 30.0, 28.5 ],
- '60GeV' : [ 30.0, 28.5 ],
- '60GeV_slow' : [ 60.0, 60.0 ],
- '70GeV' : [ 30.0, 28.5 ],
- '80GeV' : [ 30.0, 28.5 ],
- '100GeV' : [ 30.0, 28.5 ],
- #
- # 2011a tuning (95%, based on 2010 repro data)
- '4GeV_v11a' : [ 2.11, 2.97 ],
- '4GeV_barrelOnly_v11a' : [ 1000., 1000. ],
- '6GeV_v11a' : [ 4.37, 3.77 ],
- '10GeV_v11a' : [ 6.61, 5.34 ],
- '13GeV_v11a' : [ 6.81, 6.97 ],
- '15GeV_v11a' : [ 7.61, 7.81 ],
- '18GeV_v11a' : [ 9.01, 9.83 ],
- '20GeV_v11a' : [ 10.15, 11.88 ],
- '22GeV_v11a' : [ 10.72, 12.54 ],
- '24GeV_v11a' : [ 11.66, 13.97 ],
- '30GeV_v11a' : [ 14.41, 17.43 ],
- '40GeV_v11a' : [ 15.07, 18.02 ],
- '40GeV_uptoEC2_v11a' : [ 15.07, 18.02 ],
- '40GeV_barrelOnly_v11a' : [ 1000., 1000. ],
- '50GeV_barrelOnly_v11a' : [ 1000., 1000. ],
- '60GeV_barrelOnly_v11a' : [ 1000., 1000. ],
- # 2011b tuning (90%, based on 2010 repro data)
- '40GeV_v11b' : [ 26.54, 29.22 ],
- '40GeV_uptoEC2_v11b' : [ 26.54, 29.22 ],
- '40GeV_barrelOnly_v11b' : [ 1000., 1000. ],
- '50GeV_barrelOnly_v11b' : [ 1000., 1000. ],
- '60GeV_barrelOnly_v11b' : [ 1000., 1000. ],
# 2011a tuning + 2015 tuning
'4GeV_v15a' : [ 2.72, 1.58],
'4GeV_barrelOnly_v15a' : [ 1000., 1000. ],
@@ -437,10 +225,7 @@ class TrigMufastHypoConfig():
tool.PtThresholdForECWeakBRegionB = [ 3. * GeV ] * nt
for th, thvalue in enumerate(thresholds):
- if datayear == '2015'or datayear == '2016' or datayear == '2017':
- thvaluename = thvalue + 'GeV_v15a'
- else:
- thvaluename = thvalue + 'GeV'
+ thvaluename = thvalue + 'GeV_v15a'
print "Number of threshold = ", th, ", Value of threshold = ", thvaluename
try:
@@ -498,36 +283,17 @@ def TrigmuCombHypoToolFromName( name, thresholdsHLT ):
class TrigmuCombHypoConfig():
- def decodeThreshold( self, threshold ):
- """ decodes the thresholds of the form mu6, 2mu6, ... """
- print "decoding ", threshold
-
- if threshold[0].isdigit(): # If the form is NmuX, return as list [X,X,X...N times...]
- assert threshold[1:3] == "mu", "Two digit multiplicity not supported"
- return [ threshold[3:] ] * int( threshold[0] )
-
- if threshold.count('mu') > 1: # If theform is muXmuY, return as [X,Y]
- return threshold.strip('mu').split('mu')
-
- # If the form is muX(inclusive), return as 1 element list
- return [ threshold[2:] ]
-
def ConfigurationHypoTool( self, thresholdHLT, thresholds, tight ):
tool = TrigmuCombHypoTool( thresholdHLT )
- datayear = "2017"
-
nt = len(thresholds)
print "TrigMufastHypoConfig: Set ", nt, " thresholds"
tool.PtBins = [ [ 0, 2.5 ] ] * nt
tool.PtThresholds = [ [ 5.83 * GeV ] ] * nt
for th, thvalue in enumerate(thresholds):
- if datayear == '2015'or datayear == '2016' or datayear == '2017':
- thvaluename = thvalue + 'GeV_v15a'
- else:
- thvaluename = thvalue + 'GeV'
+ thvaluename = thvalue + 'GeV_v15a'
print "Number of threshold = ", th, ", Value of threshold = ", thvaluename
try:
@@ -618,19 +384,6 @@ def TrigMuonEFMSonlyHypoToolFromName( name, thresholdHLT ) :
class TrigMuonEFMSonlyHypoConfig():
- def decodeThreshold( self, threshold ):
- """ decodes the thresholds of the form mu6, 2mu6, ... """
- print "decoding ", threshold
-
- if threshold[0].isdigit(): # If the form is NmuX, return as list [X,X,X...N times...]
- assert threshold[1:3] == "mu", "Two digit multiplicity not supported"
- return [ threshold[3:] ] * int( threshold[0] )
- if threshold.count('mu') > 1: # If theform is muXmuY, return as [X,Y]
- return threshold.strip('mu').split('mu')
-
- # If the form is muX(inclusive), return as 1 element list
- return [ threshold[2:] ]
-
def ConfigurationHypoTool( self, thresholdHLT, thresholds ):
tool = TrigMuonEFMSonlyHypoTool( thresholdHLT )
@@ -681,19 +434,6 @@ def TrigMuonEFCombinerHypoToolFromName( name, thresholdHLT ) :
class TrigMuonEFCombinerHypoConfig():
- def decodeThreshold( self, threshold ):
- """ decodes the thresholds of the form mu6, 2mu6, ... """
- print "decoding ", threshold
-
- if threshold[0].isdigit(): # If the form is NmuX, return as list [X,X,X...N times...]
- assert threshold[1:3] == "mu", "Two digit multiplicity not supported"
- return [ threshold[3:] ] * int( threshold[0] )
- if threshold.count('mu') > 1: # If theform is muXmuY, return as [X,Y]
- return threshold.strip('mu').split('mu')
-
- # If the form is muX(inclusive), return as 1 element list
- return [ threshold[2:] ]
-
def ConfigurationHypoTool( self, thresholdHLT, thresholds ):
tool = TrigMuonEFCombinerHypoTool( thresholdHLT )
@@ -705,7 +445,7 @@ class TrigMuonEFCombinerHypoConfig():
for th, thvalue in enumerate(thresholds):
- thvaluename = thvalue + 'GeV'
+ thvaluename = thvalue + 'GeV_v15a'
print "Number of threshold = ", th, ", Value of threshold = ", thvaluename
try:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoMonitoringMT.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py
similarity index 100%
rename from Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoMonitoringMT.py
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx
similarity index 98%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx
index 3be67843f23e973cc7a8d573cbd055fb88ee9edb..3b7f47ce8000dd80c62e6b0e0a0541708efa78d6 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -8,7 +8,7 @@
#include "GaudiKernel/StatusCode.h"
#include "AthLinks/ElementLink.h"
#include "xAODTrigMuon/L2StandAloneMuonContainer.h"
-#include "TrigMuonHypo/TrigMufastHypoAlg.h"
+#include "TrigMufastHypoAlg.h"
#include "AthViews/ViewHelper.h"
using namespace TrigCompositeUtils;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.h
similarity index 92%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.h
index c8582c347b07aa8e697151f7a3e76a47d057e42b..a8645c3411103274f693f977af9a1bd3b8b28f43 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUFASTHYPO_TRIGMUFASTHYPOALG_H
@@ -14,7 +14,7 @@
#include "StoreGate/WriteHandleKey.h"
#include "DecisionHandling/TrigCompositeUtils.h"
-#include "TrigMuonHypo/TrigMufastHypoTool.h"
+#include "TrigMufastHypoTool.h"
#include "DecisionHandling/HypoBase.h"
class StoreGateSvc;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
similarity index 99%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoTool.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
index ec9672a5f0f9c961b8361be1d055cf3203af1125..d834c170fda16e7d6a8050ae4a5ac27b8a03241e 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -13,7 +13,7 @@
#include "xAODTrigMuon/L2StandAloneMuonContainer.h"
#include "DecisionHandling/TrigCompositeUtils.h"
-#include "TrigMuonHypo/TrigMufastHypoTool.h"
+#include "TrigMufastHypoTool.h"
#include "xAODTrigMuon/TrigMuonDefs.h"
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h
similarity index 98%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h
index a0e7029d2e4c5754834a49db4a5cc21c10db0081..c2853e23a64a1bf015dcd8568fd3110505661834 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUFASTHYPO_TRIGMUFASTHYPOTOOL_H
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx
similarity index 97%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx
index ee8041bba84fac3254da4a89ba7ea032a5f7bfa6..31e054356f7ca94d5e6edbfff51af1d9e35bbdd5 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -7,7 +7,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/StatusCode.h"
#include "AthLinks/ElementLink.h"
-#include "TrigMuonHypo/TrigMuisoHypoAlg.h"
+#include "TrigMuisoHypoAlg.h"
#include "AthViews/ViewHelper.h"
using namespace TrigCompositeUtils;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.h
similarity index 90%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.h
index 7c312b640cd9ab5eef50a8c143922153e06c07c6..b321c9eda12839e913aac53c26e7eccd4af83231 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoAlg.h
@@ -1,11 +1,11 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// ********************************************************************
//
// NAME: TrigMuisoHypo.h
-// PACKAGE: Trigger/TrigHypotheis/TrigMuonHypo/TrigMuisoHypo
+// PACKAGE: Trigger/TrigHypotheis/TrigMuonHypoMT/TrigMuisoHypo
//
// PURPOSE: LVL2 Muon Isolation Hypothesis Algorithm: V4.0
// for athenaMT
@@ -23,7 +23,7 @@
#include "DecisionHandling/TrigCompositeUtils.h"
#include "DecisionHandling/HypoBase.h"
-#include "TrigMuonHypo/TrigMuisoHypoTool.h"
+#include "TrigMuisoHypoTool.h"
class StoreGateSvc;
class TriggerElement;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx
similarity index 97%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoTool.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx
index 641854297f4e2a2457166fe461598e200809a61c..379d719813122368485091def63e2ee9e03b819a 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -12,7 +12,7 @@
#include "DecisionHandling/Combinators.h"
#include "DecisionHandling/TrigCompositeUtils.h"
-#include "TrigMuonHypo/TrigMuisoHypoTool.h"
+#include "TrigMuisoHypoTool.h"
using namespace TrigCompositeUtils;
// --------------------------------------------------------------------------------
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h
similarity index 97%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoTool.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h
index 96d504458e87b0c395cadd6add154aa6ae7dd30b..6d99b38914e09d2f387e349b5a850dc6c3674b72 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUISOHYPO_TRIGMUISOHYPOTOOL_H
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx
similarity index 98%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx
index d05c606b61d62826d7f189d13002ecbb92b6abb7..da690b5298561f4ae4cc4a2ad2149afe5144bcbd 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -7,7 +7,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/StatusCode.h"
-#include "TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h"
+#include "TrigMuonEFCombinerHypoAlg.h"
#include "AthViews/ViewHelper.h"
using namespace TrigCompositeUtils;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.h
similarity index 92%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.h
index 01e488d97d9de7505b4a81af482c60cda62c64b6..94218428bbcb8a0fed14f50dde31841206371b49 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUONEFCOMBINERHYPO_TRIGMUONEFCOMBINERHYPOALG_H
@@ -14,7 +14,7 @@
#include "StoreGate/WriteHandleKey.h"
#include "DecisionHandling/TrigCompositeUtils.h"
-#include "TrigMuonHypo/TrigMuonEFCombinerHypoTool.h"
+#include "TrigMuonEFCombinerHypoTool.h"
#include "DecisionHandling/HypoBase.h"
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx
similarity index 98%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoTool.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx
index da29df28359fe78604fefc76df5d2f938cf67d4a..f5a467beeef6524645baee5cd419df39ef1acfd3 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.cxx
@@ -1,9 +1,9 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "DecisionHandling/Combinators.h"
-#include "TrigMuonHypo/TrigMuonEFCombinerHypoTool.h"
+#include "TrigMuonEFCombinerHypoTool.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "DecisionHandling/TrigCompositeUtils.h"
#include "AthenaMonitoring/Monitored.h"
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h
similarity index 97%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoTool.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h
index a4b260f4df51f06009045c5902a581f12a5f2ef4..795abe3bbac5fef66d86406da5800f0101c03792 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFCombinerHypoTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUONEFCOMBINERHYPO_TRIGMUONEFCOMBINERHYPOTOOL_H
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx
similarity index 98%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx
index 1c9ddf33e41a1cb11d6de4d081ecb50774036f72..a409ce4d90b3cf981143624a416f5b6f428163c8 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -7,7 +7,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/StatusCode.h"
-#include "TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h"
+#include "TrigMuonEFMSonlyHypoAlg.h"
#include "AthViews/ViewHelper.h"
using namespace TrigCompositeUtils;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.h
similarity index 92%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.h
index 52d0cc03178b3bcbf241fb32512432d02023a380..8da45fdb272b0caa96ef73199da34f429dc923b7 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUONEFMSONLYHYPO_TRIGMUONEFMSONLYHYPOALG_H
@@ -14,7 +14,7 @@
#include "StoreGate/WriteHandleKey.h"
#include "DecisionHandling/TrigCompositeUtils.h"
-#include "TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h"
+#include "TrigMuonEFMSonlyHypoTool.h"
#include "DecisionHandling/HypoBase.h"
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx
similarity index 98%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoTool.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx
index 6fde08b283a439fa399946329ed665ed9d25d7fc..a01760a6fdd0c4275a2d25868a13cfa620445a9f 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.cxx
@@ -1,9 +1,9 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "DecisionHandling/Combinators.h"
-#include "TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h"
+#include "TrigMuonEFMSonlyHypoTool.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "DecisionHandling/TrigCompositeUtils.h"
#include "AthenaMonitoring/Monitored.h"
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h
similarity index 97%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h
index c7fa09cb3f6c4038b5694ce0b92a8b847cf976e8..8c8dc65b85eecdfa793af23a940f11e4f6afa2b4 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFMSonlyHypoTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUONEFMSONLYHYPO_TRIGMUONEFMSONLYHYPOTOOL_H
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx
similarity index 97%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx
index d4c867e04959f83367392632a45a6c11de61217a..d3bacd56987b386af66998ad38b3ffa82df56f05 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -7,7 +7,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/StatusCode.h"
#include "AthLinks/ElementLink.h"
-#include "TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h"
+#include "TrigMuonEFTrackIsolationHypoAlg.h"
#include "AthViews/ViewHelper.h"
using namespace TrigCompositeUtils;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.h
similarity index 91%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.h
index 490db37657c8a7d48e7293b5f6a5f13e7084d084..201e661bf7ce9df78b91f3aa8cc2d3327f6f12ee 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUFASTHYPO_TRIGMUONEFTRACKISOLATIONHYPOALG_H
@@ -15,7 +15,7 @@
#include "xAODMuon/MuonContainer.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-#include "TrigMuonHypo/TrigMuonEFTrackIsolationHypoTool.h"
+#include "TrigMuonEFTrackIsolationHypoTool.h"
#include "DecisionHandling/HypoBase.h"
class StoreGateSvc;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.cxx
similarity index 98%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoTool.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.cxx
index 73b40ffa4628cb8d0a469907cf926f7873cf8934..a0442757e36bee9bcadbf94ffad35e1a77f3ec27 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -12,7 +12,7 @@
#include "DecisionHandling/Combinators.h"
#include "DecisionHandling/TrigCompositeUtils.h"
-#include "TrigMuonHypo/TrigMuonEFTrackIsolationHypoTool.h"
+#include "TrigMuonEFTrackIsolationHypoTool.h"
#include "xAODTrigMuon/TrigMuonDefs.h"
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h
similarity index 97%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoTool.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h
index abc7da3a858861008125df9a164a9d67d263a328..d768b1d926bee89f7d4e9f673d494a83ece5c62e 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFTrackIsolationHypoTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUONEFTRACKISOLATIONHYPO_TRIGMUONEFTRACKISOLATIONHYPOTOOL_H
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx
similarity index 98%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx
index 72609a6d2a914659c8a88ce28cb3ed52520c9696..ea94c0bc76ea8c65a4da78deed9d86e2719b15eb 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -11,7 +11,7 @@
#include "DecisionHandling/TrigCompositeUtils.h"
#include "xAODTrigMuon/L2StandAloneMuonContainer.h"
-#include "TrigMuonHypo/TrigmuCombHypoAlg.h"
+#include "TrigmuCombHypoAlg.h"
#include "AthViews/ViewHelper.h"
using namespace TrigCompositeUtils;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.h
similarity index 92%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.h
index 42e381e5de836f7e3570c53a90e919a123198edc..1de24524d033a63e0aac3f3d4ed0a0bb1c86f64f 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUCOMBHYPO_TRIGMUCOMBHYPOALG_H
@@ -15,7 +15,7 @@
#include "DecisionHandling/TrigCompositeUtils.h"
#include "AthViews/View.h"
-#include "TrigMuonHypo/TrigmuCombHypoTool.h"
+#include "TrigmuCombHypoTool.h"
#include "DecisionHandling/HypoBase.h"
class StoreGateSvc;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
similarity index 99%
rename from Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoTool.cxx
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
index dbb695693c1f98c23e949a93497466384423561d..e1a84cfbb3f91818b807207d9e8e7399e8625526 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <math.h>
@@ -15,7 +15,7 @@
#include "xAODTrigMuon/versions/L2CombinedMuonContainer_v1.h"
#include "xAODTrigMuon/L2CombinedMuon.h"
#include "DecisionHandling/TrigCompositeUtils.h"
-#include "TrigMuonHypo/TrigmuCombHypoTool.h"
+#include "TrigmuCombHypoTool.h"
using namespace TrigCompositeUtils;
// --------------------------------------------------------------------------------
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h
similarity index 98%
rename from Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h
rename to Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h
index 8a135f99cdb3a782e0d0bacb4f7d5a67f5e3c071..0d77180be605d1dfc0905109dbb7df6dfd58be2d 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUCOMBHYPO_TRIGMUCOMBHYPOTOOL_H
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/components/TrigMuonHypo_entries.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/components/TrigMuonHypo_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..1a5904cabfdc778b29173bdbf41e5b0485ff687e
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/components/TrigMuonHypo_entries.cxx
@@ -0,0 +1,24 @@
+#include "src/TrigMufastHypoAlg.h"
+#include "src/TrigMufastHypoTool.h"
+#include "src/TrigmuCombHypoAlg.h"
+#include "src/TrigmuCombHypoTool.h"
+#include "src/TrigMuisoHypoAlg.h"
+#include "src/TrigMuonEFTrackIsolationHypoAlg.h"
+#include "src/TrigMuonEFTrackIsolationHypoTool.h"
+#include "src/TrigMuonEFMSonlyHypoAlg.h"
+#include "src/TrigMuonEFMSonlyHypoTool.h"
+#include "src/TrigMuonEFCombinerHypoAlg.h"
+#include "src/TrigMuonEFCombinerHypoTool.h"
+
+DECLARE_COMPONENT( TrigMufastHypoAlg )
+DECLARE_COMPONENT( TrigMufastHypoTool )
+DECLARE_COMPONENT( TrigmuCombHypoAlg )
+DECLARE_COMPONENT( TrigmuCombHypoTool )
+DECLARE_COMPONENT( TrigMuisoHypoAlg )
+DECLARE_COMPONENT( TrigMuisoHypoTool )
+DECLARE_COMPONENT( TrigMuonEFTrackIsolationHypoAlg )
+DECLARE_COMPONENT( TrigMuonEFTrackIsolationHypoTool )
+DECLARE_COMPONENT( TrigMuonEFMSonlyHypoAlg )
+DECLARE_COMPONENT( TrigMuonEFMSonlyHypoTool )
+DECLARE_COMPONENT( TrigMuonEFCombinerHypoAlg )
+DECLARE_COMPONENT( TrigMuonEFCombinerHypoTool )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/MuonMenuConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/MuonMenuConfig.py
index 52b31d13f6a68d54826bb3d4e8b2eacb7598f315..154e8c86891fbf3b5b20abb0bc0d8bbf5cc29b7c 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/MuonMenuConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/MuonMenuConfig.py
@@ -254,7 +254,7 @@ def l2MuFastRecoCfg( flags ):
def l2MuFastHypoCfg( flags, name="UNSPECIFIED", muFastInfo="UNSPECIFIED" ):
- from TrigMuonHypo.TrigMuonHypoConf import TrigMufastHypoAlg
+ from TrigMuonHypoMT.TrigMuonHypoMTConf import TrigMufastHypoAlg
muFastHypo = TrigMufastHypoAlg( name )
muFastHypo.MuonL2SAInfoFromMuFastAlg = muFastInfo
@@ -268,8 +268,8 @@ def generateMuonsCfg( flags ):
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, ChainStep, Chain, RecoFragmentsPool
# Set Hypo alg of muFast step
- from TrigMuonHypo.TrigMuonHypoConf import TrigMufastHypoAlg
- from TrigMuonHypo.testTrigMuonHypoConfig import TrigMufastHypoToolFromName
+ from TrigMuonHypoMT.TrigMuonHypoMTConf import TrigMufastHypoAlg
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromName
muFastHypo = TrigMufastHypoAlg("TrigL2MuFastHypo")
muFastHypo.MuonL2SAInfoFromMuFastAlg = muFastInfo
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py
index 3dfb35e68386caa324747ff8c3fd3d8d38210c69..4a213280a35d4fa8be242c69ff0ddc29c43ac3b6 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/muMenuDefs.py
@@ -78,7 +78,7 @@ def muFastStep():
l2MuViewsMaker.ViewNodeName = muFastRecoSequence.name()
### set up MuFastHypo ###
- from TrigMuonHypo.TrigMuonHypoConf import TrigMufastHypoAlg
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoAlg
trigMufastHypo = TrigMufastHypoAlg("TrigL2MufastHypoAlg")
trigMufastHypo.OutputLevel = DEBUG
trigMufastHypo.MuonL2SAInfoFromMuFastAlg = sequenceOut
@@ -87,7 +87,7 @@ def muFastStep():
l2muFastSequence = seqAND("l2muFastSequence", [ l2MuViewsMaker, muFastRecoSequence ])
- from TrigMuonHypo.testTrigMuonHypoConfig import TrigMufastHypoToolFromName
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromName
return MenuSequence( Sequence = l2muFastSequence,
Maker = l2MuViewsMaker,
@@ -113,7 +113,7 @@ def muCombStep():
l2muCombViewsMaker.ViewNodeName = muCombRecoSequence.name()
### set up muCombHypo algorithm ###
- from TrigMuonHypo.TrigMuonHypoConf import TrigmuCombHypoAlg
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigmuCombHypoAlg
#trigmuCombHypo = TrigmuCombHypoAlg("L2muCombHypoAlg") # avoid to have "Comb" string in the name due to HLTCFConfig.py.
trigmuCombHypo = TrigmuCombHypoAlg("TrigL2MuCBHypoAlg")
trigmuCombHypo.OutputLevel = DEBUG
@@ -121,7 +121,7 @@ def muCombStep():
l2muCombSequence = seqAND("l2muCombSequence", eventAlgs + [l2muCombViewsMaker, muCombRecoSequence] )
- from TrigMuonHypo.testTrigMuonHypoConfig import TrigmuCombHypoToolFromName
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigmuCombHypoToolFromName
return MenuSequence( Sequence = l2muCombSequence,
Maker = l2muCombViewsMaker,
@@ -147,14 +147,14 @@ def muEFMSStep():
efmsViewsMaker.ViewNodeName = muEFMSRecoSequence.name()
# setup MS-only hypo
- from TrigMuonHypo.TrigMuonHypoConf import TrigMuonEFMSonlyHypoAlg
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFMSonlyHypoAlg
trigMuonEFMSHypo = TrigMuonEFMSonlyHypoAlg( "TrigMuonEFMSHypoAlg" )
trigMuonEFMSHypo.OutputLevel = DEBUG
trigMuonEFMSHypo.MuonDecisions = sequenceOut
muonEFMSonlySequence = seqAND( "muonEFMSonlySequence", [efmsViewsMaker, muEFMSRecoSequence] )
- from TrigMuonHypo.testTrigMuonHypoConfig import TrigMuonEFMSonlyHypoToolFromName
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFMSonlyHypoToolFromName
return MenuSequence( Sequence = muonEFMSonlySequence,
Maker = efmsViewsMaker,
@@ -177,14 +177,14 @@ def muEFSAStep():
efsaViewsMaker.ViewNodeName = muEFSARecoSequence.name()
# setup EFSA hypo
- from TrigMuonHypo.TrigMuonHypoConf import TrigMuonEFMSonlyHypoAlg
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFMSonlyHypoAlg
trigMuonEFSAHypo = TrigMuonEFMSonlyHypoAlg( "TrigMuonEFSAHypoAlg" )
trigMuonEFSAHypo.OutputLevel = DEBUG
trigMuonEFSAHypo.MuonDecisions = sequenceOut
muonEFSAonlySequence = seqAND( "muonEFSAonlySequence", [efsaViewsMaker, muEFSARecoSequence ] )
- from TrigMuonHypo.testTrigMuonHypoConfig import TrigMuonEFMSonlyHypoToolFromName
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFMSonlyHypoToolFromName
return MenuSequence( Sequence = muonEFSAonlySequence,
Maker = efsaViewsMaker,
@@ -211,18 +211,19 @@ def muEFCBStep():
# setup EFCB hypo
- from TrigMuonHypo.TrigMuonHypoConfigMT import TrigMuonEFCombinerHypoConfig
- trigMuonEFCBHypo = TrigMuonEFCombinerHypoConfig( "TrigMuonEFCombinerHypoAlg" )
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFCombinerHypoAlg
+ trigMuonEFCBHypo = TrigMuonEFCombinerHypoAlg( "TrigMuonEFCombinerHypoAlg" )
trigMuonEFCBHypo.OutputLevel = DEBUG
trigMuonEFCBHypo.MuonDecisions = sequenceOut
muonEFCBSequence = seqAND( "muonEFCBSequence", [efcbViewsMaker, efcbViewNode] )
-
+
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFCombinerHypoToolFromName
return MenuSequence( Sequence = muonEFCBSequence,
Maker = efcbViewsMaker,
Hypo = trigMuonEFCBHypo,
- HypoToolGen = trigMuonEFCBHypo.TrigMuonEFCombinerHypoToolFromName )
+ HypoToolGen = TrigMuonEFCombinerHypoToolFromName )
### l2Muiso step ###
def muIsoStep():
@@ -240,7 +241,7 @@ def muIsoStep():
l2muIsoViewsMaker.ViewNodeName = l2muisoRecoSequence.name()
# set up hypo
- from TrigMuonHypo.TrigMuonHypoConf import TrigMuisoHypoAlg
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuisoHypoAlg
trigmuIsoHypo = TrigMuisoHypoAlg("L2MuisoHypoAlg")
trigmuIsoHypo.OutputLevel = DEBUG
trigmuIsoHypo.MuonL2ISInfoName = sequenceOut
@@ -248,7 +249,7 @@ def muIsoStep():
### Define a Sequence to run for muIso ###
l2muIsoSequence = seqAND("l2muIsoSequence", [ l2muIsoViewsMaker, l2muisoRecoSequence ] )
- from TrigMuonHypo.testTrigMuonHypoConfig import TrigMuisoHypoToolFromName
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuisoHypoToolFromName
return MenuSequence( Sequence = l2muIsoSequence,
Maker = l2muIsoViewsMaker,
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
index eead17529d0ad9c1dd2cddb520ac84f5cfc706be..52bd223b749284dee69ad7dc487b1951b2bdaeb7 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
@@ -160,13 +160,15 @@ if TriggerFlags.doMuon:
l2MuViewsMaker.ViewNodeName = muFastRecoSequence.name()
### set up MuFastHypo ###
- from TrigMuonHypo.TrigMuonHypoConfigMT import TrigMufastHypoConfig
- trigMufastHypo = TrigMufastHypoConfig("TrigL2MufastHypoAlg")
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoAlg
+ trigMufastHypo = TrigMufastHypoAlg("TrigL2MufastHypoAlg")
trigMufastHypo.OutputLevel = DEBUG
trigMufastHypo.MuonL2SAInfoFromMuFastAlg = muFastSequenceOut
trigMufastHypo.HypoOutputDecisions = "L2MuonFastDecisions"
trigMufastHypo.HypoInputDecisions = l2MuViewsMaker.InputMakerOutputDecisions[0]
- trigMufastHypo.HypoTools = [ trigMufastHypo.TrigMufastHypoToolFromName( "TrigL2MufastHypoTool", c ) for c in testChains ]
+
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromName
+ trigMufastHypo.HypoTools = [ TrigMufastHypoToolFromName( c, c ) for c in testChains ]
### set the dumper ###
muFastDecisionsDumper = DumpDecisions("muFastDecisionsDumper", OutputLevel=DEBUG, Decisions = trigMufastHypo.HypoOutputDecisions )
@@ -205,13 +207,15 @@ if TriggerFlags.doMuon:
l2muCombViewsMaker.ViewNodeName = muCombRecoSequence.name()
### set up muCombHypo algorithm ###
- from TrigMuonHypo.TrigMuonHypoConfigMT import TrigmuCombHypoConfig
- trigmuCombHypo = TrigmuCombHypoConfig("TrigL2muCombHypoAlg")
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigmuCombHypoAlg
+ trigmuCombHypo = TrigmuCombHypoAlg("TrigL2muCombHypoAlg")
trigmuCombHypo.OutputLevel = DEBUG
trigmuCombHypo.HypoOutputDecisions = "MuonL2CBDecisions"
trigmuCombHypo.HypoInputDecisions = l2muCombViewsMaker.InputMakerOutputDecisions[0]
trigmuCombHypo.MuonL2CBInfoFromMuCombAlg = muCombSequenceOut
- trigmuCombHypo.HypoTools = [ trigmuCombHypo.TrigmuCombHypoToolFromName( "TrigL2muCombHypoTool", c ) for c in testChains ]
+
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigmuCombHypoToolFromName
+ trigmuCombHypo.HypoTools = [ TrigmuCombHypoToolFromName( c, c ) for c in testChains ]
### set the dumper ###
muCombDecisionsDumper = DumpDecisions("muCombDecisionsDumper", OutputLevel=DEBUG, Decisions = trigmuCombHypo.HypoOutputDecisions )
@@ -260,14 +264,15 @@ if TriggerFlags.doMuon:
efMuViewsMaker.ViewNodeName = muEFMSRecoSequence.name()
#Setup MS-only hypo
- from TrigMuonHypo.TrigMuonHypoConfigMT import TrigMuonEFMSonlyHypoConfig
- trigMuonEFSAHypo = TrigMuonEFMSonlyHypoConfig("TrigMuonEFSAHypoAlg")
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFMSonlyHypoAlg
+ trigMuonEFSAHypo = TrigMuonEFMSonlyHypoAlg("TrigMuonEFSAHypoAlg")
trigMuonEFSAHypo.OutputLevel = DEBUG
trigMuonEFSAHypo.MuonDecisions = muEFSASequenceOut
trigMuonEFSAHypo.HypoOutputDecisions = "EFMuonSADecisions"
trigMuonEFSAHypo.HypoInputDecisions = efMuViewsMaker.InputMakerOutputDecisions[0]
- trigMuonEFSAHypo.HypoTools = [ trigMuonEFSAHypo.TrigMuonEFMSonlyHypoToolFromName( "TrigMuonEFMSonlyHypoTool", c ) for c in testChains ]
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFMSonlyHypoToolFromName
+ trigMuonEFSAHypo.HypoTools = [ TrigMuonEFMSonlyHypoToolFromName( c, c ) for c in testChains ]
### set the dumper ###
muonEFSADecisionsDumper = DumpDecisions("muonEFSADecisionsDumper", OutputLevel=DEBUG, Decisions = trigMuonEFSAHypo.HypoOutputDecisions )
@@ -304,14 +309,15 @@ if TriggerFlags.doMuon:
efCBMuViewsMaker.ViewNodeName = muEFCBRecoSequence.name()
#Setup EF CB hypo
- from TrigMuonHypo.TrigMuonHypoConfigMT import TrigMuonEFCombinerHypoConfig
- trigMuonEFCBHypo = TrigMuonEFCombinerHypoConfig("TrigMuonEFCBHypoAlg")
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFCombinerHypoAlg
+ trigMuonEFCBHypo = TrigMuonEFCombinerHypoAlg("TrigMuonEFCBHypoAlg")
trigMuonEFCBHypo.OutputLevel = DEBUG
trigMuonEFCBHypo.MuonDecisions = muEFCBSequenceOut
trigMuonEFCBHypo.HypoOutputDecisions = "EFMuonCBDecisions"
trigMuonEFCBHypo.HypoInputDecisions = efCBMuViewsMaker.InputMakerOutputDecisions[0]
- trigMuonEFCBHypo.HypoTools = [ trigMuonEFCBHypo.TrigMuonEFCombinerHypoToolFromName( "TrigMuonEFCombinerHypoTool", c ) for c in testChains ]
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFCombinerHypoToolFromName
+ trigMuonEFCBHypo.HypoTools = [ TrigMuonEFCombinerHypoToolFromName( c, c ) for c in testChains ]
### set the dumper ###
muonEFCBDecisionsDumper = DumpDecisions("muonEFCBDecisionsDumper", OutputLevel=DEBUG, Decisions = trigMuonEFCBHypo.HypoOutputDecisions )
@@ -347,13 +353,15 @@ if TriggerFlags.doMuon:
l2muIsoViewsMaker.ViewNodeName = l2muisoRecoSequence.name()
- from TrigMuonHypo.TrigMuonHypoConfigMT import TrigMuisoHypoConfig
- trigmuIsoHypo = TrigMuisoHypoConfig("TrigL2MuisoHypoAlg")
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuisoHypoAlg
+ trigmuIsoHypo = TrigMuisoHypoAlg("TrigL2MuisoHypoAlg")
trigmuIsoHypo.OutputLevel = DEBUG
trigmuIsoHypo.MuonL2ISInfoName = l2muIsoSequenceOut
trigmuIsoHypo.HypoOutputDecisions = "MuonL2IsoDecisions"
trigmuIsoHypo.HypoInputDecisions = l2muIsoViewsMaker.InputMakerOutputDecisions[0]
- trigmuIsoHypo.HypoTools = [ trigmuIsoHypo.TrigMuisoHypoToolFromName( "TrigL2MuisoHypoTool", c ) for c in testChains ]
+
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuisoHypoToolFromName
+ trigmuIsoHypo.HypoTools = [TrigMuisoHypoToolFromName( c, c ) for c in testChains ]
### set the dumper ###
muIsoDecisionsDumper = DumpDecisions("muIsoDecisionsDumper", OutputLevel=DEBUG, Decisions = trigmuIsoHypo.HypoOutputDecisions )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index aed530954f943490ab24842ac36ba0618334e8f4..04ff5cd6e0b0069944089b8225035e8fa6e22f88 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -4,7 +4,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, ChainS
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from TrigUpgradeTest.MuonMenuConfig import l2MuFastRecoCfg, l2MuFastHypoCfg
-from TrigMuonHypo.testTrigMuonHypoConfig import TrigMufastHypoToolFromName
+from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromName
def generateChains( flags, chainDict ):