Skip to content
Snippets Groups Projects
Commit 344b732f authored by Pierre Antoine Delsart's avatar Pierre Antoine Delsart Committed by Nils Krumnack
Browse files

Jet reco and config in analysis base

parent 51b75b25
No related branches found
No related tags found
No related merge requests found
Showing
with 13 additions and 48 deletions
......@@ -29,12 +29,6 @@ namespace EL
// public interface
//
/// \brief test the invariant of this object
/// \par Guarantee
/// no-fail
public:
void testInvariant () const;
/// \brief standard constructor
/// \par Guarantee
......
......@@ -29,12 +29,6 @@ namespace EL
// public interface
//
/// \brief test the invariant of this object
/// \par Guarantee
/// no-fail
public:
void testInvariant () const;
/// \brief standard constructor
/// \par Guarantee
......
......@@ -34,13 +34,14 @@ else()
atlas_add_library( AnaAlgorithmLib
AnaAlgorithm/Global.h Root/Global.cxx
AnaAlgorithm/AnaAlgorithm.h AnaAlgorithm/AnaAlgorithm.icc
Root/AnaAlgorithm.cxx
AnaAlgorithm/AnaReentrantAlgorithm.h
Root/AnaAlgorithm.cxx Root/AnaReentrantAlgorithm.cxx
AnaAlgorithm/MessageCheck.h Root/MessageCheck.cxx
Root/FilterReporterParams.cxx Root/FilterReporter.cxx
PUBLIC_HEADERS AnaAlgorithm
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES GaudiKernel AthenaBaseComps AsgTools StoreGateLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} RootCoreUtils )
LINK_LIBRARIES AsgMessagingLib GaudiKernel AthenaBaseComps AsgTools StoreGateLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
endif()
# Dictionary for the package's types:
......
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/// @author Nils Krumnack
......@@ -12,8 +12,7 @@
#include <AnaAlgorithm/AnaAlgorithm.h>
#include <AsgTools/MessageCheck.h>
#include <RootCoreUtils/Assert.h>
#include <AsgMessaging/MessageCheck.h>
#include <TH1.h>
#include <TH2.h>
#include <TH3.h>
......
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/// @author Nils Krumnack
......@@ -16,7 +16,6 @@
#include <AnaAlgorithm/AlgorithmWorkerData.h>
#include <AnaAlgorithm/MessageCheck.h>
#include <AsgTools/AsgTool.h>
#include <RootCoreUtils/Assert.h>
//
// method implementations
......@@ -24,18 +23,12 @@
namespace EL
{
void AnaAlgorithmConfig ::
testInvariant () const
{
RCU_INVARIANT (this != nullptr);
}
AnaAlgorithmConfig ::
AnaAlgorithmConfig ()
{
RCU_NEW_INVARIANT (this);
}
......@@ -44,7 +37,6 @@ namespace EL
AnaAlgorithmConfig (const std::string& val_typeAndName)
: AsgComponentConfig (val_typeAndName)
{
RCU_NEW_INVARIANT (this);
}
......@@ -61,7 +53,6 @@ namespace EL
bool AnaAlgorithmConfig ::
useXAODs () const noexcept
{
RCU_READ_INVARIANT (this);
return m_useXAODs;
}
......@@ -70,7 +61,6 @@ namespace EL
void AnaAlgorithmConfig ::
setUseXAODs (bool val_useXAODs) noexcept
{
RCU_CHANGE_INVARIANT (this);
m_useXAODs = val_useXAODs;
}
......@@ -79,7 +69,6 @@ namespace EL
bool AnaAlgorithmConfig ::
isPublicTool () const noexcept
{
RCU_READ_INVARIANT (this);
return m_isPublicTool;
}
......@@ -88,7 +77,6 @@ namespace EL
void AnaAlgorithmConfig ::
setIsPublicTool (bool val_isPublicTool) noexcept
{
RCU_CHANGE_INVARIANT (this);
m_isPublicTool = val_isPublicTool;
}
......@@ -98,7 +86,6 @@ namespace EL
makeAlgorithm (std::unique_ptr<AnaAlgorithm>& algorithm,
const AlgorithmWorkerData& workerData) const
{
RCU_READ_INVARIANT (this);
using namespace msgAlgorithmConfig;
if (m_isPublicTool == false)
......
......@@ -5,15 +5,13 @@
/// @author Nils Krumnack
//
// includes
//
#include <AnaAlgorithm/AnaAlgorithmWrapper.h>
#include <AnaAlgorithm/MessageCheck.h>
#include <RootCoreUtils/Assert.h>
#include "RootCoreUtils/Assert.h"
//
// method implementations
......
......@@ -13,7 +13,6 @@
#include <AnaAlgorithm/AnaReentrantAlgorithm.h>
#include <AsgMessaging/MessageCheck.h>
#include <RootCoreUtils/Assert.h>
#include <stdexcept>
#ifdef XAOD_STANDALONE
......
......@@ -16,7 +16,6 @@
#include <AnaAlgorithm/AlgorithmWorkerData.h>
#include <AnaAlgorithm/MessageCheck.h>
#include <AsgTools/AsgTool.h>
#include <RootCoreUtils/Assert.h>
//
// method implementations
......@@ -24,17 +23,12 @@
namespace EL
{
void AnaReentrantAlgorithmConfig ::
testInvariant () const
{
}
AnaReentrantAlgorithmConfig ::
AnaReentrantAlgorithmConfig ()
{
RCU_NEW_INVARIANT (this);
}
......@@ -43,7 +37,6 @@ namespace EL
AnaReentrantAlgorithmConfig (const std::string& val_typeAndName)
: AsgComponentConfig (val_typeAndName)
{
RCU_NEW_INVARIANT (this);
}
......@@ -61,7 +54,6 @@ namespace EL
makeAlgorithm (std::unique_ptr<AnaReentrantAlgorithm>& algorithm,
const AlgorithmWorkerData& workerData) const
{
RCU_READ_INVARIANT (this);
using namespace msgAlgorithmConfig;
ANA_CHECK (makeComponentExpert (algorithm, "new %1% (\"%2%\", nullptr)", true, ""));
......
......@@ -14,7 +14,9 @@
#include <AnaAlgorithm/MessageCheck.h>
#include <AsgTools/CurrentContext.h>
#include <RootCoreUtils/Assert.h>
#include "RootCoreUtils/Assert.h"
//
// method implementations
......
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/// @author Nils Krumnack
......@@ -12,7 +12,6 @@
#include <AnaAlgorithm/MessageCheck.h>
#include <RootCoreUtils/Assert.h>
//
// method implementations
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment