diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx
index 0dac0b3abde5823b6cfba933bb489e1ba0da8ce1..3146038a940c50d9e64e0600531df5e81af01b98 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx
+++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.cxx
@@ -425,7 +425,7 @@ StatusCode TrigTauRecMergedMT::execute()
const xAOD::TrackParticleContainer *RoITrackParticleContainer = nullptr;
if ( !TPContainerHandle.isValid() ) {
- ATH_MSG_INFO("REGTEST: No Track container found.");
+ ATH_MSG_DEBUG("REGTEST: No Track container found.");
track_errors.push_back(NoTrkCont);
}
else {
@@ -440,7 +440,7 @@ StatusCode TrigTauRecMergedMT::execute()
const xAOD::VertexContainer* RoIVxContainer = nullptr;
if( !VertexContainerHandle.isValid() ) {
- ATH_MSG_INFO(" No VxContainers retrieved for the trigger element");
+ ATH_MSG_DEBUG(" No VxContainers retrieved for the trigger element");
track_errors.push_back(NoVtxCont);
}
else {
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.cxx
index 9a541034c90ea20ec2a3a3d1f52af34af58079e4..47abcaaaef0c1116a7e7f1144f48082764f664af 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauTrackRoiUpdaterMT.cxx
@@ -68,13 +68,13 @@ StatusCode TrigTauTrackRoiUpdaterMT::execute(const EventContext& ctx) const
ATH_MSG_DEBUG( "Found " << foundTracks->size() << " fast Tracks found, updating the corresponding RoI ... " );
if(foundTracks) {
- ATH_MSG_DEBUG( "REGTEST: Size of vector CaloCluster container is " << foundTracks->size());
+ ATH_MSG_DEBUG( "REGTEST: Size of vector track container is " << foundTracks->size());
if(foundTracks->size()==0) {
- ATH_MSG_DEBUG( "Cannot proceed, size of vector CaloCluster container is " << foundTracks->size());
+ ATH_MSG_DEBUG( "Cannot proceed, size of vector track container is " << foundTracks->size());
return StatusCode::SUCCESS;
}
}else {
- ATH_MSG_DEBUG( "no CaloCluster container found " );
+ ATH_MSG_DEBUG( "no track container found " );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
index 3d81ae49a0bd57bdbf956dc91c930887e11dc20c..39f93ab845b6e46dfde844e39f2abfa82595888e 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
@@ -126,14 +126,14 @@ TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1T
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 decisions 39 29 0 0 0 0
TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU1002 2 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 decisions 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM18 18 18 14 0 0 0 0 14
-TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM decisions 42 17 0 0 0 0
-TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM18 18 18 18 0 0 0 0 18
-TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM decisions 42 32 0 0 0 0
-TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM18 18 17 16 0 0 0 0 16
-TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM decisions 37 27 0 0 0 0
-TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM18 18 15 10 0 0 0 0 10
-TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM decisions 34 12 0 0 0 0
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM18 18 18 0 0 0 0 0 18
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM decisions 42 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM18 18 18 18 12 0 0 0 12
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM decisions 42 32 15 0 0 0
+TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM18 18 17 16 10 0 0 0 10
+TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM decisions 37 27 12 0 0 0
+TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM18 18 15 0 0 0 0 0 15
+TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM decisions 34 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 0 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE100 0 0 0 0 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_tau.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_tau.ref
index ee966844d28e74e4a68c3d4fc22498caf4da004b..a9667ea9d3a6e70ec274af264458870b20ad871d 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_tau.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_tau.ref
@@ -1,41 +1,83 @@
TriggerSummaryStep1 0 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep1 0 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM ID#988149859
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
TriggerSummaryStep1 0 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep2 0 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep2 0 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
-TriggerSummaryStep2 0 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep2 0 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep2 0 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep3 0 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep3 0 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep1 1 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM ID#988149859
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
TriggerSummaryStep1 1 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep2 1 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep2 1 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep2 1 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep3 1 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep3 1 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM ID#988149859
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep3 2 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep1 3 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM ID#988149859
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
TriggerSummaryStep1 3 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep2 3 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep2 3 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep2 3 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep3 3 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep1 10 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep1 10 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
+TriggerSummaryStep1 10 0 DEBUG +++ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM ID#988149859
+TriggerSummaryStep1 10 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
TriggerSummaryStep1 10 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep1 10 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep2 10 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep2 10 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
-TriggerSummaryStep2 10 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep2 10 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep2 10 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep3 10 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep3 10 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep1 12 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep1 12 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
-TriggerSummaryStep1 12 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM ID#988149859
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep2 12 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep2 12 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
-TriggerSummaryStep2 12 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep2 12 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep2 12 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep3 12 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep3 12 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM ID#988149859
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep2 17 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
+TriggerSummaryStep2 17 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep3 17 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep1 19 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep1 19 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_tau25_idperf_tracktwoMVA_L1TAU12IM ID#988149859
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
TriggerSummaryStep1 19 0 DEBUG +++ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM ID#2456480859
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
TriggerSummaryStep2 19 0 DEBUG +++ HLT_tau0_perf_ptonly_L1TAU12 ID#372992233
-TriggerSummaryStep2 19 0 DEBUG +++ HLT_tau25_medium1_tracktwo ID#3693875985
-TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 20 20 6 6 6
-TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 decisions 6 6
-TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo 20 20 6 6 6
-TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo decisions 6 6
-TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM20 20 6 5 0 0 0 5
-TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM decisions 6 5 0 0 0
+TriggerSummaryStep2 19 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep2 19 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TriggerSummaryStep3 19 0 DEBUG +++ HLT_tau25_medium1_tracktwo_L1TAU12IM ID#1433975745
+TriggerSummaryStep3 19 0 DEBUG +++ HLT_tau25_idperf_tracktwo_L1TAU12IM ID#3346942453
+TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 20 20 8 8 0 8
+TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 decisions 8 8 0
+TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU10020 20 0 0 0 0
+TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 decisions 0 0 0
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM20 20 8 0 0 8
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM decisions 8 0 0
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM20 20 8 8 8 8
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM decisions 8 8 8
+TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM20 20 6 6 6 6
+TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM decisions 6 6 6
+TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM20 20 5 0 0 5
+TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM decisions 5 0 0
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 8a71290fc827c5ca920aa91b84ed0c030db81ab7..4838b6ff70cb9386506f1398a3b6a74ac1b0fc2a 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -76,6 +76,9 @@ TriggerHLTListRun3 = [
('TrigRoiDescriptorCollection#MURoIs', 'BS ESD AODFULL AODSLIM', 'Steer'),
('TrigRoiDescriptorCollection#METRoI', 'BS ESD AODFULL AODSLIM', 'Steer'),
('TrigRoiDescriptorCollection#JETRoI', 'BS ESD AODFULL AODSLIM', 'Steer'),
+ ('TrigRoiDescriptorCollection#HLT_RoiForTau', 'BS ESD AODFULL AODSLIM', 'Steer', 'inViews = TAUCaloViews'),
+ ('TrigRoiDescriptorCollection#HLT_RoiForID2', 'BS ESD AODFULL AODSLIM', 'Steer', 'inViews = TAUIDViews'),
+ ('TrigRoiDescriptorCollection#HLT_RoiForID1', 'BS ESD AODFULL AODSLIM', 'Steer', 'inViews = TAUID2Views'),
('xAOD::TrigCompositeContainer#L1EM', 'BS ESD AODFULL AODSLIM', 'Steer'),
('xAOD::TrigCompositeAuxContainer#L1EMAux.', 'BS ESD AODFULL AODSLIM', 'Steer'),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
index 4e9a8e62b26dee25844569395a2a57006616f2fb..729b42fbaf02b082e88c04a377b3619d2fd86113 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
@@ -12,7 +12,7 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Tau.TauChainConfiguration")
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase, RecoFragmentsPool
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep
-from TriggerMenuMT.HLTMenuConfig.Tau.TauMenuSequences import tauCaloMenuSequence, tauCaloMVAMenuSequence, tauCoreTrackSequence, tauPrecisionSequence
+from TriggerMenuMT.HLTMenuConfig.Tau.TauMenuSequences import tauCaloMenuSequence, tauCaloMVAMenuSequence, tauCoreTrackSequence, tauPrecisionSequence, tauTwoStepTrackSeqCore, tauTwoStepTrackSeqIso
#--------------------------------------------------------
# fragments generating config will be functions in new JO
@@ -26,6 +26,12 @@ def getTauCaloMVACfg(flags):
def getTauCoreTrackCfg(flags):
return tauCoreTrackSequence()
+def getTauFastTrackCfg(flags):
+ return tauTwoStepTrackSeqCore()
+
+def getTauIsoTrackCfg(flags):
+ return tauTwoStepTrackSeqIso()
+
def getTauPrecisionCfg(flags):
return tauPrecisionSequence()
@@ -49,9 +55,11 @@ class TauChainConfiguration(ChainConfigurationBase):
# define here the names of the steps and obtain the chainStep configuration
# --------------------
stepDictionary = {
- "ptonly":[self.getCaloSeq(), self.getTrackCore()],
- "tracktwo":[self.getCaloSeq(), self.getTrackCore()],
- "tracktwoMVA":[self.getCaloMVASeq(), self.getPrecision()],
+ "ptonly":[self.getCaloSeq(), self.getFastTrack()],
+ #"tracktwo":[self.getCaloSeq(), self.getFastTrack()],
+ "tracktwo":[self.getCaloSeq(), self.getFastTrack(), self.getTrackIso()],
+ #"tracktwo":[self.getCaloSeq(), self.getTrackCore()],
+ "tracktwoMVA":[self.getCaloMVASeq()],
}
# this should be extended by the signature expert to make full use of the dictionary!
@@ -84,6 +92,20 @@ class TauChainConfiguration(ChainConfigurationBase):
log.debug("Configuring step " + stepName)
tauSeq = RecoFragmentsPool.retrieve( getTauCoreTrackCfg, None)
return ChainStep(stepName, [tauSeq])
+
+ # --------------------
+ def getFastTrack(self):
+ stepName = 'Step2FT_tau'
+ log.debug("Configuring step " + stepName)
+ tauSeq = RecoFragmentsPool.retrieve( getTauFastTrackCfg, None)
+ return ChainStep(stepName, [tauSeq])
+
+ # --------------------
+ def getTrackIso(self):
+ stepName = 'Step2FTIso_tau'
+ log.debug("Configuring step " + stepName)
+ tauSeq = RecoFragmentsPool.retrieve( getTauIsoTrackCfg, None)
+ return ChainStep(stepName, [tauSeq])
# --------------------
def getPrecision(self):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauMenuSequences.py
index 0446db7356b0ee660c3bba463a5be58eda6df1a8..adb1c131ec83e8049b1b6495431db4715469483f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauMenuSequences.py
@@ -10,7 +10,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFr
from AthenaCommon.CFElements import parOR, seqAND
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
from TrigEDMConfig.TriggerEDMRun3 import recordable
-from TriggerMenuMT.HLTMenuConfig.Tau.TauRecoSequences import tauCaloSequence, tauCaloMVASequence
+from TriggerMenuMT.HLTMenuConfig.Tau.TauRecoSequences import tauCaloSequence, tauCaloMVASequence, tauFTFCoreSequence, tauFTFIsoSequence
# ====================================================================================================
# Get MenuSequences
@@ -25,6 +25,10 @@ def getTauSequence( step ):
return tauCoreTrackSequence()
if step == "precision":
return tauPrecisionSequence()
+ if step == "track_twostep_core":
+ return tauTwoStepTrackSeqCore()
+ if step == "track_twostep_iso":
+ return tauTwoStepTrackSeqIso()
return None
# ===============================================================================================
@@ -85,7 +89,7 @@ def tauCoreTrackSequence():
from TrigTauHypo.TrigTauHypoConf import TrigTauTrackRoiUpdaterMT
TrackRoiUpdater = TrigTauTrackRoiUpdaterMT("TrackRoiUpdater")
#TrackRoiUpdater.RoIInputKey = "TAUCaloRoIs"
- TrackRoiUpdater.RoIOutputKey = "RoiForID2"
+ TrackRoiUpdater.RoIOutputKey = recordable("HLT_RoiForID")
fastTrackViewsMaker = EventViewCreatorAlgorithm("IMTauFastTrack")
@@ -144,13 +148,13 @@ def tauPrecisionSequence():
from TrigTauHypo.TrigTauHypoConf import TrigTauTrackRoiUpdaterMT
precisionTRU = TrigTauTrackRoiUpdaterMT("precisionTRU")
#TrackRoiUpdater.RoIInputKey = "TAUCaloRoIs"
- precisionTRU.RoIOutputKey = "RoiForID2"
+ precisionTRU.RoIOutputKey = recordable("HLT_RoiForID1")
precisionTRU.fastTracksKey = TrackCollection
#"TrigFastTrackFinder_Tracks"
from TrigTauRec.TrigTauRecConfigMT import TrigTauRecMerged_TauPrecisionMVA
trigTauMVA = TrigTauRecMerged_TauPrecisionMVA(doMVATES=True, doTrackBDT=False, doRNN=True)
- trigTauMVA.RoIInputKey = "RoiForID2"
+ trigTauMVA.RoIInputKey = precisionTRU.RoIOutputKey
trigTauMVA.L1RoIKey = "TAUCaloRoIs"
trigTauMVA.TrigTauRecOutputKey = recordable("HLT_TrigTauRecMerged_MVA")
trigTauMVA.TrigTauJet = "HLT_TrigTauRecMerged"
@@ -162,7 +166,7 @@ def tauPrecisionSequence():
precisionViewsMaker = EventViewCreatorAlgorithm("IMPrecisionTau")
precisionViewsMaker.RoIsLink = "roi" # -||-
- precisionViewsMaker.InViewRoIs = RoIs # contract with the fastCalo
+ precisionViewsMaker.InViewRoIs = "TPrecViewRoIs" # contract with the fastCalo
precisionViewsMaker.Views = "TAUID2Views"
precisionViewsMaker.ViewFallThrough = True
precisionViewsMaker.RequireParentView = True
@@ -178,7 +182,7 @@ def tauPrecisionSequence():
from TrigTauHypo.TrigTauHypoConf import TrigEFTauMVHypoAlgMT
precisionHypo = TrigEFTauMVHypoAlgMT("EFTauMVHypoAlg")
- precisionHypo.taujetcontainer = "HLT_TrigTauRecMerged_MVA"
+ precisionHypo.taujetcontainer = trigTauMVA.TrigTauRecOutputKey
from TrigTauHypo.TrigEFTauMVHypoTool import TrigEFTauMVHypoToolFromDict
@@ -186,3 +190,41 @@ def tauPrecisionSequence():
Maker = precisionViewsMaker,
Hypo = precisionHypo,
HypoToolGen = TrigEFTauMVHypoToolFromDict )
+
+
+# ===============================================================================================
+# Fast, precision tracking and ID step (altogether) / Precision tracking not included yet
+# ===============================================================================================
+
+def tauTwoStepTrackSeqCore():
+
+ (sequence, ftfCoreViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauFTFCoreSequence,ConfigFlags)
+
+ from TrigTauHypo.TrigTauHypoConf import TrigTrackPreSelHypoAlgMT
+ fastTrkHypo = TrigTrackPreSelHypoAlgMT("TrackPreSelHypoAlg_RejectEmpty")
+ fastTrkHypo.trackcollection = sequenceOut
+
+ from TrigTauHypo.TrigTrackPreSelHypoTool import TrigTauTrackHypoToolFromDict
+
+ return MenuSequence( Sequence = sequence,
+ Maker = ftfCoreViewsMaker,
+ Hypo = fastTrkHypo,
+ HypoToolGen = TrigTauTrackHypoToolFromDict )
+
+
+def tauTwoStepTrackSeqIso():
+
+ (sequence, ftfIsoViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(tauFTFIsoSequence,ConfigFlags )
+
+ from TrigTauHypo.TrigTauHypoConf import TrigEFTauMVHypoAlgMT
+ precisionHypo = TrigEFTauMVHypoAlgMT("EFTauMVHypoAlgFinal")
+ precisionHypo.taujetcontainer = sequenceOut
+
+ from TrigTauHypo.TrigEFTauMVHypoTool import TrigEFTauMVHypoToolFromDict
+
+ return MenuSequence( Sequence = sequence,
+ Maker = ftfIsoViewsMaker,
+ Hypo = precisionHypo,
+ HypoToolGen = TrigEFTauMVHypoToolFromDict )
+
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
index 00e0477c22b16aa3e3ca84d016a5eb42159033e4..e77b102dd5982c15e7e355aa131b0e5eb21635c6 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
@@ -13,7 +13,7 @@ def _algoTauRoiUpdater(inputRoIs, clusters):
from TrigTauHypo.TrigTauHypoConf import TrigTauCaloRoiUpdaterMT
algo = TrigTauCaloRoiUpdaterMT("TauCaloRoiUpdater")
algo.RoIInputKey = inputRoIs
- algo.RoIOutputKey = "RoiForTau"
+ algo.RoIOutputKey = recordable("HLT_RoiForTau")
algo.CaloClustersKey = clusters
return algo
@@ -37,6 +37,28 @@ def _algoTauCaloOnlyMVA(inputRoIs, clusters):
algo.TrigTauRecOutputKey = recordable("HLT_TrigTauRecMerged")
return algo
+def _algoTauTrackRoiUpdater(inputRoIs, tracks):
+ from TrigTauHypo.TrigTauHypoConf import TrigTauTrackRoiUpdaterMT
+ algo = TrigTauTrackRoiUpdaterMT("TrackRoiUpdater")
+ algo.RoIInputKey = inputRoIs
+ algo.RoIOutputKey = recordable("HLT_RoiForID2")
+ algo.fastTracksKey = tracks
+ return algo
+
+def _algoTauPrecisionMVA(inputRoIs, tracks):
+ from TrigTauRec.TrigTauRecConfigMT import TrigTauRecMerged_TauPrecisionMVA
+ algo = TrigTauRecMerged_TauPrecisionMVA(doMVATES=True, doTrackBDT=False, doRNN=True)
+ algo.RoIInputKey = inputRoIs
+ algo.L1RoIKey = "TAUCaloRoIs"
+ algo.TrigTauRecOutputKey = recordable("HLT_TrigTauRecMerged_MVA")
+ algo.TrigTauJet = "HLT_TrigTauRecMerged"
+ algo.Key_trackPartInputContainer = tracks
+ algo.UseCaloClusters = False
+ #algo.clustersKey = "caloclusters"
+ algo.Key_vertexInputContainer = "VxPrimaryCandidate"
+ algo.TrigTauTrkOutputKey = recordable("HLT_tautrack_MVA")
+ return algo
+
def tauCaloRecoSequence(InViewRoIs, SeqName):
# lc sequence
(lcTopoInViewSequence, lcCaloSequenceOut) = RecoFragmentsPool.retrieve(HLTLCTopoRecoSequence, InViewRoIs)
@@ -86,3 +108,126 @@ def tauCaloMVASequence(ConfigFlags):
tauCaloMVASequence = seqAND("tauCaloMVASequence", [tauCaloMVAViewsMaker, tauCaloMVAInViewSequence ])
return (tauCaloMVASequence, tauCaloMVAViewsMaker, sequenceOut)
+
+def tauCoreTrackSequence( RoIs, name ):
+ import AthenaCommon.CfgMgr as CfgMgr
+
+ tauCoreTrackSequence = parOR(name)
+
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
+ (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature='TauCore',separateTrackParticleCreator="_TauCore",rois = RoIs)
+
+ for viewAlg in viewAlgs:
+ if "InDetTrigTrackParticleCreatorAlg" in viewAlg.name():
+ TrackCollection = viewAlg.TrackName
+
+ ViewVerify = CfgMgr.AthViews__ViewDataVerifier("tauViewDataVerifierCoreFTF")
+ ViewVerify.DataObjects = [('xAOD::TauJetContainer','StoreGateSvc+HLT_TrigTauRecMerged')]
+ viewAlgs.append(ViewVerify)
+
+ tauTrackRoiUpdaterAlg = _algoTauTrackRoiUpdater(inputRoIs = RoIs, tracks = TrackCollection)
+
+ viewAlgs.append(tauTrackRoiUpdaterAlg)
+
+ for viewAlg in viewAlgs:
+ tauCoreTrackSequence += viewAlg
+ #print viewAlg.name()
+ if "RoIs" in viewAlg.properties():
+ viewAlg.RoIs = RoIs
+ if "roiCollectionName" in viewAlg.properties():
+ viewAlg.roiCollectionName = RoIs
+ if "TrackRoiUpdater" in viewAlg.name():
+ viewAlg.RoIInputKey = RoIs
+
+ sequenceOut = TrackCollection
+
+ return tauCoreTrackSequence, sequenceOut
+
+def tauIsoTrackSequence( RoIs , name):
+ import AthenaCommon.CfgMgr as CfgMgr
+
+ tauIsoTrackSequence = parOR(name)
+
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
+ (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature='TauIso',separateTrackParticleCreator="_TauIso",rois = RoIs)
+
+ ViewVerify = CfgMgr.AthViews__ViewDataVerifier("tauViewDataVerifierIsoFTF")
+ ViewVerify.DataObjects = [('xAOD::TauJetContainer','StoreGateSvc+HLT_TrigTauRecMerged')]
+ viewAlgs.append(ViewVerify)
+
+ for viewAlg in viewAlgs:
+ tauIsoTrackSequence += viewAlg
+ #print viewAlg.name()
+ if "RoIs" in viewAlg.properties():
+ viewAlg.RoIs = RoIs
+ if "roiCollectionName" in viewAlg.properties():
+ viewAlg.roiCollectionName = RoIs
+ if "TrackRoiUpdater" in viewAlg.name():
+ viewAlg.RoIInputKey = RoIs
+ if "TrigFastTrackFinder" in viewAlg.name():
+ TrackCollection = viewAlg.TracksName
+
+
+ #Precision Tracking
+ PTAlgs = [] #List of precision tracking algs
+ PTTracks = [] #List of TrackCollectionKeys
+ PTTrackParticles = [] #List of TrackParticleKeys
+
+ from TrigUpgradeTest.InDetPT import makeInDetPrecisionTracking
+ #When run in a different view than FTF some data dependencies needs to be loaded through verifier
+ #Pass verifier as an argument and it will automatically append necessary DataObjects
+ #@NOTE: Don't provide any verifier if loaded in the same view as FTF
+
+ PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "taus", ViewVerify, inputFTFtracks= TrackCollection )
+ PTSeq = seqAND("precisionTrackingInTaus", PTAlgs )
+ #Get last tracks from the list as input for other alg
+
+ tauIsoTrackSequence += PTSeq
+
+ #Default from FTF
+ #trackParticles = "xAODTracks"
+ #TODO: change according to what needs to be done here
+ #Last key in the list is for the TrackParticles after all PT stages (so far only one :) )
+ trackParticles = PTTrackParticles[-1]
+
+ tauPrecisionMVAAlg = _algoTauPrecisionMVA(inputRoIs = RoIs, tracks = trackParticles)
+
+ tauIsoTrackSequence += tauPrecisionMVAAlg
+
+ sequenceOut = tauPrecisionMVAAlg.TrigTauRecOutputKey
+
+ return tauIsoTrackSequence, sequenceOut
+
+def tauFTFCoreSequence(ConfigFlags):
+
+ RecoSequenceName = "tauFTFCoreInViewSequence"
+
+ ftfCoreViewsMaker = EventViewCreatorAlgorithm("IMFTFCore")
+ ftfCoreViewsMaker.RoIsLink = "roi" # -||-
+ ftfCoreViewsMaker.InViewRoIs = "TCoreViewRoIs" # contract with the fastCalo
+ ftfCoreViewsMaker.Views = "TAUFTFCoreViews"
+ ftfCoreViewsMaker.ViewFallThrough = True
+ ftfCoreViewsMaker.RequireParentView = True
+ ftfCoreViewsMaker.ViewNodeName = RecoSequenceName
+
+ (tauFTFCoreInViewSequence, sequenceOut) = tauCoreTrackSequence( ftfCoreViewsMaker.InViewRoIs, RecoSequenceName)
+
+ tauFastTrackCoreSequence = seqAND("tauFastTrackCoreSequence", [ftfCoreViewsMaker, tauFTFCoreInViewSequence ])
+ return (tauFastTrackCoreSequence, ftfCoreViewsMaker, sequenceOut)
+
+def tauFTFIsoSequence(ConfigFlags):
+
+ RecoSequenceName = "tauFTFIsoInViewSequence"
+
+ ftfIsoViewsMaker = EventViewCreatorAlgorithm("IMFTFIso")
+ ftfIsoViewsMaker.RoIsLink = "roi" # -||-
+ ftfIsoViewsMaker.InViewRoIs = "TIsoViewRoIs" # contract with the fast track core
+ ftfIsoViewsMaker.Views = "TAUFTFIsoViews"
+ ftfIsoViewsMaker.ViewFallThrough = True
+ ftfIsoViewsMaker.RequireParentView = True
+ ftfIsoViewsMaker.ViewNodeName = RecoSequenceName
+
+ (tauFTFIsoInViewSequence, sequenceOut) = tauIsoTrackSequence( ftfIsoViewsMaker.InViewRoIs, RecoSequenceName)
+
+ tauFastTrackIsoSequence = seqAND("tauFastTrackIsoSequence", [ftfIsoViewsMaker, tauFTFIsoInViewSequence ])
+ return (tauFastTrackIsoSequence, ftfIsoViewsMaker, sequenceOut)