diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx
index b2a65248382caf5f3c27407dd3e8aed2964b840f..1319aa5dd01aea5f9eddb7018a0811ce60f520cc 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.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 "SCT_AlignCondAlg.h"
@@ -66,7 +66,6 @@ StatusCode SCT_AlignCondAlg::execute()
// ____________ Construct new Write Cond Object ____________
std::unique_ptr<GeoAlignmentStore> writeCdo{std::make_unique<GeoAlignmentStore>()};
- EventIDRange rangeW;
if (not m_useDynamicAlignFolders.value()) { // Static
// ____________ Get Read Cond Object ____________
@@ -82,11 +81,8 @@ StatusCode SCT_AlignCondAlg::execute()
readCdoContainerStatic.emplace(m_readKeyStatic.key(), readCdoStatic);
ATH_CHECK(m_detManager->align(readCdoContainerStatic, writeCdo.get()));
- // Define validity of the output cond object and record it
- if (not readHandleStatic.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleStatic.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandleStatic);
} else { // Dynamic
// ____________ Get Read Cond Object ____________
SG::ReadCondHandle<CondAttrListCollection> readHandleDynamicL1{m_readKeyDynamicL1};
@@ -119,23 +115,10 @@ StatusCode SCT_AlignCondAlg::execute()
readCdoContainerDynamicL3.emplace(m_readKeyDynamicL3.key(), readCdoDynamicL3);
ATH_CHECK(m_detManager->align(readCdoContainerDynamicL3, writeCdo.get()));
- // Define validity of the output cond object and record it
- EventIDRange rangeWL1;
- if (not readHandleDynamicL1.range(rangeWL1)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleDynamicL1.key());
- return StatusCode::FAILURE;
- }
- EventIDRange rangeWL2;
- if (not readHandleDynamicL2.range(rangeWL2)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleDynamicL2.key());
- return StatusCode::FAILURE;
- }
- EventIDRange rangeWL3;
- if (not readHandleDynamicL3.range(rangeWL3)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleDynamicL3.key());
- return StatusCode::FAILURE;
- }
- rangeW = EventIDRange::intersect(rangeWL1, rangeWL2, rangeWL3);
+ // Add dependency
+ writeHandle.addDependency(readHandleDynamicL1);
+ writeHandle.addDependency(readHandleDynamicL2);
+ writeHandle.addDependency(readHandleDynamicL3);
}
// Set (default) absolute transforms in alignment store by calling them.
@@ -144,13 +127,13 @@ StatusCode SCT_AlignCondAlg::execute()
oldEl->getMaterialGeom()->getDefAbsoluteTransform(writeCdo.get());
}
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record GeoAlignmentStore " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx
index b1bbd278df5b8cf484e4907306bb78ced586f725..b9af1a1dd6d26e8cad9dbb1b807116da4788d312 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.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 "SCT_ConditionsParameterCondAlg.h"
@@ -8,8 +8,6 @@
#include "Identifier/IdentifierHash.h"
#include "SCT_ConditionsData/SCT_Chip.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
namespace { //anonymous namespace introduces file-scoped functions
@@ -115,14 +113,10 @@ StatusCode SCT_ConditionsParameterCondAlg::execute(const EventContext& ctx) cons
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- // Get the validitiy range
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
ATH_MSG_INFO("Size of CondAttrListVec " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of input is " << rangeW);
+ ATH_MSG_INFO("Range of input is " << readHandle.getRange());
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_CondParameterData> writeCdo{std::make_unique<SCT_CondParameterData>()};
@@ -165,13 +159,13 @@ StatusCode SCT_ConditionsParameterCondAlg::execute(const EventContext& ctx) cons
}//module loop
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_CondParameterData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
index 97025673d184bb51014887a630aa7961a6fcefc9..c0e883ef568a97f7b7f39c0ff4405452bd1d76ab 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.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 "SCT_ConfigurationCondAlg.h"
@@ -11,9 +11,6 @@
#include "SCT_Cabling/SCT_SerialNumber.h"
#include "SCT_ConditionsData/SCT_Chip.h"
-// Gaudi includes
-#include "GaudiKernel/EventIDRange.h"
-
// STL include
#include <memory>
@@ -94,39 +91,28 @@ StatusCode SCT_ConfigurationCondAlg::execute(const EventContext& ctx) const {
writeCdo->clear();
// Fill module data
- EventIDRange rangeModule;
- if (fillModuleData(writeCdo.get(), rangeModule, ctx).isFailure()) {
+ if (fillModuleData(writeCdo.get(), writeHandle, ctx).isFailure()) {
return StatusCode::FAILURE;
}
// Fill strip, chip and link info if Chip or MUR folders change
- EventIDRange rangeChannel;
- EventIDRange rangeMur;
- EventIDRange rangeDetEle;
- if (fillChannelData(writeCdo.get(), rangeChannel, rangeMur, rangeDetEle, ctx).isFailure()) {
+ if (fillChannelData(writeCdo.get(), writeHandle, ctx).isFailure()) {
return StatusCode::FAILURE;
}
- // Define validity of the output cond obbject and record it
- // rangeDetEle is run-lumi. Others are time.
- EventIDRange rangeW{EventIDRange::intersect(rangeChannel, rangeModule, rangeMur/*, rangeDetEle*/)};
- if (rangeW.stop().isValid() and rangeW.start()>rangeW.stop()) {
- ATH_MSG_FATAL("Invalid intersection range: " << rangeW << " " << rangeChannel << " " << rangeModule << " " << rangeMur/* << " " << rangeDetEle*/);
- return StatusCode::FAILURE;
- }
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_ConfigurationCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
// Fill bad strip, chip and link info
-StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeChannel, EventIDRange& rangeMur, EventIDRange& rangeDetEle, const EventContext& ctx) const {
+StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData* writeCdo, SG::WriteCondHandle<SCT_ConfigurationCondData>& writeHandle, const EventContext& ctx) const {
// Check if the pointer of derived conditions object is valid.
if (writeCdo==nullptr) {
ATH_MSG_FATAL("Pointer of derived conditions object is null");
@@ -163,7 +149,7 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
writeCdo->clearBadStripIds();
writeCdo->clearBadChips();
// Fill link status
- if (fillLinkStatus(writeCdo, rangeMur, ctx).isFailure()) return StatusCode::FAILURE;
+ if (fillLinkStatus(writeCdo, writeHandle, ctx).isFailure()) return StatusCode::FAILURE;
// Get channel folder for link info
SG::ReadCondHandle<CondAttrListVec> readHandle{m_readKeyChannel, ctx};
@@ -173,12 +159,8 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
return StatusCode::FAILURE;
}
ATH_MSG_INFO("Size of " << m_readKeyChannel.key() << " folder is " << readCdo->size());
-
- // Get EventIDRange
- if (not readHandle.range(rangeChannel)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
// Get SCT_DetectorElementCollection
SG::ReadCondHandle<InDetDD::SiDetectorElementCollection> sctDetEle{m_SCTDetEleCollKey, ctx};
@@ -187,11 +169,8 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
ATH_MSG_FATAL(m_SCTDetEleCollKey.fullKey() << " could not be retrieved");
return StatusCode::FAILURE;
}
- // Get EventIDRange
- if (not sctDetEle.range(rangeDetEle)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << sctDetEle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(sctDetEle);
// Loop over modules (i.e groups of 12 chips) in DB folder
CondAttrListVec::const_iterator itr{readCdo->begin()};
@@ -291,7 +270,7 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
}
// Fill bad module info
-StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeModule, const EventContext& ctx) const {
+StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* writeCdo, SG::WriteCondHandle<SCT_ConfigurationCondData>& writeHandle, const EventContext& ctx) const {
// Check if the pointer of derived conditions object is valid.
if (writeCdo==nullptr) {
ATH_MSG_FATAL("Pointer of derived conditions object is null");
@@ -316,11 +295,8 @@ StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* w
}
ATH_MSG_INFO("Size of " << m_readKeyModule.key() << " is " << readCdo->size());
- // Get EventIDRange
- if (not readHandle.range(rangeModule)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
// Set index
enum RUN1_INDICES{PK, FOREIGN_KEY, ID_1, GROUP_1, ACTIVE_1, SELECT_1};
@@ -364,7 +340,7 @@ StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* w
}
// Fill link info
-StatusCode SCT_ConfigurationCondAlg::fillLinkStatus(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeMur, const EventContext& ctx) const {
+StatusCode SCT_ConfigurationCondAlg::fillLinkStatus(SCT_ConfigurationCondData* writeCdo, SG::WriteCondHandle<SCT_ConfigurationCondData>& writeHandle, const EventContext& ctx) const {
// Check if the pointer of derived conditions object is valid.
if (writeCdo==nullptr) {
ATH_MSG_FATAL("Pointer of derived conditions object is null");
@@ -386,11 +362,8 @@ StatusCode SCT_ConfigurationCondAlg::fillLinkStatus(SCT_ConfigurationCondData* w
}
ATH_MSG_INFO("Size of " << m_readKeyMur.key() << " is " << readCdo->size());
- // Get EventIDRange
- if (not readHandle.range(rangeMur)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
// Set indices
enum RUN1_INDICES{PK, FOREIGN_KEY, MUR_1, MODULE_1, MODULEID_1, RMODULEID_1, RX0FIBRE_1, RX1FIBRE_1, TXFIBRE_1};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.h
index d4e9aefc8a7a88197c046f50251d89dd89ad7d4d..f1b69efeab47e992a7c39fa4140f62b3b07d4d67 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- 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 SCT_CONFIGURATIONCONDALG
@@ -16,6 +16,7 @@
#include "SCT_ConditionsData/SCT_ConfigurationCondData.h"
#include "SCT_ConditionsTools/ISCT_ReadoutTool.h"
#include "StoreGate/ReadCondHandleKey.h"
+#include "StoreGate/WriteCondHandle.h"
#include "StoreGate/WriteCondHandleKey.h"
// Gaudi includes
@@ -24,7 +25,6 @@
#include "GaudiKernel/ToolHandle.h"
// Forward declarations
-class EventIDRange;
class SCT_ID;
class SCT_ConfigurationCondAlg : public AthReentrantAlgorithm
@@ -42,9 +42,9 @@ class SCT_ConfigurationCondAlg : public AthReentrantAlgorithm
/** enum for constants*/
enum {badLink=255, stripsPerChip=128, lastStrip=767};
- StatusCode fillChannelData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeChannel, EventIDRange& rangeMur, EventIDRange& rangeDetEle, const EventContext& ctx) const;
- StatusCode fillModuleData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeModule, const EventContext& ctx) const;
- StatusCode fillLinkStatus(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeMur, const EventContext& ctx) const;
+ StatusCode fillChannelData(SCT_ConfigurationCondData* writeCdo, SG::WriteCondHandle<SCT_ConfigurationCondData>& writeHandle, const EventContext& ctx) const;
+ StatusCode fillModuleData(SCT_ConfigurationCondData* writeCdo, SG::WriteCondHandle<SCT_ConfigurationCondData>& writeHandle, const EventContext& ctx) const;
+ StatusCode fillLinkStatus(SCT_ConfigurationCondData* writeCdo, SG::WriteCondHandle<SCT_ConfigurationCondData>& writeHandle, const EventContext& ctx) const;
Identifier getStripId(const unsigned int truncatedSerialNumber, const unsigned int chipNumber, const unsigned int stripNumber,
const InDetDD::SiDetectorElementCollection* elements, const EventContext& ctx) const;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx
index a4d49e22572ac6fef9ffd65922889a8710376462..5cd9eb80f3cbbc3d93be7736338a39422d9d5f44 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx
@@ -1,13 +1,11 @@
/*
- 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 "SCT_DCSConditionsHVCondAlg.h"
#include "Identifier/IdentifierHash.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_DCSConditionsHVCondAlg::SCT_DCSConditionsHVCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
@@ -59,14 +57,10 @@ StatusCode SCT_DCSConditionsHVCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- // Get the validitiy range
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of input is " << rangeW);
+ ATH_MSG_INFO("Range of input is " << readHandle.getRange());
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_DCSFloatCondData> writeCdo{std::make_unique<SCT_DCSFloatCondData>()};
@@ -89,13 +83,13 @@ StatusCode SCT_DCSConditionsHVCondAlg::execute(const EventContext& ctx) const {
}
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_DCSFloatCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx
index 57ad61c690b8cf25d579a171f892af5ae5a12f28..90576ddc47c00ec795074c6db6ed859be699a67a 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx
@@ -1,13 +1,11 @@
/*
- 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 "SCT_DCSConditionsStatCondAlg.h"
#include "Identifier/IdentifierHash.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_DCSConditionsStatCondAlg::SCT_DCSConditionsStatCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
@@ -75,14 +73,10 @@ StatusCode SCT_DCSConditionsStatCondAlg::execute(const EventContext& ctx) const
ATH_MSG_FATAL("Null pointer to the read conditions object (state)");
return StatusCode::FAILURE;
}
- // Get the validitiy range (state)
- EventIDRange rangeState;
- if (not readHandleState.range(rangeState)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleState.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandleState);
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandleState.fullKey() << " readCdo->size()= " << readCdoState->size());
- ATH_MSG_INFO("Range of state input is " << rangeState);
+ ATH_MSG_INFO("Range of state input is " << readHandleState.getRange());
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_DCSStatCondData> writeCdoState{std::make_unique<SCT_DCSStatCondData>()};
@@ -120,23 +114,11 @@ StatusCode SCT_DCSConditionsStatCondAlg::execute(const EventContext& ctx) const
ATH_MSG_FATAL("Null pointer to the read conditions object (HV)");
return StatusCode::FAILURE;
}
- // Get the validitiy range (HV)
- EventIDRange rangeHV;
- if (not readHandleHV.range(rangeHV)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleHV.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandleHV);
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandleHV.fullKey() << " readCdo->size()= " << readCdoHV->size());
- ATH_MSG_INFO("Range of HV input is " << rangeHV);
+ ATH_MSG_INFO("Range of HV input is " << readHandleHV.getRange());
- // Combined the validity ranges of state and range
- EventIDRange rangeIntersection{EventIDRange::intersect(rangeState, rangeHV)};
- if (rangeIntersection.stop().isValid() and rangeIntersection.start()>rangeIntersection.stop()) {
- ATH_MSG_FATAL("Invalid intersection range: " << rangeIntersection);
- return StatusCode::FAILURE;
- }
- rangeState = rangeIntersection;
-
std::string paramHV{"HVCHVOLT_RECV"};
CondAttrListCollection::const_iterator attrListHV{readCdoHV->begin()};
CondAttrListCollection::const_iterator endHV{readCdoHV->end()};
@@ -159,13 +141,13 @@ StatusCode SCT_DCSConditionsStatCondAlg::execute(const EventContext& ctx) const
}
// Record the output cond object
- if (writeHandle.record(rangeState, std::move(writeCdoState)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdoState)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_DCSStatCondData " << writeHandle.key()
- << " with EventRange " << rangeState
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeState << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx
index 36bbadd8562939d0776f40180438a33a31d66efc..99b5660225983cad3badaedbe625a69f4f59f252 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx
@@ -1,13 +1,11 @@
/*
- 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 "SCT_DCSConditionsTempCondAlg.h"
#include "Identifier/IdentifierHash.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_DCSConditionsTempCondAlg::SCT_DCSConditionsTempCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
@@ -59,14 +57,10 @@ StatusCode SCT_DCSConditionsTempCondAlg::execute(const EventContext& ctx) const
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- // Get the validitiy range
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of input is " << rangeW);
+ ATH_MSG_INFO("Range of input is " << readHandle.getRange());
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_DCSFloatCondData> writeCdo{std::make_unique<SCT_DCSFloatCondData>()};
@@ -89,13 +83,13 @@ StatusCode SCT_DCSConditionsTempCondAlg::execute(const EventContext& ctx) const
}
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_DCSFloatCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx
index 0d2f84a738e9a51101824399e6b528b98511cac0..20a4b7111c4798b234812cb7f29b825351fe0aae 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.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 "SCT_DetectorElementCondAlg.h"
@@ -60,7 +60,6 @@ StatusCode SCT_DetectorElementCondAlg::execute(const EventContext& ctx) const
// ____________ Construct new Write Cond Object ____________
std::unique_ptr<InDetDD::SiDetectorElementCollection> writeCdo{std::make_unique<InDetDD::SiDetectorElementCollection>()};
- EventIDRange rangeW;
// ____________ Get Read Cond Object ____________
SG::ReadCondHandle<GeoAlignmentStore> readHandle{m_readKey, ctx};
@@ -70,11 +69,8 @@ StatusCode SCT_DetectorElementCondAlg::execute(const EventContext& ctx) const
return StatusCode::FAILURE;
}
- // Define validity of the output cond object and record it
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
// ____________ Update writeCdo using readCdo ____________
std::map<const InDetDD::SiDetectorElement*, const InDetDD::SiDetectorElement*> oldToNewMap;
@@ -118,13 +114,13 @@ StatusCode SCT_DetectorElementCondAlg::execute(const EventContext& ctx) const
// Record WriteCondHandle
const std::size_t size{writeCdo->size()};
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " with size of " << size << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " with size of " << size << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingCondAlg.cxx
index 51305b06ebd0efb385bd2ad7c43e41a7fdc299d2..7ea5510383047670d230201a6295b87060cea7d3 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingCondAlg.cxx
@@ -1,11 +1,9 @@
/*
- 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 "SCT_LinkMaskingCondAlg.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_LinkMaskingCondAlg::SCT_LinkMaskingCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
@@ -51,14 +49,10 @@ StatusCode SCT_LinkMaskingCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- // Get the validitiy range
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of input is " << rangeW);
+ ATH_MSG_INFO("Range of input is " << readHandle.getRange());
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_ModuleVetoCondData> writeCdo{std::make_unique<SCT_ModuleVetoCondData>()};
@@ -77,13 +71,13 @@ StatusCode SCT_LinkMaskingCondAlg::execute(const EventContext& ctx) const {
if (writeCdo->size()>0) writeCdo->setFilled();
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
- ATH_MSG_FATAL("Could not record SCT_ModuleVetoCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
+ ATH_MSG_FATAL("Could not record SCT_ModuleVetoCondData " << writeHandle.key()
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.cxx
index f486d9ecb5ccdea89a188a16a59433387d177ac3..a4a56bb09187bc11c9c69615bebd7e65e41dc400 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.cxx
@@ -1,13 +1,11 @@
/*
- 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 "SCT_MajorityCondAlg.h"
#include "SCT_ConditionsData/SCT_ConditionsParameters.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_MajorityCondAlg::SCT_MajorityCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
@@ -60,12 +58,8 @@ StatusCode SCT_MajorityCondAlg::execute(const EventContext& ctx) const
}
ATH_MSG_INFO("Size of CondAttrListCollection readCdo->size()= " << readCdo->size());
- // Define validity of the output cond object
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
int numFilled{0};
@@ -115,13 +109,13 @@ StatusCode SCT_MajorityCondAlg::execute(const EventContext& ctx) const
writeCdo->setFilled(numFilled==SCT_ConditionsData::N_REGIONS);
// Record the out output Cond Object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_MajorityCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.cxx
index 704d9db46375294724bf5206f686be46f8b043fd..3f1aee326214b8bd6bc65352ac33deb61bd1c273 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.cxx
@@ -1,11 +1,9 @@
/*
- 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 "SCT_ModuleVetoCondAlg.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
namespace {
@@ -64,14 +62,10 @@ StatusCode SCT_ModuleVetoCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- // Get the validitiy range
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
ATH_MSG_INFO("Size of AthenaAttributeList " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of input is " << rangeW);
+ ATH_MSG_INFO("Range of input is " << readHandle.getRange());
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_ModuleVetoCondData> writeCdo{std::make_unique<SCT_ModuleVetoCondData>()};
@@ -86,13 +80,13 @@ StatusCode SCT_ModuleVetoCondAlg::execute(const EventContext& ctx) const {
}
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_ModuleVetoCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx
index 741864d403f0a4981163db4e7f7988381963a00c..896a9d79c70e5ab359ff9bf83e5901c7a5ce0a0b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx
@@ -1,13 +1,11 @@
/*
- 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 "SCT_MonitorCondAlg.h"
#include "InDetIdentifier/SCT_ID.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_MonitorCondAlg::SCT_MonitorCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
@@ -62,12 +60,8 @@ StatusCode SCT_MonitorCondAlg::execute(const EventContext& ctx) const
}
ATH_MSG_INFO("Size of CondAttrListCollection readCdo->size()= " << readCdo->size());
- // Define validity of the output cond obbject
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_MonitorCondData> writeCdo{std::make_unique<SCT_MonitorCondData>()};
@@ -86,13 +80,13 @@ StatusCode SCT_MonitorCondAlg::execute(const EventContext& ctx) const
}
// Record validity of the output cond obbject
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_MonitorCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx
index 24cac02111ee9e8784d4746e056b77b2336b4fb1..7e07294bc35086ed4be5ae54edab9665f3e830d0 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.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 "SCT_ReadCalibChipGainCondAlg.h"
@@ -9,8 +9,6 @@
#include "SCT_ConditionsData/SCT_ConditionsParameters.h"
#include "SCT_ConditionsTools/SCT_ReadCalibChipUtilities.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
using namespace SCT_ConditionsData;
@@ -62,14 +60,10 @@ StatusCode SCT_ReadCalibChipGainCondAlg::execute(const EventContext& ctx) const
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- // Get the validitiy range
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of input is " << rangeW);
+ ATH_MSG_INFO("Range of input is " << readHandle.getRange());
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_GainCalibData> writeCdo{std::make_unique<SCT_GainCalibData>()};
@@ -101,13 +95,13 @@ StatusCode SCT_ReadCalibChipGainCondAlg::execute(const EventContext& ctx) const
}
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_GainCalibData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx
index 6d08f85d889aee78991a5bf19bea0ac38f84c90c..2bd04aa4293586b2d8a2663f443d590066f5536c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.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 "SCT_ReadCalibChipNoiseCondAlg.h"
@@ -9,8 +9,6 @@
#include "SCT_ConditionsData/SCT_ConditionsParameters.h"
#include "SCT_ConditionsTools/SCT_ReadCalibChipUtilities.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <limits>
#include <memory>
@@ -63,14 +61,10 @@ StatusCode SCT_ReadCalibChipNoiseCondAlg::execute(const EventContext& ctx) const
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- // Get the validitiy range
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of input is " << rangeW);
+ ATH_MSG_INFO("Range of input is " << readHandle.getRange());
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_NoiseCalibData> writeCdo{std::make_unique<SCT_NoiseCalibData>()};
@@ -102,13 +96,13 @@ StatusCode SCT_ReadCalibChipNoiseCondAlg::execute(const EventContext& ctx) const
}
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_NoiseCalibData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx
index 99dce07c628fe3689836ca4d519bb0ba9b4ee990..5e950f6851a3ba2d87d4fc37066adf5869669c25 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.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 "SCT_ReadCalibDataCondAlg.h"
@@ -9,8 +9,6 @@
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "SCT_ConditionsData/SCT_ConditionsParameters.h"
-#include "GaudiKernel/EventIDRange.h"
-
// Include boost stuff
#include "boost/lexical_cast.hpp"
#include "boost/tokenizer.hpp"
@@ -163,19 +161,16 @@ StatusCode SCT_ReadCalibDataCondAlg::execute(const EventContext& ctx) const {
// Read Cond Handle
SG::ReadCondHandle<CondAttrListCollection> readHandle[NFEATURES]{{m_readKeyGain, ctx}, {m_readKeyNoise, ctx}};
const CondAttrListCollection* readCdo[NFEATURES]{*readHandle[GAIN], *readHandle[NOISE]};
- EventIDRange rangeR[NFEATURES];
for (unsigned int i{GAIN}; i<NFEATURES; i++) {
if (readCdo[i]==nullptr) {
ATH_MSG_FATAL("Null pointer to the read conditions object " << readHandle[i].key());
return StatusCode::FAILURE;
}
- // Get the validitiy range
- if (not readHandle[i].range(rangeR[i])) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle[i].key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandleData[i].addDependency(readHandle[i]);
+ writeHandleInfo.addDependency(readHandle[i]);
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle[i].fullKey() << " readCdo->size()= " << readCdo[i]->size());
- ATH_MSG_INFO("Range of input is " << rangeR[i]);
+ ATH_MSG_INFO("Range of input is " << readHandle[i].getRange());
}
// Get SCT_DetectorElementCollection
@@ -185,18 +180,10 @@ StatusCode SCT_ReadCalibDataCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL(m_SCTDetEleCollKey.fullKey() << " could not be retrieved");
return StatusCode::FAILURE;
}
- EventIDRange rangeDetEle;
- if (not sctDetEle.range(rangeDetEle)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << m_SCTDetEleCollKey.key());
- return StatusCode::FAILURE;
- }
-
- // Set range of output
- EventIDRange rangeW{EventIDRange::intersect(rangeR[GAIN], rangeR[NOISE], rangeDetEle)};
- if (rangeW.stop().isValid() and rangeW.start()>rangeW.stop()) {
- ATH_MSG_FATAL("Invalid intersection range: " << rangeW);
- return StatusCode::FAILURE;
+ for (unsigned int i{GAIN}; i<NFEATURES; i++) {
+ writeHandleData[i].addDependency(sctDetEle);
}
+ writeHandleInfo.addDependency(sctDetEle);
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_CalibDefectData> writeCdoData[NFEATURES]{nullptr, nullptr};
@@ -334,20 +321,20 @@ StatusCode SCT_ReadCalibDataCondAlg::execute(const EventContext& ctx) const {
// Record the output cond objects
ATH_MSG_DEBUG("There are " << writeCdoInfo->size() << " elements in " << writeHandleInfo.key());
- if (writeHandleInfo.record(rangeW, std::move(writeCdoInfo)).isFailure()) {
+ if (writeHandleInfo.record(std::move(writeCdoInfo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_AllGoodStripInfo " << writeHandleInfo.key()
- << " with EventRange " << rangeW << " into Conditions Store");
+ << " with EventRange " << writeHandleInfo.getRange() << " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandleInfo.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandleInfo.key() << " with range " << writeHandleInfo.getRange() << " into Conditions Store");
for (unsigned int i{GAIN}; i<NFEATURES; i++) {
ATH_MSG_DEBUG("There are " << writeCdoData[i]->size() << " elements in " << writeHandleData[i].key());
- if (writeHandleData[i].record(rangeW, std::move(writeCdoData[i])).isFailure()) {
+ if (writeHandleData[i].record(std::move(writeCdoData[i])).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_CalibDefectData " << writeHandleData[i].key()
- << " with EventRange " << rangeW << " into Conditions Store");
+ << " with EventRange " << writeHandleData[i].getRange() << " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandleData[i].key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandleData[i].key() << " with range " << writeHandleData[i].getRange() << " into Conditions Store");
}
return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsCondAlg.cxx
index 6da3407141a44d640442cf3ac114fdbcbf454915..65da127a83f2991b27c261c0f1e1d4a6f051012f 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsCondAlg.cxx
@@ -1,11 +1,9 @@
/*
- 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 "SCT_SensorsCondAlg.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_SensorsCondAlg::SCT_SensorsCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
@@ -59,12 +57,8 @@ StatusCode SCT_SensorsCondAlg::execute(const EventContext& ctx) const
}
ATH_MSG_INFO("Size of CondAttrListCollection readCdo->size()= " << readCdo->size());
- // Define validity of the output cond obbject
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_SensorsCondData> writeCdo{std::make_unique<SCT_SensorsCondData>()};
@@ -94,13 +88,13 @@ StatusCode SCT_SensorsCondAlg::execute(const EventContext& ctx) const
}
// Record write conditions data object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_SensorsCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx
index aede71257d79e0cda5e8bbd1fbf4fcf7e9668de7..edcb07403afa94bd32f410cfe0aee17e47cb3735 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.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 "SCT_SiliconHVCondAlg.h"
@@ -7,8 +7,6 @@
#include "Identifier/IdentifierHash.h"
#include "InDetIdentifier/SCT_ID.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_SiliconHVCondAlg::SCT_SiliconHVCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
@@ -61,14 +59,8 @@ StatusCode SCT_SiliconHVCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- EventIDRange rangeHV;
- if (not readHandleHV.range(rangeHV)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleHV.key());
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Input is " << readHandleHV.fullKey() << " with the range of " << rangeHV);
-
- EventIDRange rangeW{rangeHV};
+ writeHandle.addDependency(readHandleHV);
+ ATH_MSG_INFO("Input is " << readHandleHV.fullKey() << " with the range of " << readHandleHV.getRange());
if (m_useState.value()) {
// Read Cond Handle (state)
@@ -78,19 +70,8 @@ StatusCode SCT_SiliconHVCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- EventIDRange rangeState;
- if (not readHandleState.range(rangeState)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleState.key());
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Input is " << readHandleState.fullKey() << " with the range of " << rangeState);
-
- // Combined the validity ranges of state and range
- rangeW = EventIDRange::intersect(rangeState, rangeHV);
- if (rangeW.stop().isValid() and rangeW.start()>rangeW.stop()) {
- ATH_MSG_FATAL("Invalid intersection range: " << rangeW);
- return StatusCode::FAILURE;
- }
+ writeHandle.addDependency(readHandleState);
+ ATH_MSG_INFO("Input is " << readHandleState.fullKey() << " with the range of " << readHandleState.getRange());
}
// Construct the output Cond Object and fill it in
@@ -101,13 +82,13 @@ StatusCode SCT_SiliconHVCondAlg::execute(const EventContext& ctx) const {
}
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_DCSFloatCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx
index 9fd090524a17f07db2a0bdd4fdcdcb93f94d9ee5..c94f1a233c1fc3b8f2c90eb95f9366ef048aa079 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.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 "SCT_SiliconTempCondAlg.h"
@@ -7,8 +7,6 @@
#include "Identifier/IdentifierHash.h"
#include "InDetIdentifier/SCT_ID.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_SiliconTempCondAlg::SCT_SiliconTempCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
@@ -61,14 +59,8 @@ StatusCode SCT_SiliconTempCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- EventIDRange rangeTemp0;
- if (not readHandleTemp0.range(rangeTemp0)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleTemp0.key());
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Input is " << readHandleTemp0.fullKey() << " with the range of " << rangeTemp0);
-
- EventIDRange rangeW{rangeTemp0};
+ writeHandle.addDependency(readHandleTemp0);
+ ATH_MSG_INFO("Input is " << readHandleTemp0.fullKey() << " with the range of " << readHandleTemp0.getRange());
if (m_useState.value()) {
// Read Cond Handle (state)
@@ -78,19 +70,8 @@ StatusCode SCT_SiliconTempCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- EventIDRange rangeState;
- if (not readHandleState.range(rangeState)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleState.key());
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Input is " << readHandleState.fullKey() << " with the range of " << rangeState);
-
- // Combined the validity ranges of state and range
- rangeW = EventIDRange::intersect(rangeState, rangeTemp0);
- if (rangeW.stop().isValid() and rangeW.start()>rangeW.stop()) {
- ATH_MSG_FATAL("Invalid intersection range: " << rangeW);
- return StatusCode::FAILURE;
- }
+ writeHandle.addDependency(readHandleState);
+ ATH_MSG_INFO("Input is " << readHandleState.fullKey() << " with the range of " << readHandleState.getRange());
}
// Construct the output Cond Object and fill it in
@@ -101,13 +82,13 @@ StatusCode SCT_SiliconTempCondAlg::execute(const EventContext& ctx) const {
}
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
- ATH_MSG_FATAL("Could not record SCT_DCSFloatCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
+ ATH_MSG_FATAL("Could not record SCT_DCSFloatCondData " << writeHandle.key()
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
index 58f36c223860008cc9ebd9ad38041df8d54ede4f..7b31286419979913ad84d66fd38c197a9f6560fe 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
@@ -1,13 +1,11 @@
/*
- 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 "SCT_TdaqEnabledCondAlg.h"
#include "Identifier/IdentifierHash.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <memory>
SCT_TdaqEnabledCondAlg::SCT_TdaqEnabledCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/InnerDetector/InDetConditions/SiPropertiesTool/src/SCTSiPropertiesCondAlg.cxx b/InnerDetector/InDetConditions/SiPropertiesTool/src/SCTSiPropertiesCondAlg.cxx
index 8a5f159ecba266d20226a166d521010b4ea1b24f..168c7ea51edcd11982b3de9d43706d81cf0a5de4 100644
--- a/InnerDetector/InDetConditions/SiPropertiesTool/src/SCTSiPropertiesCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SiPropertiesTool/src/SCTSiPropertiesCondAlg.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 "SCTSiPropertiesCondAlg.h"
@@ -8,8 +8,6 @@
#include "InDetIdentifier/SCT_ID.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
-#include "GaudiKernel/EventIDRange.h"
-
#include <cmath>
#include <memory>
@@ -65,12 +63,8 @@ StatusCode SCTSiPropertiesCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- EventIDRange rangeTemp;
- if (not readHandleTemp.range(rangeTemp)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleTemp.key());
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Input is " << readHandleTemp.fullKey() << " with the range of " << rangeTemp);
+ writeHandle.addDependency(readHandleTemp);
+ ATH_MSG_INFO("Input is " << readHandleTemp.fullKey() << " with the range of " << readHandleTemp.getRange());
// Read Cond Handle (HV)
SG::ReadCondHandle<SCT_DCSFloatCondData> readHandleHV{m_readKeyHV, ctx};
@@ -79,19 +73,8 @@ StatusCode SCTSiPropertiesCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- EventIDRange rangeHV;
- if (not readHandleHV.range(rangeHV)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleHV.key());
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Input is " << readHandleHV.fullKey() << " with the range of " << rangeHV);
-
- // Combined the validity ranges of temp and HV (timestamp IOV)
- EventIDRange rangeW{EventIDRange::intersect(rangeTemp, rangeHV)};
- if (rangeW.stop().isValid() and rangeW.start()>rangeW.stop()) {
- ATH_MSG_FATAL("Invalid intersection range: " << rangeW);
- return StatusCode::FAILURE;
- }
+ writeHandle.addDependency(readHandleHV);
+ ATH_MSG_INFO("Input is " << readHandleHV.fullKey() << " with the range of " << readHandleHV.getRange());
// Get SCT_DetectorElementCollection
SG::ReadCondHandle<InDetDD::SiDetectorElementCollection> sctDetEle(m_SCTDetEleCollKey, ctx);
@@ -100,11 +83,7 @@ StatusCode SCTSiPropertiesCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL(m_SCTDetEleCollKey.fullKey() << " could not be retrieved");
return StatusCode::FAILURE;
}
- EventIDRange rangeDetEle; // Run-LB IOV
- if (not sctDetEle.range(rangeDetEle)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << m_SCTDetEleCollKey.key());
- return StatusCode::FAILURE;
- }
+ writeHandle.addDependency(sctDetEle);
// Construct the output Cond Object and fill it in
std::unique_ptr<InDet::SiliconPropertiesVector> writeCdo{std::make_unique<InDet::SiliconPropertiesVector>()};
@@ -141,13 +120,13 @@ StatusCode SCTSiPropertiesCondAlg::execute(const EventContext& ctx) const {
}
// Record the output cond object
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_DCSFloatCondData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.cxx
index 3c877d7572531dd3c1c705816f7e8e1f46a2287d..bb2a8ca2828ae54a670acc14228bba1ae14383db 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.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
*/
/**
@@ -22,9 +22,6 @@
#include "Identifier/Identifier.h"
#include "Identifier/IdentifierHash.h"
-// Gaudi include
-#include "GaudiKernel/EventIDRange.h"
-
//STL
#include <algorithm>
#include <iostream>
@@ -362,33 +359,11 @@ SCT_CablingCondAlgFromCoraCool::execute(const EventContext& ctx) const {
return StatusCode::FAILURE;
}
- // Get the validitiy ranges
- EventIDRange rangeRod;
- if (not readHandleRod.range(rangeRod)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleRod.key());
- return StatusCode::FAILURE;
- }
- EventIDRange rangeRodMur;
- if (not readHandleRodMur.range(rangeRodMur)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleRodMur.key());
- return StatusCode::FAILURE;
- }
- EventIDRange rangeMur;
- if (not readHandleMur.range(rangeMur)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleMur.key());
- return StatusCode::FAILURE;
- }
- EventIDRange rangeGeo;
- if (not readHandleGeo.range(rangeGeo)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandleGeo.key());
- return StatusCode::FAILURE;
- }
- // Define validity of the output cond obbject and record it
- EventIDRange rangeW{EventIDRange::intersect(rangeRod, rangeRodMur, rangeMur, rangeGeo)};
- if(rangeW.stop().isValid() and rangeW.start()>rangeW.stop()) {
- ATH_MSG_FATAL("Invalid intersection range: " << rangeW << " " << rangeRod << " " << rangeRodMur << " " << rangeMur << " " << rangeGeo);
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandleRod);
+ writeHandle.addDependency(readHandleRodMur);
+ writeHandle.addDependency(readHandleMur);
+ writeHandle.addDependency(readHandleGeo);
// Construct the output Cond Object and fill it in
std::unique_ptr<SCT_CablingData> writeCdo{std::make_unique<SCT_CablingData>()};
@@ -508,13 +483,13 @@ SCT_CablingCondAlgFromCoraCool::execute(const EventContext& ctx) const {
}
}
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record SCT_CablingData " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
const int robLo{*(tempRobSet2.cbegin())};
const int robHi{*(tempRobSet2.crbegin())};
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiElementPropertiesTableCondAlg.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiElementPropertiesTableCondAlg.cxx
index 71d77bda01eb7c80496d3b1ac5e06363308de02f..309ff9c28e0d0db3e9df9385ba6d28dfb841e66d 100644
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiElementPropertiesTableCondAlg.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiElementPropertiesTableCondAlg.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 "SiElementPropertiesTableCondAlg.h"
@@ -59,12 +59,8 @@ namespace InDet {
return StatusCode::FAILURE;
}
- // Define validity of the output cond object and record it
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
// ____________ Construct new Write Cond Object ____________
std::unique_ptr<InDet::SiElementPropertiesTable> writeCdo{std::make_unique<InDet::SiElementPropertiesTable>(*m_idHelper, *readCdo, m_epsWidth)};
@@ -72,13 +68,13 @@ namespace InDet {
// ____________ Fill writeCdo using readCdo ____________
// Record WriteCondHandle
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into ConditionStore");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into ConditionStore");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.cxx
index 9831f0d1300e0796a97561415b9d88f98e962cec..121699b95baa85a0167ad614cd86c75cdbc6f2e8 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.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 "SiDetElementBoundaryLinksCondAlg_xk.h"
@@ -57,12 +57,8 @@ namespace InDet {
return StatusCode::FAILURE;
}
- // Define validity of the output cond object and record it
- EventIDRange rangeW;
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
+ // Add dependency
+ writeHandle.addDependency(readHandle);
// ____________ Construct new Write Cond Object ____________
// Copied from
@@ -75,13 +71,13 @@ namespace InDet {
}
// Record WriteCondHandle
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into ConditionStore");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into ConditionStore");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadCondAlg_xk.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadCondAlg_xk.cxx
index b20c0114af82c68d064d58c86f07ada67e7563c8..987e109dbc8fd085c5a5c97103e0c57a4a13dad5 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadCondAlg_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadCondAlg_xk.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 "SiDetElementsRoadCondAlg_xk.h"
@@ -74,7 +74,6 @@ StatusCode InDet::SiDetElementsRoadCondAlg_xk::execute(const EventContext& ctx)
std::vector<const InDetDD::SiDetectorElement*> pW[3];
- EventIDRange rangePixel;
if (m_usePIX) {
// Loop over each wafer of pixels
SG::ReadCondHandle<InDetDD::SiDetectorElementCollection> pixelDetEleHandle(m_pixelDetEleCollKey, ctx);
@@ -89,13 +88,9 @@ StatusCode InDet::SiDetElementsRoadCondAlg_xk::execute(const EventContext& ctx)
else pW[0].push_back(s); // Left endcap
}
- if (not pixelDetEleHandle.range(rangePixel)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << pixelDetEleHandle.key());
- return StatusCode::FAILURE;
- }
+ writeHandle.addDependency(pixelDetEleHandle);
}
- EventIDRange rangeSct;
if (m_useSCT) {
// Loop over each wafer of sct
SG::ReadCondHandle<InDetDD::SiDetectorElementCollection> sctDetEleHandle(m_SCTDetEleCollKey, ctx);
@@ -110,10 +105,7 @@ StatusCode InDet::SiDetElementsRoadCondAlg_xk::execute(const EventContext& ctx)
else pW[0].push_back(s); // Left endcap
}
- if (not sctDetEleHandle.range(rangeSct)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << sctDetEleHandle.key());
- return StatusCode::FAILURE;
- }
+ writeHandle.addDependency(sctDetEleHandle);
}
int nel = pW[0].size()+pW[1].size()+pW[2].size();
@@ -206,14 +198,13 @@ StatusCode InDet::SiDetElementsRoadCondAlg_xk::execute(const EventContext& ctx)
}
}
- EventIDRange rangeW{EventIDRange::intersect(rangePixel, rangeSct)};
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record " << writeHandle.key()
- << " with EventRange " << rangeW
+ << " with EventRange " << writeHandle.getRange()
<< " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_INFO("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}