diff --git a/Det/DetCond/tests/options/dd4hep_check_db_access.py b/Det/DetCond/tests/options/dd4hep_check_db_access.py
index 2bcbed288fe6a8605f6ce921eb53aff68f519243..500dc2891e5ea85911ccc12a5754427416e101fd 100644
--- a/Det/DetCond/tests/options/dd4hep_check_db_access.py
+++ b/Det/DetCond/tests/options/dd4hep_check_db_access.py
@@ -24,9 +24,9 @@ LHCbApp().CondDBtag = "v1"
# This variable should be set by the test environment to the location
# of the test repository
DDDBConf().ConditionsRepository = os.environ["GIT_TEST_REPOSITORY"]
-if UseDD4Hep:
- from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
- DD4hepSvc().DetectorList = ["/world"]
+
+from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
+DD4hepSvc().DetectorList = ["/world"]
# Main application
##################
diff --git a/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access.qmt b/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access.qmt
index 9badb2bf70f0f193a48945092376ae896a99cc4a..df7f23ea09fa7cc46bb9902a8b7571a5e1aaf8cd 100644
--- a/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access.qmt
+++ b/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access.qmt
@@ -18,6 +18,7 @@
<text>../options/dd4hep_check_db_access.py</text>
</set></argument>
<argument name="reference"><text>../refs/dd4hep_check_db_access.ref</text></argument>
+<argument name="error_reference"><text>../refs/empty.ref</text></argument>
<argument name="validator"><text>
from GaudiConf.QMTest.LHCbExclusions import preprocessor as LHCbPreprocessor
preprocessor = (LHCbPreprocessor +
@@ -25,7 +26,6 @@ preprocessor = (LHCbPreprocessor +
r'^(Compact|Conditions)Loader',
r'^Statistics',
r'^LHCb::Det::LbDD',
- 'Changing system of units to ROOT units',
])
)
validateWithReference(preproc = preprocessor)
diff --git a/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access_bare.qmt b/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access_bare.qmt
index 76b09515d86a0015f05c3e19fc29538112233327..5e5fc996274918049bc8f561dcabe8d5ba224ded 100644
--- a/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access_bare.qmt
+++ b/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access_bare.qmt
@@ -16,6 +16,7 @@
<text>../options/new_cond_bare_repo.py</text>
</set></argument>
<argument name="reference"><text>../refs/dd4hep_check_db_access_bare.ref</text></argument>
+<argument name="error_reference"><text>../refs/empty.ref</text></argument>
<argument name="validator"><text>
from GaudiConf.QMTest.LHCbExclusions import preprocessor as LHCbPreprocessor
preprocessor = (LHCbPreprocessor +
@@ -23,7 +24,6 @@ preprocessor = (LHCbPreprocessor +
r'^(Compact|Conditions)Loader',
r'^Statistics',
r'^LHCb::Det::LbDD',
- 'Changing system of units to ROOT units',
])
)
validateWithReference(preproc = preprocessor)
diff --git a/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_conditions.qmt b/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_conditions.qmt
index 456b8de8287f86c5cf12194d82029e649e05194b..c9ff3a12f1502e00cbebad86b3fa7c3116b2e5e5 100644
--- a/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_conditions.qmt
+++ b/Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_conditions.qmt
@@ -15,13 +15,13 @@
<text>../options/dd4hep_cond.py</text>
</set></argument>
<argument name="reference"><text>../refs/dd4hep_conditions.ref</text></argument>
+<argument name="error_reference"><text>../refs/empty.ref</text></argument>
<argument name="validator"><text>
from GaudiConf.QMTest.LHCbExclusions import preprocessor as LHCbPreprocessor
preprocessor = (LHCbPreprocessor +
LineSkipper(regexps=[
r'^(Compact|Conditions)Loader',
r'^Statistics',
- 'Changing system of units to ROOT units',
])
)
validateWithReference(preproc = preprocessor
diff --git a/Det/DetCond/tests/refs/dd4hep_check_db_access.ref b/Det/DetCond/tests/refs/dd4hep_check_db_access.ref
index 22a47bc37ff5f6b434e6d4e3563285a78fca4c55..e05713f36bb6125fa1bdf3571035ecdd5a763feb 100644
--- a/Det/DetCond/tests/refs/dd4hep_check_db_access.ref
+++ b/Det/DetCond/tests/refs/dd4hep_check_db_access.ref
@@ -3,7 +3,7 @@ ApplicationMgr SUCCESS
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
ToolSvc.GitSIMC... FATAL Exception with tag=ToolSvc.GitSIMCOND is caught
-ToolSvc.GitSIMC... ERROR ToolSvc.GitSIMCOND cannot resolve commit v1: revspec 'v1' not found StatusCode=FAILURE
+ToolSvc.GitSIMC... ERROR ToolSvc.GitSIMCOND cannot resolve commit upgrade/v1: revspec 'upgrade/v1' not found StatusCode=FAILURE
ToolSvc ERROR Error initializing tool 'ToolSvc.GitSIMCOND'
DetectorPersist... INFO Added successfully Conversion service:XmlCnvSvc
DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml
@@ -11,15 +11,22 @@ EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr INFO Application Manager Started successfully
+ReserveIOVDD4hep INFO Loading conditions for Run 42
+DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml']
+DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml succesfully parsed with TinyXML .....
+DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml']
+DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml succesfully parsed with TinyXML .....
DD4hep WARNING ++ STD conditions NOT defined by client. NTP defaults taken.
CondAlg INFO condition value:
Validity: 0.0 -> 9223372036.854775807
(double) par1 = 1.3
(double) par2 = 2.1
+ReserveIOVDD4hep INFO Loading conditions for Run 62
CondAlg INFO condition value:
Validity: 0.0 -> 9223372036.854775807
(double) par1 = 100.6
(double) par2 = 101.7
+ReserveIOVDD4hep INFO Loading conditions for Run 82
CondAlg INFO condition value:
Validity: 0.0 -> 9223372036.854775807
(double) par1 = 1.3
diff --git a/Det/DetCond/tests/refs/dd4hep_check_db_access_bare.ref b/Det/DetCond/tests/refs/dd4hep_check_db_access_bare.ref
index 22a47bc37ff5f6b434e6d4e3563285a78fca4c55..e05713f36bb6125fa1bdf3571035ecdd5a763feb 100644
--- a/Det/DetCond/tests/refs/dd4hep_check_db_access_bare.ref
+++ b/Det/DetCond/tests/refs/dd4hep_check_db_access_bare.ref
@@ -3,7 +3,7 @@ ApplicationMgr SUCCESS
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
ToolSvc.GitSIMC... FATAL Exception with tag=ToolSvc.GitSIMCOND is caught
-ToolSvc.GitSIMC... ERROR ToolSvc.GitSIMCOND cannot resolve commit v1: revspec 'v1' not found StatusCode=FAILURE
+ToolSvc.GitSIMC... ERROR ToolSvc.GitSIMCOND cannot resolve commit upgrade/v1: revspec 'upgrade/v1' not found StatusCode=FAILURE
ToolSvc ERROR Error initializing tool 'ToolSvc.GitSIMCOND'
DetectorPersist... INFO Added successfully Conversion service:XmlCnvSvc
DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml
@@ -11,15 +11,22 @@ EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr INFO Application Manager Started successfully
+ReserveIOVDD4hep INFO Loading conditions for Run 42
+DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml']
+DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml succesfully parsed with TinyXML .....
+DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml']
+DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml succesfully parsed with TinyXML .....
DD4hep WARNING ++ STD conditions NOT defined by client. NTP defaults taken.
CondAlg INFO condition value:
Validity: 0.0 -> 9223372036.854775807
(double) par1 = 1.3
(double) par2 = 2.1
+ReserveIOVDD4hep INFO Loading conditions for Run 62
CondAlg INFO condition value:
Validity: 0.0 -> 9223372036.854775807
(double) par1 = 100.6
(double) par2 = 101.7
+ReserveIOVDD4hep INFO Loading conditions for Run 82
CondAlg INFO condition value:
Validity: 0.0 -> 9223372036.854775807
(double) par1 = 1.3
diff --git a/Det/DetCond/tests/refs/dd4hep_conditions.ref b/Det/DetCond/tests/refs/dd4hep_conditions.ref
index a125210050efa08d70a9bb711bc9beed6829b78c..8d33e524da7164f54744c8f32b699383e9ddbacf 100644
--- a/Det/DetCond/tests/refs/dd4hep_conditions.ref
+++ b/Det/DetCond/tests/refs/dd4hep_conditions.ref
@@ -2,15 +2,16 @@ ApplicationMgr SUCCESS
====================================================================================================================================
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-LHCb::Det::LbDD... INFO Loading DD4hep Geometry: .../test/DD4TESTCOND/geo.xml
+DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml']
+DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml succesfully parsed with TinyXML .....
+DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml']
+DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml succesfully parsed with TinyXML .....
DD4hep WARNING ++ STD conditions NOT defined by client. NTP defaults taken.
-LHCb::Det::LbDD... INFO Using conditions location: file://.../test/DD4TESTCOND/
-LHCb::Det::LbDD... INFO Using conditions tag: HEAD
-LHCb::Det::LbDD... INFO Using detector list: [/world]
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr INFO Application Manager Started successfully
+ReserveIOVDD4hep INFO Loading conditions for Run 42
CondAlg INFO condition value:
Validity: 0.0 -> 9223372036.854775807
(double) par1 = 1.3
@@ -25,6 +26,7 @@ condition value for level2 : {
p2: 4.2
v: 19.9204
}
+ReserveIOVDD4hep INFO Loading conditions for Run 62
CondAlg INFO condition value:
Validity: 0.0 -> 9223372036.854775807
(double) par1 = 0.6
@@ -39,6 +41,7 @@ condition value for level2 : {
p2: 3.4
v: 13.1092
}
+ReserveIOVDD4hep INFO Loading conditions for Run 82
CondAlg INFO condition value:
Validity: 0.0 -> 9223372036.854775807
(double) par1 = 1.3
diff --git a/Det/DetCond/tests/refs/empty.ref b/Det/DetCond/tests/refs/empty.ref
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py b/GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py
index a6390359ada8916b4486110fcb09b3e50f5337c5..31f74f4d0dae46bd6140f7bca96d98cd9bf56ab8 100755
--- a/GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py
+++ b/GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py
@@ -74,6 +74,7 @@ preprocessor = (
"INFO Using conditions tag",
"INFO Using detector list",
"INFO Loading DD4hep Geometry",
+ "Changing system of units to ROOT units",
],
regexps=[
r"HLTControlFlowMgr\s*INFO Memory pool:",