Merge branch 'ringer_msgstream' into 'master'

TrigL2CaloRinger: Use AsgMessaging as base class

See merge request atlas/athena!21499

Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaL2CaloRingerSelectorTool.cxx

@@ -35,7 +35,6 @@ TrigEgammaL2CaloRingerSelectorTool( const std::string& myname )
   declareProperty("CalibPathThresholds", m_calibPath_thresholds=""            );
 
   m_output    = 0;
-  m_reader.setMsgStream(msg());
   m_useLumiVar=false;
   m_useEtaVar=false;
 

Trigger/TrigHypothesis/TrigMultiVarHypo/CMakeLists.txt

@@ -9,6 +9,7 @@ atlas_subdir( TrigMultiVarHypo )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
+                          Control/AthToolSupport/AsgTools
                           Event/xAOD/xAODTrigCalo
                           Event/xAOD/xAODTrigRinger
                           Trigger/TrigEvent/TrigCaloEvent
@@ -28,17 +29,17 @@ atlas_add_library( TrigMultiVarHypoLib
                    src/tools/*.cxx
                    src/preproc/*.cxx
                    PUBLIC_HEADERS TrigMultiVarHypo
-                   LINK_LIBRARIES xAODTrigCalo xAODTrigRinger TrigCaloEvent
-		   TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib
-		   LumiBlockCompsLib PathResolver DecisionHandlingLib
+                   LINK_LIBRARIES AsgTools xAODTrigCalo xAODTrigRinger TrigCaloEvent
+                   TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib
+                   LumiBlockCompsLib PathResolver DecisionHandlingLib
                    PRIVATE_LINK_LIBRARIES GaudiKernel AthViews )
 
 atlas_add_component( TrigMultiVarHypo
                      src/components/*.cxx
-                     LINK_LIBRARIES xAODTrigCalo xAODTrigRinger TrigCaloEvent
-		     TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib
-		     GaudiKernel TrigMultiVarHypoLib PathResolver
-		     LumiBlockCompsLib DecisionHandlingLib)
+                     LINK_LIBRARIES AsgTools xAODTrigCalo xAODTrigRinger TrigCaloEvent
+                     TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib
+                     GaudiKernel TrigMultiVarHypoLib PathResolver
+                     LumiBlockCompsLib DecisionHandlingLib)
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/TrigL2CaloRingerReader.h

@@ -7,18 +7,19 @@
 //#include "TrigMultiVarHypo/preproc/TrigRingerPreprocessor.h"
 #include "TrigMultiVarHypo/tools/TrigRingerHelper.h"
 #include "TrigMultiVarHypo/tools/MultiLayerPerceptron.h"
+
+#include "AsgTools/AsgMessaging.h"
 #include "PathResolver/PathResolver.h"
-#include "GaudiKernel/MsgStream.h"
 #include <vector>
 #include <string>
 #include "TTree.h"
 #include "TFile.h"
 
-class TrigL2CaloRingerReader{
+class TrigL2CaloRingerReader : public asg::AsgMessaging {
 
   public:
     /* constructor */
-    TrigL2CaloRingerReader( std::string );
+    TrigL2CaloRingerReader(const std::string& name);
     /* destructor */
     ~TrigL2CaloRingerReader();
     /* use this methods to retrieve the tools from the archieve */
@@ -36,27 +37,16 @@ class TrigL2CaloRingerReader{
     bool  doPileupCorrection(){return m_doPileupCorrection;};
     /* return the threshold lumi */
     int lumiCut(){return m_lumiCut;};
-    /* use this to set the messenger stream output */
-    void setMsgStream( MsgStream &msg ){
-       m_log = new MsgStream(msg);
-    }
-
 
   private:
     // Use this to retrieve all branch values
     template <class T>
     void InitBranch(TTree* fChain, std::string branch_name, T* param);
-    // msg output 
-    MsgStream& msg() const{
-       return (*m_log);
-    }
-    
+
     std::string m_name;
     
     int m_version;
     
-    MsgStream *m_log;
-
     // archieve variables holder
     int  m_lumiCut;
     bool m_useEtaVar;

Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerFex.cxx

@@ -38,7 +38,6 @@ TrigL2CaloRingerFex::TrigL2CaloRingerFex(const std::string& name, ISvcLocator* p
   declareProperty("LuminosityTool"    , m_lumiBlockMuTool, "Luminosity Tool"  );
   declareMonitoredVariable("NeuralNetworkOutput", m_output                    );
   
-  m_reader.setMsgStream(msg());
   m_useLumiVar=false;
   m_useEtaVar=false;
   m_key       = "";

Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypo.cxx

@@ -25,7 +25,6 @@ TrigL2CaloRingerHypo::TrigL2CaloRingerHypo(const std::string& name, ISvcLocator*
   declareProperty("CalibPath"         , m_calibPath = ""                      );
   declareProperty("HltFeature"        , m_hlt_feature = "TrigRingerNeuralFex" );  
   
-  m_reader.setMsgStream(msg());
   m_useNoActivationFunctionInTheLastLayer=false;
   m_doPileupCorrection=false;
   m_lumiCut=50;

Trigger/TrigHypothesis/TrigMultiVarHypo/src/tools/TrigL2CaloRingerReader.cxx

@@ -10,9 +10,10 @@
 // Use this to find the absoluty path
 #include "PathResolver/PathResolver.h"
 
-TrigL2CaloRingerReader::TrigL2CaloRingerReader(std::string  name):m_name(name)
+TrigL2CaloRingerReader::TrigL2CaloRingerReader(const std::string& name) :
+  asg::AsgMessaging(name),
+  m_name(name)
 {
-  //m_log = new MsgStream(0, m_name);
   m_etaBins=nullptr;
   m_etBins=nullptr;
   m_thresholds=nullptr;