From 1c0eb45b926a43e94a17975f099a2a4761caafa8 Mon Sep 17 00:00:00 2001
From: Carlo Varni <cvarni@pc-tbed-pub-32.cern.ch>
Date: Fri, 14 Dec 2018 10:20:28 +0100
Subject: [PATCH] Change in RoIs keys
Former-commit-id: 0f4d65c1d3409f314d125cbc48924ac6cc121329
---
.../TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx | 7 -------
.../TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py | 6 +++---
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx
index f4a4847a2cf..f0450ecedb5 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx
@@ -177,13 +177,6 @@ StatusCode TrigBjetEtHypoAlgMT::retrieveJetsFromEventView( const EventContext& c
output->setStore( outputAux.release() );
for ( auto previousDecision: *prevDecisionHandle ) {
- //get RoI
- ElementLink< TrigRoiDescriptorCollection > roiEL = previousDecision->objectLink<TrigRoiDescriptorCollection>( "initialRoI" );
- ATH_CHECK( roiEL.isValid() );
- const TrigRoiDescriptor* roi = *roiEL;
- ATH_MSG_DEBUG( "Retrieved RoI from previous decision " );
- ATH_MSG_DEBUG( " ** eta=" << roi->eta() <<" phi="<< roi->phi() );
-
// get View
ElementLink< ViewContainer > viewEL = previousDecision->objectLink< ViewContainer >( "view" );
ATH_CHECK( viewEL.isValid() );
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py
index 5c861e42797..e6201785dd5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py
@@ -104,7 +104,7 @@ def bJetStep1Sequence():
hypo.OutputLevel = DEBUG
hypo.Jets = jetSplitter.OutputJets
hypo.RoIs = jetSplitter.OutputRoi
- hypo.RoILink = "initialRoI" # To be used in following step EventView
+ hypo.RoILink = "step1RoI" # To be used in following step EventView
hypo.JetLink = "jets" # To be used in following step with EventView
# Sequence
@@ -205,7 +205,7 @@ def bJetStep2Sequence():
InputMakerAlg.Views = "BJetViews" # Name of output view
# RoIs
InputMakerAlg.InViewRoIs = "InViewRoIs" # Name RoIs are inserted in the view
- InputMakerAlg.RoIsLink = "initialRoI" # RoIs linked to previous decision
+ InputMakerAlg.RoIsLink = "step1RoI" # RoIs linked to previous decision
# Jets
InputMakerAlg.InViewJets = "InViewJets" # Name Jets are inserted in the view
InputMakerAlg.JetsLink = "jets" # Jets linked to previous decision
@@ -229,7 +229,7 @@ def bJetStep2Sequence():
from TrigBjetHypo.TrigBjetEtHypoTool import TrigBjetEtHypoToolFromName_gsc
hypo = TrigBjetEtHypoAlgMT("TrigBjetEtHypoAlg_step2")
hypo.OutputLevel = DEBUG
- hypo.RoIs = "initialRoI" #InputMakerAlg.InViewRoIs
+ hypo.RoIs = "step1RoI"
hypo.Jets = theGSC.JetOutputKey
hypo.RoILink = InputMakerAlg.RoIsLink # To be used in following step EventView
hypo.JetLink = InputMakerAlg.JetsLink # To be used in following step with EventView
--
GitLab