diff --git a/Trigger/TrigT1/TrigT1NSW/TrigT1NSW/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigT1/TrigT1NSW/ATLAS_CHECK_THREAD_SAFETY
similarity index 100%
rename from Trigger/TrigT1/TrigT1NSW/TrigT1NSW/ATLAS_CHECK_THREAD_SAFETY
rename to Trigger/TrigT1/TrigT1NSW/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt b/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt
index f0581d9cdca62086df6a818778127a2d5834ab6b..2d1d94bc0e636f205f1137cf781053b9bc1e7c0b 100644
--- a/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT1NSW )
@@ -11,7 +11,7 @@ atlas_add_component( TrigT1NSW
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib CxxUtils EventInfo GaudiKernel MuonRDO TrigInterfacesLib TrigT1NSWSimToolsLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib CxxUtils EventInfo GaudiKernel MuonRDO TrigT1NSWSimToolsLib )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigT1/TrigT1NSW/python/TrigT1NSWConfig.py b/Trigger/TrigT1/TrigT1NSW/python/TrigT1NSWConfig.py
old mode 100755
new mode 100644
index a6abc329ce02101b5828023681f48746c4945fb7..b116a18606f4971f7f98255cffbcf2030ac02e80
--- a/Trigger/TrigT1/TrigT1NSW/python/TrigT1NSWConfig.py
+++ b/Trigger/TrigT1/TrigT1NSW/python/TrigT1NSWConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from TrigT1NSW.TrigT1NSWConf import NSWL1__NSWL1Simulation
@@ -22,11 +22,6 @@ class NSWL1Simulation(DefaultNSWL1Simulation):
def __init__(self, name = "NSWL1Simulation"):
super( NSWL1Simulation, self ).__init__( name )
- # add validation histograms
- from TrigT1NSW.TrigT1NSWMonitoring import TrigT1NSWValidationMonitoring
- self.AthenaMonTools += [ TrigT1NSWValidationMonitoring() ]
-
-
def setDefaults(self, handle):
#DefaultNSWL1Simulation.setDefault(handle)
pass
diff --git a/Trigger/TrigT1/TrigT1NSW/python/TrigT1NSWMonitoring.py b/Trigger/TrigT1/TrigT1NSW/python/TrigT1NSWMonitoring.py
deleted file mode 100644
index 0057851d68fa9eae770bb1cd3b9b30a996c8aadd..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1NSW/python/TrigT1NSWMonitoring.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
-
-class TrigT1NSWValidationMonitoring(TrigGenericMonitoringToolConfig):
- def __init__ (self, name="NSWL1Validation"):
- super(TrigT1NSWValidationMonitoring, self).__init__(name)
-
- """ define monitoring histograms for NSW L1 validation(RTT) """
-
- self.defineTarget("Validation")
-
- self.Histograms += [ defineHistogram('COUNTERS', type='TH1F', title='Counters; ; events', xbins=1, xmin=0.5, xmax=1.5,
- labels='input_events') ]
diff --git a/Trigger/TrigT1/TrigT1NSW/share/NSWL1.py b/Trigger/TrigT1/TrigT1NSW/share/NSWL1.py
old mode 100755
new mode 100644
diff --git a/Trigger/TrigT1/TrigT1NSW/share/TrigT1NSW_jobOptions.py b/Trigger/TrigT1/TrigT1NSW/share/TrigT1NSW_jobOptions.py
old mode 100755
new mode 100644
diff --git a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.cxx b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.cxx
index e483a36398009de9d4630d90f2e7e345f79b1638..5db7bcfa5cdff3a3757e6638963a2c52057bea97 100644
--- a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.cxx
+++ b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.cxx
@@ -1,10 +1,9 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Athena/Gaudi includes
#include "GaudiKernel/ITHistSvc.h"
-#include "AthenaMonitoring/IMonitorToolBase.h"
//Event info includes
#include "EventInfo/EventInfo.h"
@@ -35,8 +34,6 @@ namespace NSWL1 {
m_current_evt(-1)
{
- m_counters.clear();
-
// Property setting general behaviour:
declareProperty( "DoOffline", m_doOffline = false, "Steers the offline emulation of the LVL1 logic" );
declareProperty( "UseLookup", m_useLookup = false, "Toggle Lookup mode on and off default is the otf(old) mode" );
@@ -57,13 +54,6 @@ namespace NSWL1 {
declareProperty( "MMStripTdsTool", m_mmstrip_tds, "Tool that simulates the functionalities of the MM STRIP TDS");
declareProperty( "MMTriggerTool", m_mmtrigger, "Tool that simulates the MM Trigger");
declareProperty("NSWTrigRDOContainerName", m_trigRdoContainer = "NSWTRGRDO"," Give a name to NSW trigger rdo container");
-
- // declare monitoring variables
- declareMonitoredStdContainer("COUNTERS", m_counters); // custom monitoring: number of processed events
- }
-
- NSWL1Simulation::~NSWL1Simulation() {
-
}
@@ -125,15 +115,13 @@ namespace NSWL1 {
StatusCode NSWL1Simulation::execute() {
- m_counters.clear();
const DataHandle<EventInfo> pevt;
ATH_CHECK( evtStore()->retrieve(pevt) );
m_current_run = pevt->event_ID()->run_number();
m_current_evt = pevt->event_ID()->event_number();
- m_counters.push_back(1.);
- std::vector<std::shared_ptr<PadData>> pads;
+ std::vector<std::shared_ptr<PadData>> pads;
std::vector<std::unique_ptr<PadTrigger>> padTriggers;
std::vector<std::unique_ptr<StripData>> strips;
std::vector< std::unique_ptr<StripClusterData> > clusters;
diff --git a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h
index dad8506f69e581891f7c47a8d61eff0c75226406..a5ddeb28f75076b8380c1f4b123ee07aa4078756 100644
--- a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h
+++ b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1NSW_NSWL1SIMULATION_H
@@ -7,16 +7,11 @@
// Basic includes
#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaMonitoring/IMonitorToolBase.h"
#include "CxxUtils/checker_macros.h"
-#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "Gaudi/Property.h"
-// monitoring from HLT
-#include "TrigInterfaces/IMonitoredAlgo.h"
-
-
-
// NSWL1SimTools includes
#include "TrigT1NSWSimTools/IPadTdsTool.h"
#include "TrigT1NSWSimTools/IStripTdsTool.h"
@@ -28,7 +23,6 @@
#include "TrigT1NSWSimTools/IPadTriggerLookupTool.h"
// Forward includes
-class IMonitorToolBase;
class TTree;
@@ -53,17 +47,16 @@ namespace NSWL1 {
*/
class ATLAS_NOT_THREAD_SAFE // use of TTree in execute
- NSWL1Simulation: public AthAlgorithm, public IMonitoredAlgo {
+ NSWL1Simulation: public AthAlgorithm {
public:
NSWL1Simulation( const std::string& name, ISvcLocator* pSvcLocator );
- ~NSWL1Simulation();
- virtual StatusCode initialize();
- virtual StatusCode start();
- virtual StatusCode execute();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode start() override;
+ virtual StatusCode execute() override;
+ virtual StatusCode finalize() override;
//! handle to result builder (for easy data access), now returning a dummy int
int resultBuilder() const;
@@ -89,10 +82,6 @@ namespace NSWL1 {
unsigned int m_current_evt; //!< current event number
- // put monitoring variables here
- std::vector<int> m_counters; //!< counters, see @link NSWL1Simulation::NSWL1Simulation @endlink
-
-
// properties: steering flags
bool m_doOffline; //!< property, see @link NSWL1Simulation::NSWL1Simulation @endlink
bool m_useLookup;