Merge branch 'l1decoder-py3' into 'master'

L1Decoder cleanups (py3, c++ formatting, incorrectly defined property)

See merge request atlas/athena!38058

Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py

@@ -2,7 +2,6 @@
 #  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 
-from six import iteritems
 from AthenaCommon.Logging import logging
 log = logging.getLogger('L1DecoderConfig')
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -22,7 +21,7 @@ def mapThresholdToL1DecisionCollection(threshold):
                                 "TE" : "HLTNav_L1MET" }
 
     # remove actual threshold value from L1 threshold string
-    for (thresholdType, l1Collection) in iteritems(mapThresholdToL1Decoder):
+    for (thresholdType, l1Collection) in mapThresholdToL1Decoder.items():
         if threshold.startswith( thresholdType ):
             return l1Collection
 
@@ -43,7 +42,7 @@ def mapThresholdToL1RoICollection(threshold):
                                 "TE" : "HLT_FSRoI" }
 
     # remove actual threshold value from L1 threshold string
-    for (thresholdType, l1Collection) in iteritems(mapThresholdToL1Decoder):
+    for (thresholdType, l1Collection) in mapThresholdToL1Decoder.items():
         if threshold.startswith( thresholdType ):
             return l1Collection
 

Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.h

@@ -42,12 +42,15 @@ private:
 
   ///@{ @name Properties
   SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
-    this, "OutputTrigRoIs", "HLT_EMRoIs", "Name of the RoIs object produced by the unpacker"};
+    this, "OutputTrigRoIs", "HLT_EMRoIs",
+    "Name of the RoIs object produced by the unpacker"};
 
   SG::WriteHandleKey< DataVector<LVL1::RecEmTauRoI> > m_recRoIsKey{
-    this, "OutputRecRoIs", "HLT_RecEMRoIs", "Name of the RoIs object produced by the unpacker"};
+    this, "OutputRecRoIs", "HLT_RecEMRoIs",
+    "Name of the RoIs object produced by the unpacker"};
 
-  Gaudi::Property<float>            m_roIWidth{this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
+  Gaudi::Property<float> m_roIWidth{
+    this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
   ///@}
   
   ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;

Trigger/TrigSteer/L1Decoder/src/FSRoIsUnpackingTool.h

@@ -30,7 +30,8 @@ public:
   virtual StatusCode start() override;
 
 private:
-  SG::WriteHandleKey<TrigRoiDescriptorCollection> m_fsRoIKey{ this, "OutputTrigRoIs", "HLT_FSRoI", "The key of FS RoI" };
+  SG::WriteHandleKey<TrigRoiDescriptorCollection> m_fsRoIKey{
+    this, "OutputTrigRoIs", "HLT_FSRoI", "The key of FS RoI" };
 
   ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
   HLT::IDSet m_allFSChains;

Trigger/TrigSteer/L1Decoder/src/JRoIsUnpackingTool.h

@@ -16,39 +16,43 @@
 #include "RoIsUnpackingToolBase.h"
 
 
-class JRoIsUnpackingTool : public RoIsUnpackingToolBase { 
-public: 
+class JRoIsUnpackingTool : public RoIsUnpackingToolBase {
+public:
 
   JRoIsUnpackingTool( const std::string& type,
-                      const std::string& name, 
+                      const std::string& name,
                       const IInterface* parent );
 
   StatusCode unpack(const EventContext& ctx,
                     const ROIB::RoIBResult& roib,
                     const HLT::IDSet& activeChains) const override;
-  
+
   virtual StatusCode initialize() override;
   virtual StatusCode updateConfiguration() override;
   virtual StatusCode finalize() override { return StatusCode::SUCCESS; }
   virtual StatusCode start() override;
-private: 
+private:
   SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
-    this, "OutputTrigRoIs", "HLT_JETRoIs", "Name of the RoIs object produced by the unpacker"};
+    this, "OutputTrigRoIs", "HLT_JETRoIs",
+    "Name of the RoIs object produced by the unpacker"};
 
 
   SG::WriteHandleKey< DataVector<LVL1::RecJetRoI> > m_recRoIsKey{
-    this, "OutputRecRoIs", "HLT_RecJETRoIs", "Name of the RoIs object produced by the unpacker"};
+    this, "OutputRecRoIs", "HLT_RecJETRoIs",
+    "Name of the RoIs object produced by the unpacker"};
 
-  Gaudi::Property<float>            m_roIWidth{
+  Gaudi::Property<float> m_roIWidth{
     this, "RoIWidth", 0.4, "Size of RoI in eta/ phi"};
-  
 
-  Gaudi::Property<std::string> m_fsRoIKey{ this, "FSRoIKey", "HLT_FSRoI", "The key of FS RoI made earlier by the L1Decoder" };
+
+  Gaudi::Property<std::string> m_fsRoIKey{
+    this, "FSRoIKey", "HLT_FSRoI",
+    "The key of FS RoI made earlier by the L1Decoder" };
 
   ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
   std::vector<TrigConf::TriggerThreshold*> m_jetThresholds;
 
-}; 
+};
 
 
 #endif //> !L1DECODER_JROISUNPACKINGTOOL_H

