diff --git a/DDCore/src/AlignmentData.cpp b/DDCore/src/AlignmentData.cpp index 6ab67070cc86d390b7f511d7f1286c3f38caf7ed..25944ca67db16ae3124a36788695cc434ca875df 100644 --- a/DDCore/src/AlignmentData.cpp +++ b/DDCore/src/AlignmentData.cpp @@ -232,8 +232,10 @@ Alignment AlignmentData::nominal() const { // The map is used by the Alignments calculator typedef std::map<DetElement, Delta> DeltaMap; +// Have only a weak reference here! +inline ostream& operator << (ostream& s, const DetElement& ) { return s; } + #include "Parsers/Parsers.h" -DD4HEP_DEFINE_OSTREAM_DUMMY(DetElement) DD4HEP_DEFINE_PARSER_DUMMY(Delta) DD4HEP_DEFINE_PARSER_DUMMY(DeltaMap) DD4HEP_DEFINE_PARSER_DUMMY(AlignmentData) diff --git a/DDDB/include/Detector/DetectorElement.h b/DDDB/include/Detector/DetectorElement.h index e27e729e4b00e76ae49c2157f9b7d722f1dfc6ef..7af8f493407b1e4fa87ef4acfc542f8ed9337bb5 100644 --- a/DDDB/include/Detector/DetectorElement.h +++ b/DDDB/include/Detector/DetectorElement.h @@ -212,10 +212,10 @@ namespace gaudi { { return static_data().parameters; } /// Access single parameter const Parameter& param(const std::string& nam, bool throw_if_not_present=true) const - { return static_data().parameters.param(nam, throw_if_not_present); } + { return params().param(nam, throw_if_not_present); } /// Type dependent accessor to a named parameter template <typename T> T param(const std::string& nam, bool throw_if_not_present=true) const - { return static_data().parameters.param<T>(nam, throw_if_not_present); } + { return params().param<T>(nam, throw_if_not_present); } /// Access the parent detector element DetElement parent() const { return static_data().detector.parent(); } diff --git a/examples/DDDB/CMakeLists.txt b/examples/DDDB/CMakeLists.txt index a805bcb8c1980e9fe0b85d934648e69d41663a76..c84ec014127441deb0f87549403af18557342809 100644 --- a/examples/DDDB/CMakeLists.txt +++ b/examples/DDDB/CMakeLists.txt @@ -71,7 +71,7 @@ if (DD4HEP_USE_XERCESC) -config DD4hep_ConditionsManagerInstaller -exec DDDB_ConditionsSummary DEPENDS DDDB_extract_LONGTEST - REGEX_PASS "\\+ DDDB Total Number of parameters: 13650 " + REGEX_PASS "\\+ DDDB Total Number of parameters: 13642 " REGEX_FAIL "EXCEPTION;Exception" ) # @@ -137,7 +137,7 @@ if (DD4HEP_USE_XERCESC) -config DD4hep_ConditionsManagerInstaller -plugin DDDB_DetElementConditionDump -print DEBUG DEPENDS DDDB_extract_LONGTEST - REGEX_PASS "\\+ DDDB: Total number of DetElement parameters: 13144" + REGEX_PASS "\\+ DDDB: Total number of DetElement parameters: 13136" ) # #---Testing: Load the geometry + conditions + conditions derives @@ -147,7 +147,7 @@ if (DD4HEP_USE_XERCESC) -config DD4hep_ConditionsManagerInstaller -plugin DDDB_DerivedCondTest -print DEBUG DEPENDS DDDB_extract_LONGTEST - REGEX_PASS "\\+ DDDB: Total Number of callbacks: 16215" + REGEX_PASS "\\+ DDDB: Total Number of callbacks: 16221" REGEX_FAIL "EXCEPTION;Exception" ) # @@ -169,7 +169,7 @@ if (DD4HEP_USE_XERCESC) -config DD4hep_ConditionsManagerInstaller -plugin DDDB_AlignmentsAccessTest -print DEBUG DEPENDS DDDB_extract_LONGTEST - REGEX_PASS "\\+ DDDB: Accessed 5405 alignments from 5405 DetElement objects" + REGEX_PASS "\\+ DDDB: Accessed 5407 alignments from 5407 DetElement objects" REGEX_FAIL "EXCEPTION;Exception" ) #