diff --git a/Calorimeter/CaloTriggerTool/CaloTriggerTool/ATLAS_CHECK_THREAD_SAFETY b/Calorimeter/CaloTriggerTool/CaloTriggerTool/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..05f38f68266ce36e233727fdd707a88c4bac6092
--- /dev/null
+++ b/Calorimeter/CaloTriggerTool/CaloTriggerTool/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Calorimeter/CaloTriggerTool
diff --git a/Calorimeter/CaloTriggerTool/CaloTriggerTool/CaloTriggerTowerService.h b/Calorimeter/CaloTriggerTool/CaloTriggerTool/CaloTriggerTowerService.h
index 68da164d38b210e8d1bdb95be1a989048889a9a9..4bf4e23a10c2184a2540e92b122b7bbb562535e3 100644
--- a/Calorimeter/CaloTriggerTool/CaloTriggerTool/CaloTriggerTowerService.h
+++ b/Calorimeter/CaloTriggerTool/CaloTriggerTool/CaloTriggerTowerService.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOTRIGGERTOWERSERVICE_H
@@ -7,7 +7,6 @@
// Gaudi
#include "AthenaBaseComps/AthAlgTool.h"
-#include "StoreGate/DataHandle.h"
#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/IOVSvcDefs.h"
@@ -26,6 +25,7 @@
#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
#include "TrigT1CaloCalibConditions/L1CaloRxCoolChannelId.h"
+#include "CxxUtils/CachedPointer.h"
class Identifier;
@@ -34,7 +34,6 @@ class LArOnlineID;
class LArEM_ID;
class TTOnlineID;
class CaloLVL1_ID;
-class LArCablingLegacyService;
static const InterfaceID IID_CaloTriggerTowerService("CaloTriggerTowerService", 1 , 0);
@@ -145,26 +144,6 @@ class CaloTriggerTowerService : public AthAlgTool
//======================= Trigger Tower - cell/channel mapping methods ==================================
//
- /**
- Return a vector of LArOnlineID for a TTOnlineID (online-online TT-cell mapping)
-
- @param extTt used to decide wether the 'layer' info should be used or not <br>
- extTt = 0 : the full TT is returned <br>
- else : the 'extended'TT (only 1 layer) is returned.
-
- @warning the actual mapping is offline-offline, so this method is CPU expensive.
- @warning this method is valid only for LAr Id so far
- */
- std::vector<HWIdentifier> createChannelIDvec(const HWIdentifier & id, int extTt) const;
-
- /**
- return the TTOnlineID of the TT to which a LArOnlineID belongs (online-online TT-cell mapping)
-
- @warning the actual mapping is offline-offline, so this method is CPU expensive.
- @warning this method is valid only for LAr Id so far
- */
- HWIdentifier whichTTChannelID(const HWIdentifier & id) const;
-
/**
Return a vector of offline Identifiers (corresponding helpers =
LArEM_ID, LArHEC_ID, LArFCAL_ID) for a TT offline id (helper=CaloLVL1_ID)
@@ -187,11 +166,6 @@ class CaloTriggerTowerService : public AthAlgTool
*/
Identifier whichTTID(const Identifier & id) const;
- /**
- return true if the channel is in the lvl1 sums; <br>
- some channels mapped to TT are only in HLT (last HEC compartment and last cells of barrel PS)
- */
- bool is_in_lvl1(const HWIdentifier & id) const;
/**
return true if the cell is in the lvl1 sums; <br>
some channels mapped to TT are only in HLT (last HEC compartment and last cells of barrel PS)
@@ -200,9 +174,11 @@ class CaloTriggerTowerService : public AthAlgTool
private:
+ const LArTTCellMap* getTTCellMap() const;
+ const CaloTTOnOffIdMap* getCaloTTOnOffIdMap() const;
+ const CaloTTOnAttrIdMap* getCaloTTOnAttrIdMap() const;
+ const CaloTTPpmRxIdMap* getCaloTTPpmRxIdMap() const;
- /** pointer to the LArCablingSvc tool */
- LArCablingLegacyService * m_larcablingSvc;
/** pointer to the LAr Online Id helper */
const LArOnlineID * m_onlineHelper ;
/** pointer to the LArEM offline Id helper */
@@ -212,10 +188,10 @@ class CaloTriggerTowerService : public AthAlgTool
/** pointer to the Calo TT online Id helper */
const TTOnlineID * m_ttonlineHelper;
- const DataHandle<LArTTCellMap> m_TTCellMap;
- const DataHandle<CaloTTOnOffIdMap> m_caloTTOnOffIdMap;
- const DataHandle<CaloTTOnAttrIdMap> m_caloTTOnAttrIdMap;
- const DataHandle<CaloTTPpmRxIdMap> m_caloTTPpmRxIdMap;
+ CxxUtils::CachedPointer<const LArTTCellMap> m_TTCellMap;
+ CxxUtils::CachedPointer<const CaloTTOnOffIdMap> m_caloTTOnOffIdMap;
+ CxxUtils::CachedPointer<const CaloTTOnAttrIdMap> m_caloTTOnAttrIdMap;
+ CxxUtils::CachedPointer<const CaloTTPpmRxIdMap> m_caloTTPpmRxIdMap;
std::string m_TTCellMapKey;
std::string m_caloTTOnOffIdMapKey;
diff --git a/Calorimeter/CaloTriggerTool/doc/packagedoc.h b/Calorimeter/CaloTriggerTool/doc/packagedoc.h
index d1d0d747740b552c03465783e1b95f21501217a2..86afd8fb4c0925d0b6abda235683a0bdd15f5e5a 100644
--- a/Calorimeter/CaloTriggerTool/doc/packagedoc.h
+++ b/Calorimeter/CaloTriggerTool/doc/packagedoc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -67,26 +67,6 @@ NOTA BENE: the mapping is actually stored in terms of offline<->offline correspo
therefore the offline<->offline conversion is faster than the online<->online conversion below. <br>
Example:<br>
-<pre>
-//
-//... to which TT does this (cell's) channel belong
-//
-HWIdentifier channelId = ...;
-HWIdentifier ttOnl = m_cablingService->whichTTChannelID(channelId);
-</pre>
-
-Trigger Tower online to cell channel online correspondance, example:
-
-<pre>
-//
-//... fill a vector with online identifier of cells belonging to tower ttChannel (online id with layer info)
-//
-HWIdentifier ttChannel=...;
-std::vector < HWIdentifier > channelIdVec = m_cablingService->createChannelIDvec(ttChannel,0);
-</pre>
-
-
-
diff --git a/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx b/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
index 314ebce2c04fd9d5e2f5dac98b59e6244b5c1581..5ca29e644f9fd6044cd2f48583ca15874441ab56 100644
--- a/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
+++ b/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
@@ -14,7 +14,7 @@
#include "LArIdentifier/LArOnlID_Exception.h"
#include "CaloIdentifier/CaloIdManager.h"
#include "CaloIdentifier/CaloLVL1_ID.h"
-#include "LArCabling/LArCablingLegacyService.h"
+#include "CaloIdentifier/LArEM_ID.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -23,7 +23,6 @@ CaloTriggerTowerService::CaloTriggerTowerService( const std::string& type,
const std::string& name,
const IInterface* parent )
: AthAlgTool(type,name,parent),
- m_larcablingSvc(nullptr) ,
m_onlineHelper(nullptr) ,
m_emHelper(nullptr) ,
m_lvl1Helper(nullptr) ,
@@ -95,50 +94,6 @@ StatusCode CaloTriggerTowerService::initialize ()
msg() << MSG::DEBUG << "Successfully accessed LArOnlineID helper" << endmsg;
}
-
- status= detStore()->regFcn(&CaloTriggerTowerService::iovCallBack,this,
- m_TTCellMap,m_TTCellMapKey);
- if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to regFcn for "<<m_TTCellMapKey << endmsg;
- return StatusCode::FAILURE;
- }
-
-
- status= detStore()->regFcn(&CaloTriggerTowerService::iovCallBack,this,
- m_caloTTOnOffIdMap,m_caloTTOnOffIdMapKey);
- if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to regFcn for "<<m_caloTTOnOffIdMapKey << endmsg;
- return StatusCode::FAILURE;
- }
-
-
- status= detStore()->regFcn(&CaloTriggerTowerService::iovCallBack,this,
- m_caloTTOnAttrIdMap,m_caloTTOnAttrIdMapKey);
- if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to regFcn for "<< m_caloTTOnAttrIdMapKey << endmsg;
- return StatusCode::FAILURE;
- }
-
- status= detStore()->regFcn(&CaloTriggerTowerService::iovCallBack,this,
- m_caloTTPpmRxIdMap,m_caloTTPpmRxIdMapKey);
- if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to regFcn for "<< m_caloTTPpmRxIdMapKey << endmsg;
- return StatusCode::FAILURE;
- }
-
- IToolSvc* toolSvc;
- status = service( "ToolSvc",toolSvc );
- if(status.isSuccess()) {
- status = toolSvc->retrieveTool("LArCablingLegacyService",m_larcablingSvc);
- if(status.isFailure()) {
- msg() << MSG::ERROR << "Could not retrieve LArCablingLegacyService"<< endmsg;
- return(StatusCode::FAILURE);
- }
- } else {
- msg() << MSG::ERROR << "Could not get ToolSvc"<< endmsg;
- return(StatusCode::FAILURE);
- }
-
msg()<<MSG::INFO<<" ====> ...CaloTriggerTowerService::init() OK "<< endmsg;
return StatusCode::SUCCESS;
}
@@ -155,7 +110,7 @@ StatusCode CaloTriggerTowerService::finalize ()
//===========================================================
bool CaloTriggerTowerService::is_initialized () const
{
- return m_TTCellMap.isValid()&&m_caloTTOnOffIdMap.isValid()&&m_caloTTOnAttrIdMap.isValid();
+ return getTTCellMap() != nullptr && getCaloTTOnOffIdMap() != nullptr && getCaloTTOnAttrIdMap() != nullptr;
}
@@ -165,7 +120,8 @@ HWIdentifier CaloTriggerTowerService::createTTChannelID(const Identifier & id,
HWIdentifier invalidId (0);
- if(!m_caloTTOnOffIdMap ) {// no mapping object
+ const CaloTTOnOffIdMap* caloTTOnOffIdMap = getCaloTTOnOffIdMap();
+ if(!caloTTOnOffIdMap ) {// no mapping object
msg() << MSG::ERROR << " No CaloTTOnOffIdMap !" << endmsg;
msg() << MSG::ERROR << " Has the DB folder holding the CaloTTOnOffIdMap been added to IOVDbSvc ? " << endmsg;
msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
@@ -174,7 +130,7 @@ HWIdentifier CaloTriggerTowerService::createTTChannelID(const Identifier & id,
} else {
// have mapping object, forward the call
- HWIdentifier sid = m_caloTTOnOffIdMap->createSignalChannelID( id ) ;
+ HWIdentifier sid = caloTTOnOffIdMap->createSignalChannelID( id ) ;
if(bQuiet) {
return sid;
@@ -196,7 +152,8 @@ Identifier CaloTriggerTowerService::cnvToIdentifier(const HWIdentifier & id, bo
{
Identifier invalidId (0);
- if(!m_caloTTOnOffIdMap ) {
+ const CaloTTOnOffIdMap* caloTTOnOffIdMap = getCaloTTOnOffIdMap();
+ if(!caloTTOnOffIdMap ) {
msg() << MSG::ERROR << " No CaloTTOnOffIdMap !" << endmsg;
msg() << MSG::ERROR << " Has the DB folder holding the CaloTTOnOffIdMap been added to IOVDbSvc ? " << endmsg;
msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
@@ -204,13 +161,12 @@ Identifier CaloTriggerTowerService::cnvToIdentifier(const HWIdentifier & id, bo
} else {
// mapping object exist, forward the call
- Identifier offid = m_caloTTOnOffIdMap->cnvToIdentifier(id, bQuiet);
+ Identifier offid = caloTTOnOffIdMap->cnvToIdentifier(id, bQuiet);
if(bQuiet) {
return offid;
} else {
- static Identifier def = Identifier() ;
- if(offid==def) {
+ if(!offid.is_valid()) {
CaloID_Exception except;
except.code(6) ;
except.message(" Online ID not found in map ") ;
@@ -225,7 +181,8 @@ L1CaloCoolChannelId CaloTriggerTowerService::cnvRxIdToCoolChannelId(const L1Calo
L1CaloCoolChannelId invalidId;
- if(!m_caloTTPpmRxIdMap ) {
+ const CaloTTPpmRxIdMap* caloTTPpmRxIdMap = getCaloTTPpmRxIdMap();
+ if(!caloTTPpmRxIdMap ) {
msg() << MSG::ERROR << " No CaloTTPpmRxIdMap !" << endmsg;
msg() << MSG::ERROR << " Has the DB folder holding the CaloTTPpmRxIdMap been added to IOVDbSvc ? " << endmsg;
msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
@@ -233,7 +190,7 @@ L1CaloCoolChannelId CaloTriggerTowerService::cnvRxIdToCoolChannelId(const L1Calo
} else {
// mapping object exist, forward the call
- L1CaloCoolChannelId ppmId = m_caloTTPpmRxIdMap->rxToPpmId(rxCoolChannelId);
+ L1CaloCoolChannelId ppmId = caloTTPpmRxIdMap->rxToPpmId(rxCoolChannelId);
if(ppmId==L1CaloCoolChannelId()) {
CaloID_Exception except;
except.code(6) ;
@@ -246,7 +203,8 @@ L1CaloCoolChannelId CaloTriggerTowerService::cnvRxIdToCoolChannelId(const L1Calo
std::vector<L1CaloRxCoolChannelId> CaloTriggerTowerService::cnvCoolChannelIdToRxId(const L1CaloCoolChannelId& ppmCoolChannelId) const {
- if(!m_caloTTPpmRxIdMap ) {
+ const CaloTTPpmRxIdMap* caloTTPpmRxIdMap = getCaloTTPpmRxIdMap();
+ if(!caloTTPpmRxIdMap ) {
msg() << MSG::ERROR << " No CaloTTPpmRxIdMap !" << endmsg;
msg() << MSG::ERROR << " Has the DB folder holding the CaloTTPpmRxIdMap been added to IOVDbSvc ? " << endmsg;
msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
@@ -254,7 +212,7 @@ std::vector<L1CaloRxCoolChannelId> CaloTriggerTowerService::cnvCoolChannelIdToRx
} else {
// mapping object exist, forward the call
- std::vector<L1CaloRxCoolChannelId> rxChannels = m_caloTTPpmRxIdMap->ppmToRxId(ppmCoolChannelId);
+ std::vector<L1CaloRxCoolChannelId> rxChannels = caloTTPpmRxIdMap->ppmToRxId(ppmCoolChannelId);
if(rxChannels.empty()) {
CaloID_Exception except;
except.code(6) ;
@@ -268,13 +226,14 @@ std::vector<L1CaloRxCoolChannelId> CaloTriggerTowerService::cnvCoolChannelIdToRx
//==========================================================================
unsigned int CaloTriggerTowerService::barrel_endcap_fcal(const HWIdentifier & id) const {
- if(!m_caloTTOnAttrIdMap) {
+ const CaloTTOnAttrIdMap* caloTTOnAttrIdMap = getCaloTTOnAttrIdMap();
+ if(!caloTTOnAttrIdMap) {
msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endmsg;
msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endmsg;
msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return (0);
} else {
- unsigned int barrel_endcap_fcal = m_caloTTOnAttrIdMap->barrel_endcap_fcal(id);
+ unsigned int barrel_endcap_fcal = caloTTOnAttrIdMap->barrel_endcap_fcal(id);
return barrel_endcap_fcal;
}
}
@@ -282,13 +241,14 @@ unsigned int CaloTriggerTowerService::barrel_endcap_fcal(const HWIdentifier & id
//==========================================================================
unsigned int CaloTriggerTowerService::em_had(const HWIdentifier & id) const {
- if(!m_caloTTOnAttrIdMap) {
+ const CaloTTOnAttrIdMap* caloTTOnAttrIdMap = getCaloTTOnAttrIdMap();
+ if(!caloTTOnAttrIdMap) {
msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endmsg;
msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endmsg;
msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return (0);
} else {
- unsigned int em_had = m_caloTTOnAttrIdMap->em_had(id);
+ unsigned int em_had = caloTTOnAttrIdMap->em_had(id);
return em_had;
}
}
@@ -296,13 +256,14 @@ unsigned int CaloTriggerTowerService::em_had(const HWIdentifier & id) const {
//==========================================================================
unsigned int CaloTriggerTowerService::pos_neg(const HWIdentifier & id) const {
- if(!m_caloTTOnAttrIdMap) {
+ const CaloTTOnAttrIdMap* caloTTOnAttrIdMap = getCaloTTOnAttrIdMap();
+ if(!caloTTOnAttrIdMap) {
msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endmsg;
msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endmsg;
msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return (0);
} else {
- unsigned int pos_neg = m_caloTTOnAttrIdMap->pos_neg(id);
+ unsigned int pos_neg = caloTTOnAttrIdMap->pos_neg(id);
return pos_neg;
}
}
@@ -310,13 +271,14 @@ unsigned int CaloTriggerTowerService::pos_neg(const HWIdentifier & id) const {
unsigned int CaloTriggerTowerService::module_type(const HWIdentifier & id) const {
- if(!m_caloTTOnAttrIdMap) {
+ const CaloTTOnAttrIdMap* caloTTOnAttrIdMap = getCaloTTOnAttrIdMap();
+ if(!caloTTOnAttrIdMap) {
msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endmsg;
msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endmsg;
msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return (0);
} else {
- unsigned int module_type = m_caloTTOnAttrIdMap->module_type(id);
+ unsigned int module_type = caloTTOnAttrIdMap->module_type(id);
return module_type;
}
}
@@ -325,14 +287,15 @@ unsigned int CaloTriggerTowerService::module_type(const HWIdentifier & id) const
//===========================================================
L1CaloCoolChannelId CaloTriggerTowerService::createL1CoolChannelId( const HWIdentifier & id ) const {
- if(m_caloTTOnAttrIdMap) {
+ const CaloTTOnAttrIdMap* caloTTOnAttrIdMap = getCaloTTOnAttrIdMap();
+ if(caloTTOnAttrIdMap) {
unsigned int crate = m_ttonlineHelper->crate(id);
unsigned int module = m_ttonlineHelper->module(id); // this returns the physical slot position !
unsigned int submodule = m_ttonlineHelper->submodule(id);
unsigned int channel = m_ttonlineHelper->channel(id);
- unsigned int module_type = m_caloTTOnAttrIdMap->module_type(id);
+ unsigned int module_type = caloTTOnAttrIdMap->module_type(id);
// since the module argument is the physical position and not the logical one, the logical flag is set to false
return L1CaloCoolChannelId(crate, L1CaloModuleType( (L1CaloModuleType::L1CaloModuleEnum) module_type), module, submodule, channel, false);
@@ -362,77 +325,6 @@ HWIdentifier CaloTriggerTowerService::cnvCoolChannelIdToHWID( const L1CaloCoolCh
}
-//==========================================================================
-std::vector<HWIdentifier> CaloTriggerTowerService::createChannelIDvec(const HWIdentifier & id, int extTt) const
-{
- std::vector<HWIdentifier> channel_id_vec;
- std::vector<HWIdentifier> febs_of_tt;
- std::vector<Identifier> cell_id_vec;
-
- if(m_emHelper->dictionaryVersion() == "fullAtlas" ||
- m_emHelper->dictionaryVersion() == "H8TestBeam") {
-
- if(!m_TTCellMap) {
- msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
- return channel_id_vec;
- }
-
- Identifier ttId=cnvToIdentifier(id);
- if(extTt) {
- cell_id_vec=createCellIDvecLayer(ttId);
- } else {
- cell_id_vec=createCellIDvecTT(ttId);
- }
- std::vector<Identifier>::const_iterator it = cell_id_vec.begin();
- std::vector<Identifier>::const_iterator it_e = cell_id_vec.end();
- for (; it!=it_e; ++it) {
- HWIdentifier onlId=m_larcablingSvc->createSignalChannelID(*it);
- channel_id_vec.push_back(onlId);
- }
-
- }
-
- return channel_id_vec;
-}
-
-
-
-//==========================================================================
-HWIdentifier CaloTriggerTowerService::whichTTChannelID(const HWIdentifier & id) const
-{
-//==========================================================================
-//
-// Input : channel Online identifier
-// Output: trigger tower Online identifier
-//
-//==========================================================================
-
- HWIdentifier triggerTower(0);
-
- if(m_emHelper->dictionaryVersion() == "fullAtlas" ||
- m_emHelper->dictionaryVersion() == "H8TestBeam") {
-
- if(!m_TTCellMap) {
- msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
- return triggerTower;
- }
-
- Identifier cellId=m_larcablingSvc->cnvToIdentifier(id);
- //Identifier ttId=whichTTID(cellId);
-
- // WhichTTID returns a layer_id which embed the layer information
- // while createTTChannelID expect a tower_id
- Identifier ttLayerId=whichTTID(cellId);
- Identifier ttId = m_lvl1Helper->tower_id(ttLayerId);
-
- triggerTower=createTTChannelID(ttId);
-
- }
-
- return triggerTower;
-}
-
-
//==========================================================================
std::vector<Identifier>
CaloTriggerTowerService::createCellIDvecTT(const Identifier& id) const
@@ -443,7 +335,8 @@ CaloTriggerTowerService::createCellIDvecTT(const Identifier& id) const
if(m_emHelper->dictionaryVersion() == "fullAtlas" ||
m_emHelper->dictionaryVersion() == "H8TestBeam") {
- if(!m_TTCellMap) {
+ const LArTTCellMap* TTCellMap = getTTCellMap();
+ if(!TTCellMap) {
msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
return vec;
}
@@ -455,7 +348,7 @@ CaloTriggerTowerService::createCellIDvecTT(const Identifier& id) const
for(int iLay=0;iLay<=maxLay;++iLay) {
// Rem: not all iLay correspond to physically existing layers
Identifier layId = m_lvl1Helper->layer_id(ttId,iLay);
- std::vector<Identifier> vecp = m_TTCellMap->createCellIDvec(layId);
+ std::vector<Identifier> vecp = TTCellMap->createCellIDvec(layId);
std::vector<Identifier>::const_iterator it = vecp.begin();
std::vector<Identifier>::const_iterator it_e = vecp.end();
for (; it!=it_e; ++it) {
@@ -474,14 +367,15 @@ CaloTriggerTowerService::createCellIDvecLayer(const Identifier& id) const
//==========================================================================
{
std::vector<Identifier> vec ;
+ const LArTTCellMap* TTCellMap = getTTCellMap();
if(m_emHelper->dictionaryVersion() == "fullAtlas" ||
m_emHelper->dictionaryVersion() == "H8TestBeam") {
- if(!m_TTCellMap) {
+ if(!TTCellMap) {
msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
return vec;
}
- vec = m_TTCellMap->createCellIDvec(id);
+ vec = TTCellMap->createCellIDvec(id);
}
return vec;
@@ -496,11 +390,12 @@ Identifier CaloTriggerTowerService::whichTTID(const Identifier & id) const
if(m_emHelper->dictionaryVersion() == "fullAtlas" ||
m_emHelper->dictionaryVersion() == "H8TestBeam") {
- if(!m_TTCellMap) {
+ const LArTTCellMap* TTCellMap = getTTCellMap();
+ if(!TTCellMap) {
msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
return sid;
}
- sid = m_TTCellMap->whichTTID( id ) ;
+ sid = TTCellMap->whichTTID( id ) ;
Identifier invalidId (0);
if(sid == invalidId ){
LArID_Exception except;
@@ -513,24 +408,6 @@ Identifier CaloTriggerTowerService::whichTTID(const Identifier & id) const
}
-//=============================================================
-bool CaloTriggerTowerService::is_in_lvl1(const HWIdentifier & id) const
-//=============================================================
-//
-// input = channel online id
-// some channels are mapped to a TT although not in lvl1
-// 2 cases: barrel end and last compartment of hec.
-//
-//=============================================================
-{
-
- Identifier cellId=m_larcablingSvc->cnvToIdentifier(id);
- bool lvl1 = is_in_lvl1(cellId);
-
- return lvl1;
-
-}
-
//=============================================================
bool CaloTriggerTowerService::is_in_lvl1(const Identifier & id) const
//=============================================================
@@ -580,3 +457,50 @@ StatusCode CaloTriggerTowerService::iovCallBack(IOVSVC_CALLBACK_ARGS) {
}
+
+const LArTTCellMap* CaloTriggerTowerService::getTTCellMap() const
+{
+ if (!m_TTCellMap.get()) {
+ const LArTTCellMap* TTCellMap = nullptr;
+ if (detStore()->retrieve (TTCellMap, m_TTCellMapKey).isSuccess()) {
+ m_TTCellMap.set (TTCellMap);
+ }
+ }
+ return m_TTCellMap.get();
+}
+
+
+const CaloTTOnOffIdMap* CaloTriggerTowerService::getCaloTTOnOffIdMap() const
+{
+ if (!m_caloTTOnOffIdMap.get()) {
+ const CaloTTOnOffIdMap* caloTTOnOffIdMap = nullptr;
+ if (detStore()->retrieve (caloTTOnOffIdMap, m_caloTTOnOffIdMapKey).isSuccess()) {
+ m_caloTTOnOffIdMap.set (caloTTOnOffIdMap);
+ }
+ }
+ return m_caloTTOnOffIdMap.get();
+}
+
+
+const CaloTTOnAttrIdMap* CaloTriggerTowerService::getCaloTTOnAttrIdMap() const
+{
+ if (!m_caloTTOnAttrIdMap.get()) {
+ const CaloTTOnAttrIdMap* caloTTOnAttrIdMap = nullptr;
+ if (detStore()->retrieve (caloTTOnAttrIdMap, m_caloTTOnAttrIdMapKey).isSuccess()) {
+ m_caloTTOnAttrIdMap.set (caloTTOnAttrIdMap);
+ }
+ }
+ return m_caloTTOnAttrIdMap.get();
+}
+
+
+const CaloTTPpmRxIdMap* CaloTriggerTowerService::getCaloTTPpmRxIdMap() const
+{
+ if (!m_caloTTPpmRxIdMap.get()) {
+ const CaloTTPpmRxIdMap* caloTTPpmRxIdMap = nullptr;
+ if (detStore()->retrieve (caloTTPpmRxIdMap, m_caloTTPpmRxIdMapKey).isSuccess()) {
+ m_caloTTPpmRxIdMap.set (caloTTPpmRxIdMap);
+ }
+ }
+ return m_caloTTPpmRxIdMap.get();
+}
diff --git a/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx b/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx
index 3efc00530d33598e4a78fff8edb88970af5422ec..dae9643d1b2c939a4701e9b5e8e025984f9f7203 100755
--- a/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx
+++ b/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "CaloTriggerTool/LArTTCellMap.h"
@@ -215,7 +215,7 @@ LArTTCellMap::createCellIDvec(const Identifier & sid) const
(*m_msg) <<MSG::VERBOSE<<" vector of offline cell ID not found, TT id = " <<sid.get_compact()<< endmsg;
}
- static std::vector<Identifier> v;
+ static const std::vector<Identifier> v;
return v ;
}
diff --git a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref
index 67f208ab6657eca7765dd622313b6a70419eeb02..d618eea46716da3773a124645eb2303ca0490a51 100644
--- a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref
+++ b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref
@@ -1,14 +1,14 @@
-Tue Oct 6 19:48:02 CEST 2020
+Thu Oct 22 12:29:09 EDT 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-mt/9d6e7edd41b] -- built on [2020-10-22T1119]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "LArCellRec/LArCellDeadOTXCorr_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5616 configurables from 48 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
@@ -27,20 +27,20 @@ Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Tue Oct 6 19:48:14 2020
+ running on spar0103.usatlas.bnl.gov on Thu Oct 22 12:29:29 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3586 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3535 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier02.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier03.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontier-cache.sdcc.bnl.gov:3128)(proxyurl=http://frontier-cache1.sdcc.bnl.gov:3128)(proxyurl=http://frontier-cache2.sdcc.bnl.gov:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 1 servers found for host spar0103.usatlas.bnl.gov [ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -94,7 +94,7 @@ IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapA
IOVDbSvc INFO Added taginfo remove for /LAR/ElecCalibMC/fSampl
IOVDbSvc INFO Added taginfo remove for /LAR/ElecCalibMC/uA2MeV
ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 2511 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2268 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 39 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
@@ -186,7 +186,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 3621 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3578 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -195,12 +195,12 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25380Kb Time = 0.68S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24344Kb Time = 0.64S
ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 5651 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5532 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 618 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 3030 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3459 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/BadChannels/MissingFEBs' ) ->
@@ -254,7 +254,7 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'LAruA2MeVMC' , 'ConditionStore+LAruA2MeV' )
PyComponentMgr INFO Initializing PyComponentMgr...
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 1042 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1105 CLIDRegistry entries for module ALL
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
@@ -263,15 +263,15 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
@@ -289,21 +289,21 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-20T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
-ClassIDSvc INFO getRegistryEntries: read 306 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 36 CLIDRegistry entries for module ALL
LArOnlineIDDetD... INFO in createObj: creating a LArOnlineID helper object in the detector store
LArOnlineID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1473 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1413 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO Initializing LArCellDeadOTXCorr
ToolSvc.tool1 INFO L1Calo database won't be used. Pedestal values will be constant and equal to 32.
ToolSvc.CaloTri... INFO => CaloTriggerTowerService::initialize()
@@ -313,18 +313,12 @@ LArIdMgrDetDesc... INFO Set LArHVLineID helper in LArIdMgr
LArIdMgrDetDesc... INFO Set LArElectrodeID helper in LArIdMgr
LArIdMgrDetDesc... INFO Set CaloCell_ID helper in LArIdMgr
LArIdMgrDetDesc... INFO Initializing LArIdMgr from values in LArIdMgrDetDescrCnv
-ClassIDSvc INFO getRegistryEntries: read 60 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
-IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingLegacyService[0x343e3a00]+7f8339c5f400 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap]
-ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/OnOffIdMap
-ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/CalibIdMap
-ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/FebRodMap
-ToolSvc.LArCabl... INFO Sucessfully initialized LArCablingLegacyService with 3 callbacks.
ToolSvc.CaloTri... INFO ====> ...CaloTriggerTowerService::init() OK
+ClassIDSvc INFO getRegistryEntries: read 60 CLIDRegistry entries for module ALL
ToolSvc.tool2 INFO Initializing LArCellDeadOTXCorr
ToolSvc.tool2 INFO L1Calo database won't be used. Pedestal values will be constant and equal to 32.
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 133 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 64 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/BadChannels/MissingFEBs'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/CalibIdMap'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/FebRodMap'
@@ -368,18 +362,9 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARElecCalibM
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARuA2MeV-Feb2011 for folder /LAR/ElecCalibMC/uA2MeV
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdentifierCaloTTOnAttrIdMapAtlas-0001 for folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdentifierCaloTTOnOffIdMapAtlas-0002 for folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas
-IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdentifierCaloTTPpmRxIdMapAtlas-0000 for folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
-IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
-ToolSvc.CaloTri... INFO ====> iovCallBack
-ToolSvc.LArCabl... INFO ====> iovCallBack
-ToolSvc.LArCabl... INFO Done reading online/offline identifier mapping
-ToolSvc.LArCabl... INFO Found 195072 online identifier and 182468 offline identifier. 12604 disconnected channels.
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
DetectorStore WARNING retrieve(default): No valid proxy for default object
of type TileDetDescrManager(CLID 2941)
@@ -490,6 +475,11 @@ Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/r
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000013.gen.COND/cond09_mc.000013.gen.COND._0001.pool.root File version:52200
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] F4885664-6C4D-DF11-A94A-00304867340C
+IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200
+IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdentifierCaloTTOnAttrIdMapAtlas-0001 for folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas
+IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdentifierCaloTTOnOffIdMapAtlas-0002 for folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas
+IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdentifierCaloTTPpmRxIdMapAtlas-0000 for folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
+IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200
CaloTTOnOffIdMa... INFO initialize()
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EC2448FE-EFE2-DD11-80D3-000423D98B8C
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0004.pool.root
@@ -530,43 +520,44 @@ testalg1 INFO Finalizing testalg1...
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.25 ))s
-IOVDbFolder INFO Folder /LAR/BadChannels/BadChannels (AttrListColl) db-read 1/1 objs/chan/bytes 0/8/0 (( 0.03 ))s
-IOVDbFolder INFO Folder /LAR/BadChannels/MissingFEBs (AttrList) db-read 1/1 objs/chan/bytes 1/1/16 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/CellCorrOfl/deadOTX (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/705 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/1520148 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/6100 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/780292 (( 0.03 ))s
-IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/183 (( 0.05 ))s
-IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.03 ))s
-IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.03 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/AutoCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/486 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/DAC2uA (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/HVScaleCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 12/12/1980 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBias (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/174 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBiasAverage (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/MphysOverMcal (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Noise (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Pedestal (PoolRef) db-read 1/1 objs/chan/bytes 1/1/167 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Ramp (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/489 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Shape (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/477 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/173 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/fSampl (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/194 (( 0.22 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/uA2MeV (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/165 (( 0.02 ))s
-IOVDbSvc INFO bytes in (( 0.92 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.92 ))s
+IOVDbFolder INFO Folder /LAR/BadChannels/BadChannels (AttrListColl) db-read 1/1 objs/chan/bytes 0/8/0 (( 0.45 ))s
+IOVDbFolder INFO Folder /LAR/BadChannels/MissingFEBs (AttrList) db-read 1/1 objs/chan/bytes 1/1/16 (( 0.23 ))s
+IOVDbFolder INFO Folder /LAR/CellCorrOfl/deadOTX (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/705 (( 0.23 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 1/1 objs/chan/bytes 1/1/1520148 (( 0.30 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 1/1 objs/chan/bytes 1/1/6100 (( 0.16 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 1/1 objs/chan/bytes 1/1/780292 (( 0.39 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/183 (( 0.81 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.09 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/181 (( 0.10 ))s
+IOVDbFolder WARNING Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas is requested but no data retrieved
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/AutoCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/486 (( 0.09 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.08 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/DAC2uA (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.09 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/HVScaleCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 12/12/1980 (( 0.09 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBias (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/174 (( 0.09 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBiasAverage (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.08 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/MphysOverMcal (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.08 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Noise (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.09 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Pedestal (PoolRef) db-read 1/1 objs/chan/bytes 1/1/167 (( 0.09 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Ramp (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/489 (( 0.09 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Shape (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/477 (( 0.08 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/173 (( 0.09 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/fSampl (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/194 (( 0.09 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/uA2MeV (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/165 (( 0.09 ))s
+IOVDbSvc INFO bytes in (( 4.89 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 21 ReadTime: (( 0.81 ))s
-IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.11 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 21 ReadTime: (( 3.88 ))s
+IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 1.01 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.CaloTri... INFO => CaloTriggerTowerService::finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0.68 [s] Ave/Min/Max= 0.0179(+- 0.0833)/ 0/ 0.52 [s] #= 38
-cObj_ALL INFO Time User : Tot= 0.94 [s] Ave/Min/Max= 0.0392(+- 0.113)/ 0/ 0.55 [s] #= 24
-ChronoStatSvc INFO Time User : Tot= 54.7 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.89 [s] Ave/Min/Max= 0.0234(+- 0.104)/ 0/ 0.65 [s] #= 38
+cObj_ALL INFO Time User : Tot= 1.17 [s] Ave/Min/Max= 0.0509(+- 0.137)/ 0/ 0.67 [s] #= 23
+ChronoStatSvc INFO Time User : Tot= 50.5 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArRawUtils/src/LArRoI_Map.cxx b/LArCalorimeter/LArRawUtils/src/LArRoI_Map.cxx
index 52a06c4610af4b84392ea45bf92da3835fcf11d4..03b153913965123277e2f271dfbbf2fddeb56d46 100644
--- a/LArCalorimeter/LArRawUtils/src/LArRoI_Map.cxx
+++ b/LArCalorimeter/LArRawUtils/src/LArRoI_Map.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArRawUtils/LArRoI_Map.h"
@@ -65,9 +65,6 @@ StatusCode LArRoI_Map::initialize()
ATH_CHECK( detStore()->regFcn(&LArCablingLegacyService::iovCallBack,&(*m_cablingSvc),
&LArRoI_Map::iovCallBack,
this,true) );
- ATH_CHECK( detStore()->regFcn(&CaloTriggerTowerService::iovCallBack,&(*m_ttSvc),
- &LArRoI_Map::iovCallBack,
- this,true) ) ;
if (m_loadAtBegin) {
ATH_MSG_DEBUG( "Setting callback function to load id map at begin of run" );