From 8c86375d2d24e0330261ecab54a8794eea907586 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Tue, 12 Jun 2018 18:26:16 +0000
Subject: [PATCH] IOVSvc+LArConditionsTest: Make output ordering more
predictable.
---
Control/IOVSvc/src/CondInputLoader.cxx | 13 ++++++-------
.../LArTest/LArConditionsTest/CMakeLists.txt | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Control/IOVSvc/src/CondInputLoader.cxx b/Control/IOVSvc/src/CondInputLoader.cxx
index 0d90d365001..a87ebb17dae 100644
--- a/Control/IOVSvc/src/CondInputLoader.cxx
+++ b/Control/IOVSvc/src/CondInputLoader.cxx
@@ -168,12 +168,12 @@ CondInputLoader::initialize()
std::ostringstream ost;
ost << "Adding base classes:";
- for (auto &e : handles_to_load) {
+ for (auto &e : sortedDataObjIDColl (handles_to_load)) {
// ignore empty keys
- if (e.key() == "") continue;
+ if (e->key() == "") continue;
- ost << "\n + " << e << " ->";
- CLID clid = e.clid();
+ ost << "\n + " << *e << " ->";
+ CLID clid = e->clid();
const SG::BaseInfoBase* bib = SG::BaseInfoBase::find( clid );
if ( ! bib ) {
ost << " no bases";
@@ -183,7 +183,7 @@ CondInputLoader::initialize()
std::string base("UNKNOWN");
m_clidSvc->getTypeNameOfID(clid2,base).ignore();
ost << " " << base << " (" << clid2 << ")";
- SG::VarHandleKey vhk(clid2,e.key(),Gaudi::DataHandle::Writer,
+ SG::VarHandleKey vhk(clid2,e->key(),Gaudi::DataHandle::Writer,
StoreID::storeName(StoreID::CONDITION_STORE));
m_load.emplace(vhk.fullKey());
}
@@ -250,9 +250,8 @@ CondInputLoader::start()
// us the trouble of stripping out the storename from the key later.
//
- DataObjIDColl::iterator ditr;
bool fail(false);
- for (ditr = m_handlesToCreate.begin(); ditr != m_handlesToCreate.end(); ++ditr) {
+ for (const DataObjID* ditr : sortedDataObjIDColl (m_handlesToCreate)) {
SG::VarHandleKey vhk(ditr->clid(),ditr->key(),Gaudi::DataHandle::Writer);
if ( ! m_condStore->contains<CondContBase>( vhk.key() ) ){
std::string tp("UNKNOWN");
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
index 1eae8b8dd0a..3114f7a8ddd 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
@@ -61,7 +61,7 @@ function (larconditions_run_test testName)
@ONLY )
atlas_add_test( ${testName}
SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/larconditions_${testName}.sh
- ENVIRONMENT ATLAS_REFERENCE_TAG=LArConditionsTest/LArConditionsTest-01-00-09
+ ENVIRONMENT ATLAS_REFERENCE_TAG=LArConditionsTest/LArConditionsTest-01-00-10
PROPERTIES TIMEOUT 1200
EXTRA_PATTERNS "Data source lookup|Resolved path|Failed to connect to service|Release number|Sorting algorithm|Failed to connect|Failure while attempting to connect|Reading file|^CORAL/|being retired|^Domain|INFO GeoModelSvc|locate catalog|Cache alignment|COOL_DISABLE|Failed to get ContainerHandle|^RalSessionMgr Info|^RelationalDatabase Info|Bootstrap.py"
)
--
GitLab