From 362bb60622e96b8f30a9fd57292e3c3de332cbcb Mon Sep 17 00:00:00 2001
From: Tim Martin <tim.martin@cern.ch>
Date: Fri, 28 Jan 2022 16:57:30 +0100
Subject: [PATCH] Remove MergeIntoSuperRoI from InputMakerForROI
---
.../DecisionHandling/src/InputMakerForRoI.cxx | 20 ++++---------------
.../DecisionHandling/src/InputMakerForRoI.h | 3 ---
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
index de90bd14a5b3..eb2eb5788555 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
@@ -57,13 +57,6 @@ StatusCode InputMakerForRoI::execute( const EventContext& context ) const {
std::vector <ElementLink<TrigRoiDescriptorCollection> > RoIsFromDecision; // used to check for duplicate RoIs
- if (m_mergeIntoSuperRoI) {
- TrigRoiDescriptor* superRoI = new TrigRoiDescriptor();
- superRoI->setComposite(true);
- superRoI->manageConstituents(false);
- outputRoIColl->push_back(superRoI);
- }
-
// loop over output decisions in container of outputHandle, collect RoIs to process
for (const Decision* outputDecision : *outputHandle) {
@@ -78,15 +71,10 @@ StatusCode InputMakerForRoI::execute( const EventContext& context ) const {
if ( find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL) == RoIsFromDecision.end() ) {
RoIsFromDecision.push_back(roiEL); // just to keep track of which we have used
const TrigRoiDescriptor* roi = *roiEL;
- ATH_MSG_DEBUG("Found RoI:" <<*roi<<" FS="<<roi->isFullscan());
-
- if (m_mergeIntoSuperRoI) { // Append to the single superRoI
- outputRoIColl->back()->push_back( roi );
- } else { // Add individually
- TrigRoiDescriptor* newroi = new TrigRoiDescriptor(*roi); //use copy constructor
- outputRoIColl->push_back(newroi);
- ATH_MSG_DEBUG("Added RoI:" <<*newroi<<" FS="<<newroi->isFullscan());
- }
+ ATH_MSG_DEBUG("Adding RoI to be processed:" <<*roi<<" FS="<<roi->isFullscan());
+
+ TrigRoiDescriptor* newroi = new TrigRoiDescriptor(*roi); //use copy constructor
+ outputRoIColl->push_back(newroi);
}
} // loop over decisions
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
index 3e54665b0f37..8312eecc1bc4 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
@@ -36,9 +36,6 @@
ToolHandle<IViewCreatorROITool> m_roiTool{this, "RoITool", "",
"Tool used to supply per-Decision Object the RoI which should be processed. If left empty and no RoIs will be attached."};
- Gaudi::Property<bool> m_mergeIntoSuperRoI{this, "MergeIntoSuperRoI", false,
- "If true, the output RoIs collection will contain only one ROI, this will be a SuperRoI encompassing all individual ROIs - one from each of the input Decision Objects."};
-
};
--
GitLab