diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx index f15cbe07c4973ee717544a03d46876f91f57684c..7212c3805b53502dc88555855c1ba0e5472c918f 100644 --- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx +++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.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 "PixelCablingCondAlg.h" @@ -51,7 +51,7 @@ StatusCode PixelCablingCondAlg::initialize() { const EventIDBase::number_type UNDEFNUM = EventIDBase::UNDEFNUM; const EventIDBase::event_number_t UNDEFEVT = EventIDBase::UNDEFEVT; EventIDRange rangeW (EventIDBase (0, UNDEFEVT, UNDEFNUM, 0, 0), - EventIDBase (UNDEFNUM-1, UNDEFEVT, UNDEFNUM, 0, 0)); + EventIDBase (1, UNDEFEVT, UNDEFNUM, 0, 0)); // Signed values int barrel_ec, eta_module; diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt index 6865b61269d329a6d3353375bd4ef60e539b3111..fec15c73bdf647726524e7dffcea2a53ae817b92 100644 --- a/InnerDetector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt +++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt @@ -13,6 +13,7 @@ atlas_depends_on_subdirs( PUBLIC InnerDetector/InDetConditions/PixelConditionsData InnerDetector/InDetDetDescr/SCT_Cabling PRIVATE + Control/AthenaKernel DetectorDescription/Identifier DetectorDescription/IRegionSelector InnerDetector/InDetDetDescr/InDetIdentifier @@ -29,7 +30,7 @@ atlas_add_component( InDetRegionSelector src/*.cxx src/components/*.cxx INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} - LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps RegSelLUT GaudiKernel PixelConditionsData SCT_CablingLib Identifier InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry TRT_CablingLib ) + LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps RegSelLUT GaudiKernel PixelConditionsData SCT_CablingLib Identifier InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry TRT_CablingLib AthenaKernel ) # Install files from the package: atlas_install_headers( InDetRegionSelector ) diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h index 428cf404c8fdcf65dd896df023f8b74b27726426..f8efee971ae5a9d8713f93059253f9ccf0492fdc 100755 --- a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h +++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h @@ -36,7 +36,7 @@ public: private: - StatusCode createTable(); + StatusCode createTable (const EventContext& ctx); RegSelSiLUT* m_regionLUT; diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx index 29528fe28c8940c31ae123affeedd374fb0b9d1a..a67fd227535c24749b5482fa32eaf6c243bccb4f 100755 --- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx +++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx @@ -15,6 +15,9 @@ #include "RegSelLUT/RegSelModule.h" #include "RegSelLUT/RegSelSiLUT.h" +#include "AthenaKernel/ExtendedEventContext.h" +#include "GaudiKernel/ThreadLocalContext.h" + #include "CLHEP/Units/SystemOfUnits.h" #include <iostream> @@ -76,7 +79,12 @@ SiRegionSelectorTable::initialize(){ ATH_CHECK(m_condCablingKey.initialize()); ATH_MSG_WARNING("So far, this prevents the conditions migration!! The createTable() should NOT be used in the initilization step..."); - ATH_CHECK(createTable()); + const EventIDBase::number_type UNDEFNUM = EventIDBase::UNDEFNUM; + const EventIDBase::event_number_t UNDEFEVT = EventIDBase::UNDEFEVT; + EventContext ctx = Gaudi::Hive::currentContext(); + ctx.setEventID (EventIDBase (0, UNDEFEVT, UNDEFNUM, 0, 0)); + Atlas::getExtendedEventContext(ctx).setConditionsRun (0); + ATH_CHECK(createTable (ctx)); return StatusCode::SUCCESS; } @@ -101,7 +109,7 @@ RegSelSiLUT* SiRegionSelectorTable::getLUT() StatusCode -SiRegionSelectorTable::createTable() +SiRegionSelectorTable::createTable (const EventContext& ctx) { if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Creating region selector table" << endmsg; @@ -131,7 +139,7 @@ SiRegionSelectorTable::createTable() else rd = new RegSelSiLUT(RegSelSiLUT::SCT); - SG::ReadCondHandle<PixelCablingCondData> pixCabling(m_condCablingKey); + SG::ReadCondHandle<PixelCablingCondData> pixCabling(m_condCablingKey, ctx); SiDetectorElementCollection::const_iterator iter; for (iter = manager->getDetectorElementBegin(); iter != manager->getDetectorElementEnd(); ++iter){ diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/jobOfragment_TransBS_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/jobOfragment_TransBS_standalone.py index ba3154fe4be969efade22818bebb2aaea6e12895..0b8c1305deacbf8c7eae36a22c7c0ee1e559f216 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/share/jobOfragment_TransBS_standalone.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/share/jobOfragment_TransBS_standalone.py @@ -35,6 +35,7 @@ if TriggerFlags.doID(): # Pixel StreamBS.ItemList += ["PixelRDO_Container#*"] StreamBS.ExtraInputs += [('PixelHitDiscCnfgData','ConditionStore+PixelHitDiscCnfgData')] + StreamBS.ExtraInputs += [('PixelCablingCondData','ConditionStore+PixelCablingCondData')] if TriggerFlags.doCalo(): # LAr