diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h
index 7a3de65a0ec1276fe500ff83b006c376005f46a5..e14ca7fb62b2e5dfb9c4cf28d53644851c41b359 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TILERECUTILS_TILECELLBUILDERFROMHIT_H
@@ -46,6 +46,7 @@
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
+#include "AthenaKernel/IAthRNGSvc.h"
// Gaudi includes
#include "GaudiKernel/ToolHandle.h"
@@ -68,7 +69,6 @@ class TileDetDescrManager;
class TileCellCollection;
class CaloCellContainer;
class TileCablingService;
-class IAtRndmGenSvc;
/**
@@ -140,8 +140,9 @@ class TileCellBuilderFromHit
const TileInfo* m_tileInfo; //!< Pointer to TileInfo
const TileCablingService* m_cabling; //!< Pointer to TileCabling
- CLHEP::HepRandomEngine * m_pHRengine; //!< Random number generator engine to use
- ServiceHandle<IAtRndmGenSvc> m_rndmSvc; //!< Random number service to use
+ ATHRNG::RNGWrapper* m_pHRengine; //!< Random number generator engine to use
+ ServiceHandle<IAthRNGSvc> m_rndmSvc //!< Random number service to use
+ { this, "RndmSvc", "AthRNGSvc", "Random Number Service used in TileCellBuildetFromHit" };
ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
"TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
diff --git a/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py b/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py
index 3394761e3538c6647d74e905d8b7c32ad4514ff6..ba8c61aec91b30455beea87fb957ed016cfdc662 100644
--- a/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
"""Define method to construct configured Tile Cell maker algorithm"""
@@ -147,6 +147,10 @@ if __name__ == "__main__":
acc.printConfig(withDetails = True, summariseProps = True)
acc.store( open('TileCellMaker.pkl','wb') )
+ # Needed to work around cling crash in dbg build...
+ import ROOT
+ ROOT.CaloCellContainer
+
sc = acc.run()
import sys
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
index d54438e3888d9dfdc0d4449072e9289b2b20cf5d..e5546e0b9c1b173525ccbd281d12677ddf66aa59 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
@@ -1,20 +1,6 @@
-Mon Sep 6 17:19:53 CEST 2021
-Preloading tcmalloc_minimal.so
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.43] [x86_64-centos7-gcc8-opt] [tilecal-for-22.0/e2f7b1f] -- built on [2021-09-06T1700]
-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 "TileRecUtils/TileCellBuilderFromHit_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 5076 configurables from 16 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.43
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
-Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
-Py:TileConditions_jobOptions.py INFO Forcing RUN2 (2014-2017) cabling for run 284500 with geometry ATLAS-R2-2016-01-00-01
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo for 7 samples
Py:TileConditions_jobOptions.py INFO setting up COOL for TileCal conditions data
Py:TileInfoConf. INFO Changing default TileBadChanTool configuration to COOL source
@@ -24,104 +10,16 @@ Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to C
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
- running on pcatl03.cern.ch on Mon Sep 6 17:19:58 2021
-====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 6689 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
-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/2021-09-05T2101/Athena/22.0.43/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host pcatl03.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc INFO Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
-IOVDbSvc INFO Initialised with 3 connections and 14 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-IOVDbSvc INFO AlgTool: ToolSvc.IOVDbMetaDataTool
-TagInfoMgr INFO AlgTool: TagInfoMgr.IOVDbMetaDataTool
-ClassIDSvc INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
-IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
-IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
-IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
-IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
-IOVDbSvc INFO Added taginfo remove for /LAR/Align
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CES
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/LIN
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/CIS/FIT/NLN
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/EMS
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/FIBER
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/LIN
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/CALIB/LAS/NLN
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/NOISE/SAMPLE
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
-IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
-IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
-IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 23 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
-DetDescrCnvSvc INFO filling address for CaloTTMgr with CLID 117659265 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloMgr with CLID 4548337 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloSuperCellMgr with CLID 241807251 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloIdManager with CLID 125856940 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for IdDict with CLID 2411 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for PixelID with CLID 2516 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for SCT_ID with CLID 2517 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TRT_ID with CLID 2518 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for HGTD_ID with CLID 79264207 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for SiliconID with CLID 129452393 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArEM_ID with CLID 163583365 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArEM_SuperCell_ID with CLID 99488227 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArHEC_ID with CLID 3870484 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArHEC_SuperCell_ID with CLID 254277678 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArFCAL_ID with CLID 45738051 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArFCAL_SuperCell_ID with CLID 12829437 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArMiniFCAL_ID with CLID 79264204 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArOnlineID with CLID 158698068 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TTOnlineID with CLID 38321944 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArOnline_SuperCellID with CLID 115600394 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArHVLineID with CLID 27863673 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArElectrodeID with CLID 80757351 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TileID with CLID 2901 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for Tile_SuperCell_ID with CLID 49557789 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TileHWID with CLID 2902 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TileTBID with CLID 2903 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for MDTIDHELPER with CLID 4170 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CSCIDHELPER with CLID 4171 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for RPCIDHELPER with CLID 4172 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TGCIDHELPER with CLID 4173 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloLVL1_ID with CLID 108133391 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloCell_SuperCell_ID with CLID 128365736 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloDM_ID with CLID 167756483 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for ZdcID with CLID 190591643 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -161,13 +59,11 @@ LArHVLineID INFO setDictVersion of LArHighVoltage is OK
LArHVLineID INFO [initLevelsFromDict] m_dict OK ...
LArHVLineID INFO [initialize_from_dictionary] > HV line range -> 11/1/48:79/0:15 | 11/1/148:179/0:15 | 11/1/80:93/0:7 | 11/1/180:193/0:7 | 11/1/200:231/0:15 | 11/1/232:263/0:15 | 11/1/296,297,306,307/0:15 | 11/1/299,304,305,308,309/0:15 | 11/1/264:279/0:15 | 11/1/280:295/0:15 | 11/1/0:47/0:15 | 11/1/320:322/0:15 | 11/1/100:147/0:15 | 11/1/324,325/0:15 | 11/1/312:315/0:15 | 11/1/316:319/0:15 | 11/1/300:303/0:15 | 11/1/310,311/0:15 | 11/1/323/0:15 | 11/1/326,327/0:15 | 11/1/94:99/0:15 | 11/1/194:199/0:15
LArHVLineID INFO [init_hashes()] > Hvline_size= 5008
-BarrelConstruction INFO Getting primary numbers for ATLAS, ATLAS-R2-2016-01-00-01
BarrelConstruction INFO Makes detailed absorber sandwich ? 1 1
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 3295 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
@@ -176,7 +72,6 @@ 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
-TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
TileDddbManager INFO n_timod = 320
TileDddbManager INFO n_cuts = 9
@@ -185,11 +80,9 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
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/2021-09-05T2101/Athena/22.0.43/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-ClassIDSvc INFO getRegistryEntries: read 55 CLIDRegistry entries for module ALL
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
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -197,55 +90,19 @@ 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/2021-09-05T2101/Athena/22.0.43/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/2021-09-05T2101/Athena/22.0.43/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/2021-09-05T2101/Athena/22.0.43/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.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 71 CLIDRegistry entries for module ALL
-TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
-TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr
-ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
-CondInputLoader INFO Initializing CondInputLoader...
-ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
- + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' ) -> no bases
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' ) ->
- + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
- + ( 'CaloRec::CaloCellPositionShift' , 'ConditionStore+LArCellPositionShift' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/EMS' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/STATUS/ADC' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/TILE/ONL01/STATUS/ADC' )
- + ( 'DetCondKeyTrans' , 'ConditionStore+/LAR/Align' )
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OnlBch) for folder: "/TILE/ONL01/STATUS/ADC"
TileBadChannels... INFO Creating TileCondProxyCool(TileBadChannelsCondAlg.TileCondProxyCool_OflBch) for folder: "/TILE/OFL02/STATUS/ADC"
TileBadChannels... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
@@ -266,28 +123,19 @@ TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
-ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Initializing xAODMaker::EventInfoCnvAlg
-ClassIDSvc INFO getRegistryEntries: read 271 CLIDRegistry entries for module ALL
-xAODMaker::Even... INFO Beam conditions service not available
-xAODMaker::Even... INFO Will not fill beam spot information into xAOD::EventInfo
PyComponentMgr INFO Initializing PyComponentMgr...
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 5980 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO Storing MBTS cells in MBTSContainer
ToolSvc.tool1 INFO Noise Sigma 0 MeV is selected!
-AtRndmGenSvc INFO Initializing AtRndmGenSvc
- INITIALISING RANDOM NUMBER STREAMS.
-AtRndmGenSvc INFO will be reseeded for every event
-AtRndmGenSvc WARNING INITIALISING Tile_DigitsMaker stream with DEFAULT seeds 3591 2309736
+AthRNGSvc INFO Creating engine ToolSvc.tool1
ToolSvc.tool1 INFO max time thr 25 ns
ToolSvc.tool1 INFO min time thr -25 ns
ToolSvc.tool1 INFO taking hits from 'TileHitCnt'
ToolSvc.tool1 INFO Storing E4' cells in E4prContainer
ToolSvc.tool1 INFO TileCellBuilderFromHit initialization completed
-ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
ToolSvc.tool2 INFO Storing MBTS cells in MBTSContainer
ToolSvc.tool2 INFO Noise Sigma 0 MeV is selected!
+AthRNGSvc INFO Creating engine ToolSvc.tool2
ToolSvc.tool2 INFO max time thr 25 ns
ToolSvc.tool2 INFO min time thr -25 ns
ToolSvc.tool2 INFO taking hits from 'TileHitCnt'
@@ -295,41 +143,19 @@ ToolSvc.tool2 INFO Storing E4' cells in E4prContainer
ToolSvc.tool2 INFO TileCellBuilderFromHit initialization completed
ToolSvc.tool3 INFO Storing MBTS cells in MBTSContainer
ToolSvc.tool3 INFO Noise Sigma 0.1 MeV is selected!
+AthRNGSvc INFO Creating engine ToolSvc.tool3
ToolSvc.tool3 INFO max time thr 25 ns
ToolSvc.tool3 INFO min time thr -25 ns
ToolSvc.tool3 INFO taking hits from 'TileHitCnt'
ToolSvc.tool3 INFO Storing E4' cells in E4prContainer
ToolSvc.tool3 INFO TileCellBuilderFromHit initialization completed
ApplicationMgr INFO Application Manager Initialized successfully
-CondInputLoader INFO created CondCont<CaloRec::CaloCellPositionShift> with key 'ConditionStore+LArCellPositionShift'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/EMS'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/FIBER'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/LIN'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/LAS/NLN'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/NOISE/SAMPLE'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/STATUS/ADC'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/TIME/CHANNELOFFSET/PHY'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/ONL01/STATUS/ADC'
-CondInputLoader INFO created CondCont<DetCondKeyTrans> with key 'ConditionStore+/LAR/Align'
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
-IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-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
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 272 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -343,22 +169,12 @@ 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/2021-09-05T2101/Athena/22.0.43/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/2021-09-05T2101/Athena/22.0.43/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/2021-09-05T2101/Athena/22.0.43/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/2021-09-05T2101/Athena/22.0.43/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
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
-IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitLin-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/LIN
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCisFitNln-COM-00 for folder /TILE/OFL02/CALIB/CIS/FIT/NLN
@@ -369,7 +185,6 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02Cali
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02NoiseSample-TwoGauss-19 for folder /TILE/OFL02/NOISE/SAMPLE
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02StatusAdc-IOVDEP-03 for folder /TILE/OFL02/STATUS/ADC
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02TimeChanneloffsetPhy-000-00 for folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY
-IOVDbSvc INFO Disconnecting from COOLOFL_TILE/OFLP200
LArAlignCondAlg INFO recorded new GeoAlignmentStore object for LAr with key LArAlignmentStore and range {[0,l:0] - [177530,l:0]}
CaloAlignCondAlg INFO recorded new CaloDetDescr Manager condition object with key CaloDetDescrManager and range {[0,t:0,l:0] - [177530,l:0]}
TileBadChannels... INFO Updating TileBchStatus::isBad() definition from DB
@@ -383,8 +198,6 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/home/solodkov/git/r22.0.tile/build/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/home/solodkov/git/r22.0.tile/build/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -396,8 +209,6 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/home/solodkov/git/r22.0.tile/build/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/home/solodkov/git/r22.0.tile/build/TileCalorimeter/TileRecUtils/CMakeFiles/unitTestRun/tilecellbuilder_bct2.bch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -409,57 +220,18 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 649 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 125 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 49 CLIDRegistry entries for module ALL
-AtRndmGenSvc INFO Stream = Tile_DigitsMaker, Seed1 = 288581169, Seed2 = 758068585
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
-/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
-AtRndmGenSvc INFO Stream = Tile_DigitsMaker, Seed1 = 1959006884, Seed2 = 1693617434
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #3, run #1 2 events processed so far <<<===
-AtRndmGenSvc INFO Stream = Tile_DigitsMaker, Seed1 = 2049887984, Seed2 = 1923128072
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 3 events processed so far <<<===
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
-CondInputLoader INFO Finalizing CondInputLoader...
-testalg1 INFO Finalizing testalg1...
-AtRndmGenSvc INFO FINALISING
-PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/2 objs/chan/bytes 1/1/170 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.01 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.01 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.01 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.01 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/2 objs/chan/bytes 2/1/390 (( 0.02 ))s
-IOVDbSvc INFO bytes in (( 0.21 ))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: 3 nFolders: 2 ReadTime: (( 0.04 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.17 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
-ToolSvc.tool3 INFO Finalizing
-ToolSvc.tool2 INFO Finalizing
-ToolSvc.tool1 INFO Finalizing
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 80 [ms] Ave/Min/Max= 20(+- 34.6)/ 0/ 80 [ms] #= 4
-cObj_ALL INFO Time User : Tot= 100 [ms] Ave/Min/Max= 6.67(+- 22.4)/ 0/ 90 [ms] #= 15
-ChronoStatSvc INFO Time User : Tot= 24.6 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx b/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx
index cdfe5bc12189056ae126d2233b9d63088bf5299e..f82ed96c7138ae414fb103764dcb413cba0e14ad 100644
--- a/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -30,12 +30,12 @@
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
#include "StoreGate/ReadCondHandle.h"
+#include "AthenaKernel/ClassName.h"
+#include "AthenaKernel/RNGWrapper.h"
// access all Hits inside container
#include "EventContainers/SelectAllObject.h"
#include "AthenaKernel/errorcheck.h"
-// For the Athena-based random numbers.
-#include "AthenaKernel/IAtRndmGenSvc.h"
//CLHEP includes
@@ -84,7 +84,6 @@ TileCellBuilderFromHit::TileCellBuilderFromHit(const std::string& type, const st
, m_tileHWID(0)
, m_tileInfo(0)
, m_pHRengine(0)
- , m_rndmSvc ("AtRndmGenSvc", name)
, m_tileMgr(0)
, m_mbtsMgr(0)
, m_RChType(TileFragHash::Default)
@@ -102,7 +101,6 @@ TileCellBuilderFromHit::TileCellBuilderFromHit(const std::string& type, const st
m_zeroEnergy = 0.5 * MeV; // half a MeV in both PMTs i.e. one MeV in a cell
declareProperty("TileInfoName" ,m_infoName); // Name of TileInfo store (default=TileInfo);
- declareProperty("RndmSvc" ,m_rndmSvc, "Random Number Service used in TileCellBuildetFromHit");
// Noise Sigma
declareProperty("NoiseSigma",m_noiseSigma);
@@ -173,7 +171,7 @@ StatusCode TileCellBuilderFromHit::initialize() {
}
ATH_CHECK( m_rndmSvc.retrieve());
- m_pHRengine = m_rndmSvc->GetEngine("Tile_DigitsMaker");
+ m_pHRengine = m_rndmSvc->getEngine(this);
ATH_MSG_INFO( "max time thr " << m_maxTime << " ns" );
ATH_MSG_INFO( "min time thr " << m_minTime << " ns" );
@@ -747,6 +745,11 @@ void TileCellBuilderFromHit::build(const CaloNoise* caloNoise,
TileCellContainer* MBTSCells,
TileCellContainer* E4prCells) const
{
+ static const std::string rngname = name() + "-" + ClassName<COLLECTION>::name();
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+ m_pHRengine->setSeed (rngname, ctx);
+ CLHEP::HepRandomEngine* engine = m_pHRengine->getEngine (ctx);
+
/* zero all counters and sums */
int nTwo = 0;
int nCell = 0;
@@ -1088,7 +1091,7 @@ void TileCellBuilderFromHit::build(const CaloNoise* caloNoise,
if (bad1 || bad2 || single_PMT) {
- float ene = RandGaussQ::shoot(m_pHRengine, 0.0, noiseSigma);
+ float ene = RandGaussQ::shoot(engine, 0.0, noiseSigma);
ATH_MSG_VERBOSE ( "Cell noise for cell id=" << m_tileID->to_string(pCell->ID(), -2)
<< " sigma " << noiseSigma << " noise " << ene );
@@ -1104,7 +1107,7 @@ void TileCellBuilderFromHit::build(const CaloNoise* caloNoise,
if (gain1!=gain2) {
- float ene = RandGaussQ::shoot(m_pHRengine, 0.0, noiseSigma);
+ float ene = RandGaussQ::shoot(engine, 0.0, noiseSigma);
ATH_MSG_VERBOSE ( "Cell noise for cell id=" << m_tileID->to_string(pCell->ID(), -2)
<< " sigma " << noiseSigma << " noise " << ene );
@@ -1116,8 +1119,8 @@ void TileCellBuilderFromHit::build(const CaloNoise* caloNoise,
} else {
noiseSigma *= M_SQRT1_2;
- float ene1 = RandGaussQ::shoot(m_pHRengine, 0.0, noiseSigma);
- float ene2 = RandGaussQ::shoot(m_pHRengine, 0.0, noiseSigma);
+ float ene1 = RandGaussQ::shoot(engine, 0.0, noiseSigma);
+ float ene2 = RandGaussQ::shoot(engine, 0.0, noiseSigma);
ATH_MSG_VERBOSE ( "Cell noise for cell id=" << m_tileID->to_string(pCell->ID(), -2)
<< " sigma " << noiseSigma*M_SQRT2 << " noise " << ene1+ene2 << " noise1 " << ene1 << " noise2 " << ene2 );