From caaed822db853777f03700f3d6910f636e51b1fe Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 27 Apr 2022 19:04:32 +0200 Subject: [PATCH 1/4] TileRawUtils: enable thread-checker and const fix --- .../TileRawUtils/TileRawUtils/ATLAS_CHECK_THREAD_SAFETY | 1 + TileCalorimeter/TileRawUtils/src/TileRoI_Map.cxx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 TileCalorimeter/TileRawUtils/TileRawUtils/ATLAS_CHECK_THREAD_SAFETY diff --git a/TileCalorimeter/TileRawUtils/TileRawUtils/ATLAS_CHECK_THREAD_SAFETY b/TileCalorimeter/TileRawUtils/TileRawUtils/ATLAS_CHECK_THREAD_SAFETY new file mode 100644 index 00000000000..05032a3fef4 --- /dev/null +++ b/TileCalorimeter/TileRawUtils/TileRawUtils/ATLAS_CHECK_THREAD_SAFETY @@ -0,0 +1 @@ +TileCalorimeter/TileRawUtils diff --git a/TileCalorimeter/TileRawUtils/src/TileRoI_Map.cxx b/TileCalorimeter/TileRawUtils/src/TileRoI_Map.cxx index 675be94dacc..96e8da31ff5 100755 --- a/TileCalorimeter/TileRawUtils/src/TileRoI_Map.cxx +++ b/TileCalorimeter/TileRawUtils/src/TileRoI_Map.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ #include "TileRawUtils/TileRoI_Map.h" @@ -167,7 +167,7 @@ const TileRoI_Map::COLL_ID_VEC& TileRoI_Map::CollectionID return (*it).second; } std::cout <<" TileRoI_Map::CollectionID: can not find RoI" << std::endl; - static COLL_ID_VEC v ; + static const COLL_ID_VEC v ; return v; } -- GitLab From 77b37ac4c6c288b4728e882da3d65c30c4805015 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 27 Apr 2022 19:07:25 +0200 Subject: [PATCH 2/4] TileMuId: enable thread-checker --- TileCalorimeter/TileMuId/TileMuId/ATLAS_CHECK_THREAD_SAFETY | 1 + 1 file changed, 1 insertion(+) create mode 100644 TileCalorimeter/TileMuId/TileMuId/ATLAS_CHECK_THREAD_SAFETY diff --git a/TileCalorimeter/TileMuId/TileMuId/ATLAS_CHECK_THREAD_SAFETY b/TileCalorimeter/TileMuId/TileMuId/ATLAS_CHECK_THREAD_SAFETY new file mode 100644 index 00000000000..489be5aaf7d --- /dev/null +++ b/TileCalorimeter/TileMuId/TileMuId/ATLAS_CHECK_THREAD_SAFETY @@ -0,0 +1 @@ +TileCalorimeter/TileMuId -- GitLab From c52645bc574445791a6ab4b53bf71a4292e8dfbc Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 27 Apr 2022 19:10:54 +0200 Subject: [PATCH 3/4] TileRec: delete unused TileEventFilter --- .../TileRec/TileRec/TileEventFilter.h | 37 --------- .../share/jobOptions_TileEventFilter.py | 22 ------ .../TileRec/src/TileEventFilter.cxx | 75 ------------------- .../src/components/TileRec_entries.cxx | 2 - 4 files changed, 136 deletions(-) delete mode 100755 TileCalorimeter/TileRec/TileRec/TileEventFilter.h delete mode 100644 TileCalorimeter/TileRec/share/jobOptions_TileEventFilter.py delete mode 100755 TileCalorimeter/TileRec/src/TileEventFilter.cxx diff --git a/TileCalorimeter/TileRec/TileRec/TileEventFilter.h b/TileCalorimeter/TileRec/TileRec/TileEventFilter.h deleted file mode 100755 index 39ca752d029..00000000000 --- a/TileCalorimeter/TileRec/TileRec/TileEventFilter.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef TILEREC_TILETRIGGERTYPEFILTER -#define TILEREC_TILETRIGGERTYPEFILTER -/** - * @file TileEventFilter.h - * @brief class definition for TileEventFilter - */ - -/** - * @class TileEventFilter - * @brief Simple Filter algorithm which filter events using Trigger Type - */ - -#include "AthenaBaseComps/AthFilterAlgorithm.h" - -#include - -class string; -class ISvcLocator; - -class TileEventFilter : public AthFilterAlgorithm { - public: - TileEventFilter(const std::string& name, ISvcLocator* pSvcLocator); - virtual ~TileEventFilter(); - - virtual StatusCode initialize(); - virtual StatusCode execute(); - virtual StatusCode finalize(); - private: - int m_nProcessedEvents; - int m_nAcceptedEvents; - std::vector m_triggerTypes; -}; -#endif diff --git a/TileCalorimeter/TileRec/share/jobOptions_TileEventFilter.py b/TileCalorimeter/TileRec/share/jobOptions_TileEventFilter.py deleted file mode 100644 index 443c2a5e637..00000000000 --- a/TileCalorimeter/TileRec/share/jobOptions_TileEventFilter.py +++ /dev/null @@ -1,22 +0,0 @@ -from AthenaCommon import CfgMgr - -## This Athena job consists of algorithms that loop over events; -## here, the (default) top sequence is used: -from AthenaCommon.AlgSequence import AlgSequence, AthSequencer -topSequence = AlgSequence() - -seq = AthSequencer("AthMasterSeq") -seq += CfgMgr.xAODMaker__EventInfoCnvAlg() - -if not 'TriggerTypes' in dir(): - TriggerTypes = [] - -## AthMasterSeq is always executed before the top sequence, and is configured such that -## any follow-up sequence (eg. top sequence) is not executed in case TileRecFilter does -## not pass the event -## In short, the sequence AthMasterSeq makes sure that all algs in the job sequence -## are skipped when an event gets rejects -seq += CfgMgr.TileEventFilter(name = 'TileEventFilter' - , TriggerTypes = TriggerTypes) - - diff --git a/TileCalorimeter/TileRec/src/TileEventFilter.cxx b/TileCalorimeter/TileRec/src/TileEventFilter.cxx deleted file mode 100755 index c487bef51e3..00000000000 --- a/TileCalorimeter/TileRec/src/TileEventFilter.cxx +++ /dev/null @@ -1,75 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file TileEventFilter.cxx - * @brief Implementation of class TileEventFilter - */ - -#include -#include "TileRec/TileEventFilter.h" - -#include "xAODEventInfo/EventInfo.h" - -TileEventFilter::TileEventFilter(const std::string& name, ISvcLocator* pSvcLocator) - : AthFilterAlgorithm(name, pSvcLocator) - , m_nProcessedEvents(0) - , m_nAcceptedEvents(0) -{ - declareProperty("TriggerTypes", m_triggerTypes); -} - -TileEventFilter::~TileEventFilter() {} - -StatusCode TileEventFilter::initialize() { - - if (m_triggerTypes.empty()) { - ATH_MSG_INFO("No trigger type specified, all received trigger types will be processed"); - } else { - msg(MSG::INFO) << "Only events of the following trigger type(s) will be processed: "; - for (auto trigger: m_triggerTypes) { - msg(MSG::INFO) << trigger << " (0x" << std::hex << trigger << ") " << std::dec; - - } - msg(MSG::INFO) << endmsg; - } - - return StatusCode::SUCCESS; -} - -StatusCode TileEventFilter::execute() { - - ++m_nProcessedEvents; - - uint32_t lvl1info(0); - // uint32_t eventNumber(0); - // uint32_t lumiBlock(0); - // uint32_t eventBCID(0); - - const DataHandle eventInfo; - if (evtStore()->retrieve(eventInfo).isSuccess()) { - lvl1info = eventInfo->level1TriggerType(); - // eventNumber = eventInfo->eventNumber(); - // lumiBlock = eventInfo->lumiBlock(); - // eventBCID = eventInfo->bcid(); - } - - if (m_triggerTypes.empty() - || std::find( m_triggerTypes.begin(), m_triggerTypes.end(), lvl1info) != m_triggerTypes.end()) { - - setFilterPassed(true); - ++m_nAcceptedEvents; - } else { - setFilterPassed(false); - } - - return StatusCode::SUCCESS; -} - -StatusCode TileEventFilter::finalize() { - - ATH_MSG_INFO ("Processed " << m_nProcessedEvents << " events, accepted " << m_nAcceptedEvents << " events."); - - return StatusCode::SUCCESS; -} diff --git a/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx b/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx index 9f5e71b9a32..8aa7be2b7f4 100644 --- a/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx +++ b/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx @@ -7,7 +7,6 @@ #include "TileRec/TileHitVecToNtuple.h" #include "TileRec/TileDigitsToNtuple.h" #include "TileRec/TileTTL1ToNtuple.h" -#include "TileRec/TileEventFilter.h" #include "TileRec/TileMuonReceiverDecisionToNtuple.h" DECLARE_COMPONENT( TileAANtuple ) @@ -19,6 +18,5 @@ DECLARE_COMPONENT( TileTBHitToNtuple ) DECLARE_COMPONENT( TileHitVecToNtuple ) DECLARE_COMPONENT( TileDigitsToNtuple ) DECLARE_COMPONENT( TileTTL1ToNtuple ) -DECLARE_COMPONENT( TileEventFilter ) DECLARE_COMPONENT( TileMuonReceiverDecisionToNtuple ) -- GitLab From c5eceddc75e53607456e1a9ff5707942604a7af8 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Wed, 27 Apr 2022 19:13:10 +0200 Subject: [PATCH 4/4] TileRec: enable thread-checker and const fix --- TileCalorimeter/TileRec/TileRec/ATLAS_CHECK_THREAD_SAFETY | 1 + TileCalorimeter/TileRec/src/TileAANtuple.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 TileCalorimeter/TileRec/TileRec/ATLAS_CHECK_THREAD_SAFETY diff --git a/TileCalorimeter/TileRec/TileRec/ATLAS_CHECK_THREAD_SAFETY b/TileCalorimeter/TileRec/TileRec/ATLAS_CHECK_THREAD_SAFETY new file mode 100644 index 00000000000..fed6eb1fcd2 --- /dev/null +++ b/TileCalorimeter/TileRec/TileRec/ATLAS_CHECK_THREAD_SAFETY @@ -0,0 +1 @@ +TileCalorimeter/TileRec diff --git a/TileCalorimeter/TileRec/src/TileAANtuple.cxx b/TileCalorimeter/TileRec/src/TileAANtuple.cxx index aa5e6966aa5..c070c3f3451 100644 --- a/TileCalorimeter/TileRec/src/TileAANtuple.cxx +++ b/TileCalorimeter/TileRec/src/TileAANtuple.cxx @@ -439,7 +439,7 @@ StatusCode TileAANtuple::execute() { } */ //"Europe/Zurich","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" - static time_zone_ptr gva_tz(new posix_time_zone((std::string)"CET+01CEST01:00:00,M3.5.0/02:00:00,M10.5.0/03:00:00")); + static const time_zone_ptr gva_tz(new posix_time_zone((std::string)"CET+01CEST01:00:00,M3.5.0/02:00:00,M10.5.0/03:00:00")); local_date_time gva_time(from_time_t(m_evTime),gva_tz); //std::ostringstream otime; -- GitLab