Trigger/TrigSteer/L1Decoder/src/L1Decoder.h

@@ -22,7 +22,7 @@
 /*
   @brief an algorithm used to unpack the RoIB result and provide CTP bits, active chains and RoIs
 
-  All the unpacking is outsourced to tools. However the menu mapping, this is from CTP items to chains 
+  All the unpacking is outsourced to tools. However the menu mapping, this is from CTP items to chains
   and threshods to chains is maintained in this algorithm and provided to unpacking tools.
  */
 
@@ -48,39 +48,49 @@ private:
   ///@{ @name Properties
 
   /// Level-1 result with RoIs from Run-2 hardware systems
-  SG::ReadHandleKey<ROIB::RoIBResult> m_RoIBResultKey{this, "RoIBResult", "RoIBResult", 
-      "Name of RoIBResult"};
+  SG::ReadHandleKey<ROIB::RoIBResult> m_RoIBResultKey{
+    this, "RoIBResult", "RoIBResult", "Name of RoIBResult"};
 
   /// Level-1 result with RoIs from Run-3 hardware systems
-  SG::ReadHandleKey<xAOD::TrigCompositeContainer> m_l1TriggerResultKey{this, "L1TriggerResult", "L1TriggerResult",
-      "Name of the L1 Trigger Result"};
+  SG::ReadHandleKey<xAOD::TrigCompositeContainer> m_l1TriggerResultKey{
+    this, "L1TriggerResult", "L1TriggerResult",
+    "Name of the L1 Trigger Result"};
 
-  SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_summaryKey{this, "L1DecoderSummaryKey", "L1DecoderSummary", 
-      "Chains status after L1 and prescaling"}; // Note: was previously property 'Chains' with default value 'HLTChains'
+  SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_summaryKey{
+    this, "L1DecoderSummaryKey", "L1DecoderSummary",
+    "Chains status after L1 and prescaling"}; // Note: was previously property 'Chains' with default value 'HLTChains'
 
-  SG::WriteHandleKey<TrigTimeStamp> m_startStampKey{ this, "StartStampKey", "L1DecoderStart", 
-      "Object with the time stamp when decoding started" };
+  SG::WriteHandleKey<TrigTimeStamp> m_startStampKey{
+    this, "StartStampKey", "L1DecoderStart",
+    "Object with the time stamp when decoding started" };
 
