main-coverity-JetToolHelpers

main-coverity-JetToolHelpers

Reconstruction/Jet/JetToolHelpers/JetToolHelpers/InputVariable.h

@@ -5,16 +5,17 @@
 #ifndef JETTOOLHELPERS_INPUTVARIABLE_H
 #define JETTOOLHELPERS_INPUTVARIABLE_H
 
-#include <cmath>
-#include <memory>
-#include <functional>
+
+#include "JetToolHelpers/JetContext.h" //used here
+#include "xAODJet/Jet.h" //used here
+#include "AthContainers/AuxElement.h" //member variable
+#include "JetAnalysisInterfaces/IInputVariable.h"//inheritance
+
+#include <memory> //std::unique_ptr
+#include <functional> //std::function
 #include <string>
-#include <optional>
+#include <stdexcept> //std::runtime_error
 
-#include "JetToolHelpers/JetContext.h"
-#include "xAODJet/Jet.h"
-#include "AthContainers/AuxElement.h"
-#include "JetAnalysisInterfaces/IInputVariable.h"
 
 namespace JetHelper {
 

Reconstruction/Jet/JetToolHelpers/JetToolHelpers/VarTool.h

@@ -5,19 +5,18 @@
 #ifndef JETTOOLHELPERS_VARTOOL_H
 #define JETTOOLHELPERS_VARTOOL_H
 
-#include <cmath>
-#include <memory>
-#include <functional>
-#include <string>
+
 
 #include "JetToolHelpers/JetContext.h"
 #include "JetToolHelpers/InputVariable.h"
 #include "xAODJet/Jet.h"
-#include "AthContainers/AuxElement.h"
-#include "AsgTools/AsgTool.h"
-#include "JetAnalysisInterfaces/IVarTool.h"
+#include "AsgTools/AsgTool.h" //inheritance
+#include "JetAnalysisInterfaces/IVarTool.h" //inheritance
 #include "AsgTools/PropertyWrapper.h"
 
+#include <memory> //unique_ptr
+#include <string>
+
 namespace JetHelper {
 
     /// Class VarTool

Reconstruction/Jet/JetToolHelpers/Root/InputVariable.cpp

@@ -7,15 +7,16 @@
  *
  */
 
-#include <iostream>
 #include "JetToolHelpers/InputVariable.h"
+#include <cmath> //std::abs
+#include <iostream> //std::cerr
 
 namespace JetHelper{
 
 InputVariable::InputVariable(const std::string& name, std::function<float(const xAOD::Jet& jet, const JetContext& jc)> func):
 InputVariable(name)
 {
-    m_customFunction = func;
+    m_customFunction = std::move(func);
 }
 
 std::unique_ptr<InputVariable> InputVariable::createVariable(const std::string& name, const std::string& type, const bool isJetVar) {

Reconstruction/Jet/JetToolHelpers/Root/VarTool.cpp

@@ -2,30 +2,24 @@
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
 
 #include "JetToolHelpers/VarTool.h"
 
 namespace JetHelper {
-VarTool::VarTool(const std::string& name)
-     : asg::AsgTool(name)
-{
-}
-
-StatusCode VarTool::initialize()
-{
-
-  m_v = InputVariable::createVariable(m_name,m_type,m_isJetVar);
-  m_v->setScale(m_scale);
-
-  if (! bool(m_v) ) {
-	ATH_MSG_ERROR(" could not create Jet Variable "<< m_name << " type: "<< m_type );
-	return StatusCode::FAILURE; 
+  VarTool::VarTool(const std::string& name)
+       : asg::AsgTool(name)
+  {
+  }
+  
+  StatusCode VarTool::initialize()
+  {
+    m_v = InputVariable::createVariable(m_name,m_type,m_isJetVar);
+    if (not m_v ) {
+      ATH_MSG_ERROR(" could not create Jet Variable "<< m_name << " type: "<< m_type );
+      return StatusCode::FAILURE; 
+    }
+    m_v->setScale(m_scale);
+    return StatusCode::SUCCESS;
   }
-
-  return StatusCode::SUCCESS;
-}
 } //namespace JetHelper