From f4343fc0300fa69464fc8f1fe3a2eb0fc8cecac8 Mon Sep 17 00:00:00 2001 From: Markus Frank <Markus.Frank@cern.ch> Date: Thu, 1 Oct 2020 18:44:42 +0200 Subject: [PATCH] Fix to keep DetElement reference in the conditions dependency --- examples/AlignDet/CMakeLists.txt | 2 +- examples/Conditions/src/ConditionExampleObjects.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/AlignDet/CMakeLists.txt b/examples/AlignDet/CMakeLists.txt index 1c626dea6..1be5d87b1 100644 --- a/examples/AlignDet/CMakeLists.txt +++ b/examples/AlignDet/CMakeLists.txt @@ -115,7 +115,7 @@ dd4hep_add_test_reg( AlignDet_Telescope_readback_xml EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_AlignmentExample_read_xml -input file:${AlignDet_INSTALL}/compact/Telescope.xml -deltas file:./new_cond.xml - REGEX_PASS "52 conditions in slice. \\(T:33,S:33,L:0,C:0,M:0\\) Alignments accessed: 20 \\(A:19,M:0\\) for IOV:run\\(1\\)" + REGEX_PASS "40 conditions in slice. \\(T:21,S:21,L:0,C:0,M:0\\) Alignments accessed: 20 \\(A:19,M:0\\) for IOV:run\\(1\\)" REGEX_FAIL " ERROR ;EXCEPTION;Exception" ) # diff --git a/examples/Conditions/src/ConditionExampleObjects.cpp b/examples/Conditions/src/ConditionExampleObjects.cpp index 9fdac264d..a2789a5ec 100644 --- a/examples/Conditions/src/ConditionExampleObjects.cpp +++ b/examples/Conditions/src/ConditionExampleObjects.cpp @@ -155,9 +155,6 @@ int ConditionsDependencyCreator::operator()(DetElement de, int) const { DependencyBuilder build_1(de, target1.item_key(), call1); DependencyBuilder build_2(de, target2.item_key(), call2); DependencyBuilder build_3(de, target3.item_key(), call3); - //DependencyBuilder build_1(de, "derived_data/derived_1", call1); - //DependencyBuilder build_2(de, "derived_data/derived_2", call2); - //DependencyBuilder build_3(de, "derived_data/derived_3", call3); // Compute the derived stuff sbuild_1.add(key); -- GitLab