Merge branch 'l1decoder-fixup' into 'master'

CTPUnpackingTool fixup

See merge request atlas/athena!37763

Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypoTool.h

@@ -8,7 +8,7 @@
 #include "Gaudi/Property.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "AthenaBaseComps/AthAlgTool.h"
-#include "L1Decoder/CTPUnpackingTool.h"
+#include "L1Decoder/ICTPUnpackingTool.h"
 
 #include "IL1InfoHypoTool.h"
 
@@ -26,7 +26,7 @@ public:
 private:
     HLT::Identifier m_decisionId;
     Gaudi::Property <std::vector<std::string>> m_l1ItemNames {this, "L1ItemNames"};
-    ToolHandle <CTPUnpackingTool> m_ctpUnpackingTool {this, "CTPUnpackingTool", "CTPUnpackingTool"};
+    ToolHandle <ICTPUnpackingTool> m_ctpUnpackingTool {this, "CTPUnpackingTool", "CTPUnpackingTool"};
 };
 
 #endif //TRIGHYPOCOMMONTOOLS_L1INFOHYPOTOOL_H
\ No newline at end of file

Trigger/TrigSteer/L1Decoder/CMakeLists.txt

@@ -9,13 +9,12 @@ find_package( CLHEP )
 
 # Component(s) in the package:
 atlas_add_library( L1DecoderLib
-                   L1DecoderRoot/*.cxx
                    PUBLIC_HEADERS L1Decoder
                    INTERFACE 
                    LINK_LIBRARIES TrigConfInterfaces)
                    
 atlas_add_component( L1Decoder
-                     src/*.cxx src/components/*.cxx L1DecoderRoot/*.cxx
+                     src/*.cxx src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} AthViews AthenaBaseComps AthenaKernel AthenaMonitoringKernelLib GaudiKernel L1DecoderLib StoreGateLib TrigCompositeUtilsLib TrigConfData TrigConfHLTData TrigConfL1Data TrigCostMonitorMTLib TrigSteeringEvent TrigT1Interfaces TrigT1Result TrigTimeAlgsLib xAODEventInfo xAODTrigger TrigConfxAODLib  )
 

Trigger/TrigSteer/L1Decoder/L1Decoder/CTPUnpackingTool.h

@@ -29,7 +29,7 @@ public:
 
   virtual StatusCode start() override;
 
-  StatusCode passBeforePrescaleSelection(const ROIB::RoIBResult* roib, const std::vector<std::string>& l1ItemNames, bool& pass) const;
+  virtual StatusCode passBeforePrescaleSelection(const ROIB::RoIBResult* roib, const std::vector<std::string>& l1ItemNames, bool& pass) const;
 
 private:
   // Menu objects (that act here as configuration) need to be available in detector store.

Trigger/TrigSteer/L1Decoder/L1Decoder/CTPUnpackingToolBase.h

@@ -29,12 +29,12 @@ public:
                        const IInterface* parent);
 
   virtual StatusCode decode(const ROIB::RoIBResult& /*roib*/,
-                            HLT::IDVec& /*enabledChains*/) const override
-  { return StatusCode::SUCCESS; }
+                            HLT::IDVec& /*enabledChains*/) const override;
 
   virtual StatusCode initialize() override;
 
-  virtual StatusCode passBeforePrescaleSelection(const ROIB::RoIBResult* roib, const std::vector<std::string>& l1ItemNames, bool& pass) const override;
+  virtual StatusCode passBeforePrescaleSelection(const ROIB::RoIBResult* /*roib*/,
+                            const std::vector<std::string>& /*l1ItemNames*/, bool& /*pass*/) const override;
 
 protected:
 

Trigger/TrigSteer/L1Decoder/L1DecoderRoot/CTPUnpackingToolBase.cxx → Trigger/TrigSteer/L1Decoder/src/CTPUnpackingToolBase.cxx

@@ -25,5 +25,11 @@ StatusCode CTPUnpackingToolBase::initialize()
 }
 
 StatusCode CTPUnpackingToolBase::passBeforePrescaleSelection(const ROIB::RoIBResult* /*roib*/, const std::vector<std::string>& /*l1ItemNames*/, bool& /*pass*/) const {
-  return StatusCode::SUCCESS;
+  ATH_MSG_ERROR("Base class should not call this function");
+  return StatusCode::FAILURE;
+}
+
+StatusCode CTPUnpackingToolBase::decode(const ROIB::RoIBResult& /*roib*/, HLT::IDVec& /*enabledChains*/) const {
+  ATH_MSG_ERROR("Base class should not call this function");
+  return StatusCode::FAILURE;
 }