-  Gaudi::Property<bool> m_doCostMonitoring{this, "DoCostMonitoring", false, 
+  Gaudi::Property<bool> m_doCostMonitoring{
+    this, "DoCostMonitoring", false,
     "Enables start-of-event cost monitoring behavior."};
 
-  Gaudi::Property<std::string> m_costMonitoringChain{this, "CostMonitoringChain", "HLT_costmonitor_CostMonDS_L1All", 
+  Gaudi::Property<std::string> m_costMonitoringChain{
+    this, "CostMonitoringChain", "HLT_costmonitor_CostMonDS_L1All",
     "Name of the chain which should enable HLT cost montoring."};
 
-  ServiceHandle<ITrigCostMTSvc> m_trigCostSvcHandle { this, "TrigCostMTSvc", "TrigCostMTSvc", 
-      "The trigger cost service" };
+  ServiceHandle<ITrigCostMTSvc> m_trigCostSvcHandle {
+    this, "TrigCostMTSvc", "TrigCostMTSvc",
+    "The trigger cost service" };
 
-  ToolHandle<ICTPUnpackingTool> m_ctpUnpacker{this, "ctpUnpacker", "CTPUnpackingTool/CTPUnpackingTool",
-      "Tool used to unpack the CTP info"};
+  ToolHandle<ICTPUnpackingTool> m_ctpUnpacker{
+    this, "ctpUnpacker", "CTPUnpackingTool/CTPUnpackingTool",
+    "Tool used to unpack the CTP info"};
 
-  ToolHandleArray<IRoIsUnpackingTool> m_roiUnpackers{this, "roiUnpackers", {},
-      "Tools unpacking RoIs"};
+  ToolHandleArray<IRoIsUnpackingTool> m_roiUnpackers{
+    this, "roiUnpackers", {},
+    "Tools unpacking RoIs"};
 
-  ToolHandle<IPrescalingTool> m_prescaler{this, "prescaler", "PrescalingTool/PrescalingTool", 
-      "Prescaling tool"};
+  ToolHandle<IPrescalingTool> m_prescaler{
+    this, "prescaler", "PrescalingTool/PrescalingTool",
+    "Prescaling tool"};
 
-  ToolHandle<TrigConf::IKeyWriterTool> m_keyWriterTool{this, "KeyWriterTool", "", 
-      "Writes the keys used when the trigger executes on an event"}; 
+  ToolHandle<TrigConf::IKeyWriterTool> m_keyWriterTool{
+    this, "KeyWriterTool", "",
+    "Writes the keys used when the trigger executes on an event"};
 
 };
 

Trigger/TrigSteer/L1Decoder/src/L1TestDecoder.h

@@ -31,18 +31,21 @@ public:
 private:
 
   ///@{ @name Properties
-  SG::ReadHandleKey<ROIB::RoIBResult> m_RoIBResultKey{this, "RoIBResult", "RoIBResult", 
-      "Name of RoIBResult"};
-  
+  SG::ReadHandleKey<ROIB::RoIBResult> m_RoIBResultKey{
+    this, "RoIBResult", "RoIBResult",
+    "Name of RoIBResult"};
+
   SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigEMRoIsKey{
-    this, "EMRoIs", "HLT_TestEMRoIs", "Name of the EM RoIs object produced by the unpacker"};
+    this, "EMRoIs", "HLT_TestEMRoIs",
+    "Name of the EM RoIs object produced by the unpacker"};
 
   SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_EMDecisionsKey{
     this, "EMDecisions", "HLTNav_TestL1EM", "Decisions for each EM RoI"};
 
-  
+
   SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigFSRoIKey{
-    this, "OutputTrigFSRoI", "HLT_TestFSRoI", "Name of the Full Scan RoIs object produced by the unpacker"};
+    this, "OutputTrigFSRoI", "HLT_TestFSRoI",
+    "Name of the Full Scan RoIs object produced by the unpacker"};
 
   float m_roIWidth = 0.2;
 };

Trigger/TrigSteer/L1Decoder/src/L1TriggerResultMaker.h

@@ -29,13 +29,17 @@ public:
 private:
   // ------------------------- Properties --------------------------------------
   SG::WriteHandleKey<xAOD::TrigCompositeContainer> m_l1TriggerResultWHKey {
-    this, "L1TriggerResultWHKey", "L1TriggerResult", "Key of the output L1 Trigger Result"};
+    this, "L1TriggerResultWHKey", "L1TriggerResult",
+    "Key of the output L1 Trigger Result"};
 
   // Muon RoIs
   SG::ReadHandleKey<xAOD::MuonRoIContainer> m_muRoIKey {
-    this, "MuRoIKey", "LVL1MuonRoIs", "Key of the muon RoI container to be linked to L1 Trigger Result"};
+    this, "MuRoIKey", "LVL1MuonRoIs",
+    "Key of the muon RoI container to be linked to L1 Trigger Result"};
+
   Gaudi::Property<std::string> m_muRoILinkName {
-    this, "MuRoILinkName", "mu_roi", "Name of the link to be created from L1 Trigger Result to muon RoI container"};
+    this, "MuRoILinkName", "mu_roi",
+    "Name of the link to be created from L1 Trigger Result to muon RoI container"};
 
   // Placeholder for other L1 xAOD outputs:
   // - CTP result

Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.h

@@ -40,12 +40,15 @@ private:
 
   ///@{ @name Properties
   SG::WriteHandleKey< TrigRoiDescriptorCollection > m_trigRoIsKey{
-    this, "OutputTrigRoIs", "HLT_MURoIs", "Name of the RoIs object produced by the unpacker"};
+    this, "OutputTrigRoIs", "HLT_MURoIs",
+    "Name of the RoIs object produced by the unpacker"};
 
   SG::WriteHandleKey< DataVector<LVL1::RecMuonRoI> > m_recRoIsKey{
-    this, "OutputRecRoIs", "HLT_RecMURoIs", "Name of the RoIs object produced by the unpacker"};
+    this, "OutputRecRoIs", "HLT_RecMURoIs",
+    "Name of the RoIs object produced by the unpacker"};
 
-  Gaudi::Property<float> m_roIWidth{"RoIWidth", 0.1, "Size of RoI in eta/ phi"};
+  Gaudi::Property<float> m_roIWidth{
+    this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
   ///@}
 
   ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;

Trigger/TrigSteer/L1Decoder/src/PrescalingEmulationTool.h

@@ -43,8 +43,14 @@ public:
  private: 
 
   PrescalingEmulationTool();  
-  Gaudi::Property<bool> m_keepUnknownChains{ this, "KeepUnknownChains", true, "If True then chains for which prescaling information is not set are kept" }; 
-  Gaudi::Property< std::vector<std::string> > m_prescalingConfig{ this, "Prescales", {}, "The prescaling info in the form: \"chainName:PSValue\"" }; 
+  Gaudi::Property<bool> m_keepUnknownChains{
+    this, "KeepUnknownChains", true,
+    "If True then chains for which prescaling information is not set are kept" };
+
+  Gaudi::Property< std::vector<std::string> > m_prescalingConfig{
+    this, "Prescales", {},
+    "The prescaling info in the form: \"chainName:PSValue\"" };
+
   ATHRNG::RNGWrapper m_RNGEngines;
   
   typedef std::map<HLT::Identifier, float> PrescalingInfo;

Trigger/TrigSteer/L1Decoder/src/PrescalingTool.h

@@ -58,12 +58,18 @@ class PrescalingTool : public extends<AthAlgTool, IPrescalingTool> {
  private: 
 
    // input data
-   SG::ReadCondHandleKey<TrigConf::HLTPrescalesSet> m_hltPrescaleSetInputKey{ this, "HLTPrescales", "HLTPrescales", "HLT prescales set"};
-   SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{ this, "EventInfo", "EventInfo", "Event Info Object Key"};
+   SG::ReadCondHandleKey<TrigConf::HLTPrescalesSet> m_hltPrescaleSetInputKey{
+    this, "HLTPrescales", "HLTPrescales", "HLT prescales set"};
+
+   SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{
+    this, "EventInfo", "EventInfo", "Event Info Object Key"};
 
    // properties
-   Gaudi::Property<bool> m_keepUnknownChains{ this, "KeepUnknownChains", true, "If True then chains for which prescaling information is not set are kept" };
-   ToolHandle<GenericMonitoringTool> m_monTool{this,"MonTool","","Monitoring tool"};
+   Gaudi::Property<bool> m_keepUnknownChains{
+    this, "KeepUnknownChains", true,
+    "If True then chains for which prescaling information is not set are kept" };
+
+   ToolHandle<GenericMonitoringTool> m_monTool{this, "MonTool", "", "Monitoring tool"};
 
    // random engine for calculating prescales
    ATHRNG::RNGWrapper m_RNGEngines;

Trigger/TrigSteer/L1Decoder/src/RerunRoIsUnpackingTool.h

@@ -18,19 +18,19 @@
 
 /**
  * @class $(klass)s
- * @brief 
+ * @brief
  **/
 
 class RerunRoIsUnpackingTool : public RoIsUnpackingToolBase
-{ 
+{
 
- public: 
+ public:
 
   RerunRoIsUnpackingTool( const std::string& type,
-			  const std::string& name, 
+			  const std::string& name,
 			  const IInterface* parent );
 
-  virtual ~RerunRoIsUnpackingTool(); 
+  virtual ~RerunRoIsUnpackingTool();
   virtual StatusCode initialize() override;
   virtual StatusCode finalize() override;
   virtual StatusCode updateConfiguration() override;
@@ -40,10 +40,12 @@ class RerunRoIsUnpackingTool : public RoIsUnpackingToolBase
 		     const HLT::IDSet& activeChains ) const override;
 
 
- private: 
-  SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_sourceKey{ this, "SourceDecisions", "UnspecifiedRoIDecisionsForRerunning", "The collection which has to be checked for RoIs to re-enable" };
+ private:
+  SG::ReadHandleKey<TrigCompositeUtils::DecisionContainer> m_sourceKey{
+    this, "SourceDecisions", "UnspecifiedRoIDecisionsForRerunning",
+    "The collection which has to be checked for RoIs to re-enable" };
 
-}; 
+};
 
 
 #endif //> !L1DECODER_RERUNROISUNPACKINGTOOL_H

Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingEmulationTool.h

@@ -39,8 +39,12 @@ class RoIsUnpackingEmulationTool : public RoIsUnpackingToolBase {
 
   Gaudi::Property<float> m_roIWidth{"RoIWidth", 0.1, "Size of RoI in eta/ phi"};
 
-  Gaudi::Property<std::string> m_inputFilename{this, "InputFilename", "RoIEmulation.dat", "FakeROI input filename"};
-  Gaudi::Property<std::string> m_thresholdPrefix{this, "ThresholdPrefix", "EM", "Activate chains that are seed from threshold that have this prefix in the name"};
+  Gaudi::Property<std::string> m_inputFilename{
+    this, "InputFilename", "RoIEmulation.dat", "FakeROI input filename"};
+
+  Gaudi::Property<std::string> m_thresholdPrefix{
+    this, "ThresholdPrefix", "EM",
+    "Activate chains that are seed from threshold that have this prefix in the name"};
   ///@}
 
   // emulation

Trigger/TrigSteer/L1Decoder/src/RoIsUnpackingToolBase.h

@@ -49,10 +49,11 @@ protected:
   SG::WriteHandleKey<TrigCompositeUtils::DecisionContainer> m_decisionsKey{
     this, "Decisions", "RoIDecisions", "Decisions for each RoI"};
 
-  SG::ReadHandleKey<TrigConf::HLTMenu> m_HLTMenuKey{this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu",
-      "HLT Menu"};
+  SG::ReadHandleKey<TrigConf::HLTMenu> m_HLTMenuKey{
+    this, "HLTTriggerMenu", "DetectorStore+HLTTriggerMenu", "HLT Menu"};
 
-  ToolHandle<GenericMonitoringTool> m_monTool{this, "MonTool", "", "Monitoring tool"};
+  ToolHandle<GenericMonitoringTool> m_monTool{
+    this, "MonTool", "", "Monitoring tool"};
   ///@}
 
   std::map<HLT::Identifier, HLT::IDVec> m_thresholdToChainMapping;

Trigger/TrigSteer/L1Decoder/src/TAURoIsUnpackingTool.h

@@ -41,12 +41,15 @@ private:
 
   ///@{ @name Properties
   SG::WriteHandleKey<TrigRoiDescriptorCollection> m_trigRoIsKey{
-    this, "OutputTrigRoIs", "HLT_TAURoIs", "Name of the RoIs object produced by the unpacker"};
+    this, "OutputTrigRoIs", "HLT_TAURoIs",
+    "Name of the RoIs object produced by the unpacker"};
 
   SG::WriteHandleKey< DataVector<LVL1::RecEmTauRoI> > m_recRoIsKey{
-    this, "OutputRecRoIs", "HLT_RecTAURoIs", "Name of the RoIs object produced by the unpacker"};
+    this, "OutputRecRoIs", "HLT_RecTAURoIs",
+    "Name of the RoIs object produced by the unpacker"};
 
-  Gaudi::Property<float>            m_roIWidth{this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
+  Gaudi::Property<float> m_roIWidth{
+    this, "RoIWidth", 0.1, "Size of RoI in eta/ phi"};
   ///@}
   
   ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;