diff --git a/DDAlign/CMakeLists.txt b/DDAlign/CMakeLists.txt
index 7d6c72fba4adfe2ed83e69e023dc41cf2b81dc40..335029f7b7e6102b50f047be69c637d2526f1e78 100644
--- a/DDAlign/CMakeLists.txt
+++ b/DDAlign/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: $
#==========================================================================
# AIDA Detector description implementation for LCD
#--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentsManager.cpp b/DDAlign/src/AlignmentsManager.cpp
index bff4c8c4aab927c1c1f2a28b13bf00021bf4997f..49d6b33e30fddb846df6c859f099a2a3ee33cbca 100644
--- a/DDAlign/src/AlignmentsManager.cpp
+++ b/DDAlign/src/AlignmentsManager.cpp
@@ -107,7 +107,7 @@ AlignmentsManagerObject::~AlignmentsManagerObject() {
void AlignmentsManagerObject::to_world(AlignContext& new_alignments,
UserPool& pool,
DetElement det,
- TGeoHMatrix& delta) const
+ TGeoHMatrix& delta_to_world) const
{
using Conditions::Condition;
DetElement par = det.parent();
@@ -124,13 +124,13 @@ void AlignmentsManagerObject::to_world(AlignContext& new_alignments,
AlignmentCondition cond(e.cond);
AlignmentData& align = cond.data();
if ( s_PRINT <= INFO ) {
- printf("Multiply-left ALIGNMENT %s:", det.path().c_str()); delta.Print();
+ printf("Multiply-left ALIGNMENT %s:", det.path().c_str()); delta_to_world.Print();
printf(" with ALIGN(world) %s :", par.path().c_str());
align.worldDelta.Print();
}
- delta.MultiplyLeft(&align.worldDelta);
+ delta_to_world.MultiplyLeft(&align.worldDelta);
if ( s_PRINT <= INFO ) {
- printf(" Result :"); delta.Print();
+ printf(" Result :"); delta_to_world.Print();
}
return;
}
@@ -145,26 +145,26 @@ void AlignmentsManagerObject::to_world(AlignContext& new_alignments,
AlignmentCondition cond = pool.get(key);
AlignmentData& align = cond.data();
if ( s_PRINT <= INFO ) {
- printf("Multiply-left ALIGNMENT %s:", det.path().c_str()); delta.Print();
+ printf("Multiply-left ALIGNMENT %s:", det.path().c_str()); delta_to_world.Print();
printf(" with ALIGN(world) %s :", par.path().c_str());
align.worldDelta.Print();
}
- delta.MultiplyLeft(&align.worldDelta);
+ delta_to_world.MultiplyLeft(&align.worldDelta);
if ( s_PRINT <= INFO ) {
- printf(" Result :"); delta.Print();
+ printf(" Result :"); delta_to_world.Print();
}
return;
}
// There is no special alignment for this detector element.
// Hence to nominal (relative) transformation to the parent is valid
if ( s_PRINT <= INFO ) {
- printf("Multiply-left ALIGNMENT %s:", det.path().c_str()); delta.Print();
+ printf("Multiply-left ALIGNMENT %s:", det.path().c_str()); delta_to_world.Print();
printf(" with NOMINAL(det) %s :", par.path().c_str());
par.nominal().detectorTransformation().Print();
}
- delta.MultiplyLeft(&par.nominal().detectorTransformation());
+ delta_to_world.MultiplyLeft(&par.nominal().detectorTransformation());
if ( s_PRINT <= INFO ) {
- printf(" Result :"); delta.Print();
+ printf(" Result :"); delta_to_world.Print();
}
par = par.parent();
}
@@ -254,10 +254,11 @@ void AlignmentsManagerObject::compute(AlignContext& new_alignments, UserPool& po
TGeoHMatrix tr_delta;
AlignmentCondition cond = ent->cond;
AlignmentData& align = cond.data();
- printout(INFO,"ComputeAlignment",
- "============================== Compute transformation of %s ============================== ",
- det.path().c_str());
-
+ if ( s_PRINT <= INFO ) {
+ printout(INFO,"ComputeAlignment",
+ "============================== Compute transformation of %s ============================== ",
+ det.path().c_str());
+ }
ent->valid = 1;
computeDelta(cond, tr_delta);
align.worldDelta = tr_delta;
@@ -265,10 +266,12 @@ void AlignmentsManagerObject::compute(AlignContext& new_alignments, UserPool& po
align.worldTrafo = det.nominal().worldTransformation()*align.worldDelta;
align.detectorTrafo = det.nominal().detectorTransformation()*tr_delta;
align.trToWorld = Geometry::_transform(&align.worldDelta);
- printout(INFO,"ComputeAlignment","Level:%d Path:%s DetKey:%08X: Cond:%s key:%08X IOV:%s",
- det.level(), det.path().c_str(), det.key(),
- yes_no(has_cond), cond.key(), cond.iov().str().c_str());
if ( s_PRINT <= INFO ) {
+ printout(INFO,"ComputeAlignment","Level:%d Path:%s DetKey:%08X: Cond:%s key:%08X IOV:%s",
+ det.level(), det.path().c_str(), det.key(),
+ yes_no(has_cond), cond.key(), cond.iov().str().c_str());
+ }
+ if ( s_PRINT <= DEBUG ) {
printf("DetectorTrafo: '%s' -> '%s' ",det.path().c_str(), det.parent().path().c_str());
det.nominal().detectorTransformation().Print();
printf("Delta: '%s' ",det.path().c_str()); tr_delta.Print();
diff --git a/DDAlign/src/DDAlignForwardCall.cpp b/DDAlign/src/DDAlignForwardCall.cpp
index dcc558377137ab5ae14b0cbe7a2f65626b56fea9..9e62660f7fea4d9caddedeb991c05443120a46c8 100644
--- a/DDAlign/src/DDAlignForwardCall.cpp
+++ b/DDAlign/src/DDAlignForwardCall.cpp
@@ -23,7 +23,7 @@ using namespace DD4hep::Conditions;
Condition
Alignments::DDAlignForwardCall::operator()(const ConditionKey& key, const UpdateContext& context)
{
- const Data::Delta delta;
+ Data::Delta delta;
DetElement det = context.dependency.detector;
Condition c = AlignmentUpdateCall::handle(key, context, delta);
printout(INFO,"DDAlignForward","++ Building child alignment condition: %s Detector [%d]: %s [%p]",
diff --git a/DDAlign/src/plugins/AlignmentPlugins.cpp b/DDAlign/src/plugins/AlignmentPlugins.cpp
index 9d1329fbcb3d292217ed4ff761b1583048cd203c..d0f2843982966912cb35799ebb5aa0b6a98097e9 100644
--- a/DDAlign/src/plugins/AlignmentPlugins.cpp
+++ b/DDAlign/src/plugins/AlignmentPlugins.cpp
@@ -67,7 +67,7 @@ namespace {
arg_error = true;
}
}
-
+
if ( arg_error || output.empty() || path.empty() ) {
/// Help printout describing the basic command line interface
cout <<
@@ -78,7 +78,7 @@ namespace {
" the alignment file should be written. \n"
" -transactions Enable output transactions. \n"
"\tArguments given: " << arguments(argc,argv) << endl << flush;
- ::_exit(EINVAL);
+ ::exit(EINVAL);
}
printout(ALWAYS,"AlignmentWriter",
diff --git a/DDCond/CMakeLists.txt b/DDCond/CMakeLists.txt
index c9f75c550ee60b1ebce157d9f2b0abaec6513b0e..1c3a71ff129f9a1da44827c19e1e728a748b235e 100644
--- a/DDCond/CMakeLists.txt
+++ b/DDCond/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: $
#==========================================================================
# AIDA Detector description implementation for LCD
#--------------------------------------------------------------------------
diff --git a/DDCond/src/plugins/ConditionsPlugins.cpp b/DDCond/src/plugins/ConditionsPlugins.cpp
index 7e4deaf39c3991cab6ad993f3b9944c2a1b6986b..3cd2376ca5370c0c430626ad8e7af8438d6c9b1d 100644
--- a/DDCond/src/plugins/ConditionsPlugins.cpp
+++ b/DDCond/src/plugins/ConditionsPlugins.cpp
@@ -63,8 +63,7 @@ DECLARE_APPLY(DD4hep_ConditionsManagerInstaller,ddcond_install_cond_mgr)
// ======================================================================================
/// Plugin function: Dump of all Conditions pool with or without conditions
/**
- * Factory: DD4hep_ConditionsPoolDump: Dump pools only
- * Factory: DD4hep_ConditionsDump: Dump pools and conditions
+ * Factory: DD4hep_ConditionsPoolProcessor
*
* \author M.Frank
* \version 1.0
@@ -125,9 +124,10 @@ DECLARE_APPLY(DD4hep_ConditionsPoolProcessor,ddcond_conditions_pool_process)
static int ddcond_conditions_pool_print(lcdd_t& lcdd, bool print_conditions, int argc, char** argv) {
if ( argc > 0 ) {
for(int i=0; i<argc; ++i) {
- if ( 0 == ::strncmp(argv[i],"-processor",3) ) {
+ if ( argv[i] && 0 == ::strncmp(argv[i],"-processor",3) ) {
vector<char*> args;
- for(int j=i; j<argc && argv[j]; ++j) args.push_back(argv[j]);
+ for(int j=i; j<argc && argv[j] && 0 != ::strncmp(argv[i],"-end-processor",8); ++j)
+ args.push_back(argv[j]);
args.push_back(0);
return ddcond_conditions_pool_processor(lcdd,true,print_conditions,int(args.size()-1),&args[0]);
}
@@ -135,7 +135,7 @@ static int ddcond_conditions_pool_print(lcdd_t& lcdd, bool print_conditions, int
printout(WARNING,"DDCondProcessor","++ Found arguments in plugin call, "
"but could not make any sense of them....");
}
- const void* args[] = { "-processor", "DD4hepConditionsPrinter", 0};
+ const void* args[] = { "-processor", "DD4hep_ConditionsPrinter", 0};
return ddcond_conditions_pool_processor(lcdd,true,print_conditions,2,(char**)args);
}
@@ -399,7 +399,7 @@ static long ddcond_create_repository(lcdd_t& lcdd, int argc, char** argv) {
" name: factory name DD4hep_ConditionsCreateRepository \n\n"
" -output <string> Output file name. \n\n"
"\tArguments given: " << arguments(argc,argv) << endl << flush;
- ::_exit(EINVAL);
+ ::exit(EINVAL);
}
printout(INFO,"Conditions",
"+++ ConditionsRepository: Creating %s",output.c_str());
@@ -436,7 +436,7 @@ static long ddcond_dump_repository(lcdd_t& lcdd, int argc, char** argv) {
" name: factory name DD4hep_ConditionsDumpRepository \n\n"
" -input <string> Input file name. \n\n"
"\tArguments given: " << arguments(argc,argv) << endl << flush;
- ::_exit(EINVAL);
+ ::exit(EINVAL);
}
printout(INFO,"Conditions",
"+++ ConditionsRepository: Dumping %s",input.c_str());
@@ -491,7 +491,7 @@ static void* create_printer(Geometry::LCDD& lcdd, int argc,char** argv) {
" -pool Attach conditions user pool from \n"
" PluginTester instance attached to LCDD. \n\n"
"\tArguments given: " << arguments(argc,argv) << endl << flush;
- ::_exit(EINVAL);
+ ::exit(EINVAL);
}
DetElement world = lcdd.world();
printout(INFO,"Printer","World=%s [%p]",world.path().c_str(),world.ptr());
diff --git a/DDCond/src/plugins/ConditionsRepositoryParser.cpp b/DDCond/src/plugins/ConditionsRepositoryParser.cpp
index f8dd4a02930b9df4ddf7d161ee6b119570a97672..a8c68cc53330875cd10f1281e97f7c0cf2f2da57 100644
--- a/DDCond/src/plugins/ConditionsRepositoryParser.cpp
+++ b/DDCond/src/plugins/ConditionsRepositoryParser.cpp
@@ -31,11 +31,10 @@
// C/C++ include files
#include <stdexcept>
-/*
- * DD4hep namespace declaration
- */
+/// DD4hep namespace declaration
namespace DD4hep {
+ /// Ananymous local stuff only used in this module
namespace {
/// List of XML tags used by this parser
class iov;
@@ -79,9 +78,18 @@ using Geometry::Translation3D;
using Geometry::Position;
using Geometry::DetElement;
-
+/// Ananymous local stuff only used in this module
namespace {
+
+ /// Module print level
static PrintLevel s_parseLevel = DEBUG;
+
+ /// Local helper class to interprete XML conditions
+ /**
+ * \author M.Frank
+ * \version 1.0
+ * \date 01/11/2016
+ */
struct ConversionArg {
DetElement detector;
ConditionsPool* pool;
@@ -90,6 +98,13 @@ namespace {
{
}
};
+
+ /// Local helper class to interprete XML conditions
+ /**
+ * \author M.Frank
+ * \version 1.0
+ * \date 01/11/2016
+ */
struct CurrentDetector {
DetElement detector;
ConversionArg* arg;
@@ -105,6 +120,12 @@ namespace {
}
}
};
+ /// Local helper class to interprete XML conditions
+ /**
+ * \author M.Frank
+ * \version 1.0
+ * \date 01/11/2016
+ */
struct CurrentPool {
ConditionsPool* pool;
ConversionArg* arg;
@@ -119,6 +140,12 @@ namespace {
}
};
+ /// Local helper function to interprete XML conditions
+ /**
+ * \author M.Frank
+ * \version 1.0
+ * \date 01/11/2016
+ */
Condition create_condition(DetElement det, xml_h e) {
xml_dim_t elt(e);
string tag = elt.tag();
@@ -141,6 +168,13 @@ namespace {
ConditionsKeyAssign(det).addKey(cond.name());//.addKey(nam,cond.name());
return cond;
}
+
+ /// Local helper function to interprete XML conditions
+ /**
+ * \author M.Frank
+ * \version 1.0
+ * \date 01/11/2016
+ */
template <typename BINDER> Condition bind_condition(const BINDER& bnd,
DetElement det,
xml_h e,
@@ -156,10 +190,11 @@ namespace {
}
}
+/// DD4hep namespace declaration
namespace DD4hep {
- /** Convert iov_type repository objects
- *
+ /// Convert iov_type repository objects
+ /**
* \author M.Frank
* \version 1.0
* \date 01/04/2014
@@ -178,7 +213,6 @@ namespace DD4hep {
/// Convert iov repository objects
/**
- *
* \author M.Frank
* \version 1.0
* \date 01/04/2014
@@ -197,7 +231,6 @@ namespace DD4hep {
/// Convert manager repository objects
/**
- *
* \author M.Frank
* \version 1.0
* \date 01/04/2014
@@ -222,7 +255,6 @@ namespace DD4hep {
/// Convert rotation objects
/**
- *
* <rotation x="0.5" y="0" z="0"/>
*
* \author M.Frank
@@ -240,7 +272,6 @@ namespace DD4hep {
/// Convert position objects
/**
- *
* <position x="0.5" y="0" z="0"/>
*
* \author M.Frank
@@ -257,7 +288,6 @@ namespace DD4hep {
/// Convert pivot objects
/**
- *
* <pivot x="0.5" y="0" z="0"/>
*
* \author M.Frank
@@ -340,8 +370,8 @@ namespace DD4hep {
arg->manager.registerUnlocked(arg->pool, con);
}
- /** Convert alignment delta objects
- *
+ /// Convert alignment delta objects
+ /**
* A generic alignment transformation is defined by
* - a translation in 3D space identified in XML as a
* <position/> element
@@ -395,8 +425,8 @@ namespace DD4hep {
arg->manager.registerUnlocked(arg->pool, con);
}
- /** Convert detelement objects
- *
+ /// Convert detelement objects
+ /**
* \author M.Frank
* \version 1.0
* \date 01/04/2014
@@ -421,8 +451,8 @@ namespace DD4hep {
xml_coll_t(e,_UC(detelement)).for_each(Converter<detelement>(lcdd,param,optional));
}
- /** Convert repository objects
- *
+ /// Convert repository objects
+ /**
* \author M.Frank
* \version 1.0
* \date 01/04/2014
@@ -433,8 +463,8 @@ namespace DD4hep {
xml_coll_t(element,_UC(iov)).for_each(Converter<iov>(lcdd,param,optional));
}
- /** Convert any top level tag in the XML file
- *
+ /// Convert any top level tag in the XML file
+ /**
* \author M.Frank
* \version 1.0
* \date 01/04/2014
@@ -456,44 +486,43 @@ namespace DD4hep {
}
/// Convert alignment conditions entries
+ /**
+ * \author M.Frank
+ * \version 1.0
+ * \date 01/04/2014
+ */
template <> void Converter<conditions>::operator()(xml_h e) const {
xml_coll_t(e,_U(star)).for_each(Converter<arbitrary>(lcdd,param,optional));
}
}
-/** Basic entry point to set print level of this module.
+/// Basic entry point to set print level of this module.
+/**
* \author M.Frank
* \version 1.0
* \date 01/04/2014
*/
-static long setup_repository_loglevel(lcdd_t& lcdd, int argc, char** argv) {
+static long setup_repository_loglevel(lcdd_t& /* lcdd */, int argc, char** argv) {
if ( argc == 1 ) {
s_parseLevel = printLevel(argv[1]);
return 1;
}
+ except("ConditionsXMLRepositoryPrintLevel","++ Invalid plugin arguments: %s",
+ arguments(argc,argv).c_str());
return 0;
}
DECLARE_APPLY(DD4hep_ConditionsXMLRepositoryPrintLevel,setup_repository_loglevel)
#include "DD4hep/DD4hepUI.h"
-/** Basic entry point to read alignment conditions files
- *
-
-geoPluginRun -compact file:checkout/examples/AlignDet/compact/Telescope.xml -volmgr -destroy \
- -plugin DD4hepDetectorDump \
- -plugin DD4hepVolumeDump volids \
- -plugin DD4hepVolumeMgrTest all \
- -plugin DD4hep_ConditionsXMLRepositoryParser file:checkout/examples/Conditions/data/repository.xml \
- -plugin DD4hep_ConditionsPoolDump \
- -plugin DD4hep_DetElementConditionsDump
+/// Basic entry point to read alignment conditions files
+/**
* \author M.Frank
* \version 1.0
* \date 01/04/2014
*/
static long setup_repository_Conditions(lcdd_t& lcdd, int argc, char** argv) {
if ( argc == 1 ) {
- //xml_h e = xml_h::Elt_t(argv[0]);
DD4hepUI ui(lcdd);
string fname = argv[0];
ConditionsManager mgr = ui.conditionsMgr();
diff --git a/DDCond/src/plugins/ConditionsUserPool.cpp b/DDCond/src/plugins/ConditionsUserPool.cpp
index 7b65ed71b1c247620f4a72b1ee65d742a4fc0efb..9741a17bf7274bd20143c069522b4b0f9508f33f 100644
--- a/DDCond/src/plugins/ConditionsUserPool.cpp
+++ b/DDCond/src/plugins/ConditionsUserPool.cpp
@@ -134,9 +134,11 @@ ConditionsMappedUserPool<MAPPING>::~ConditionsMappedUserPool() {
template<typename MAPPING> inline Condition::Object*
ConditionsMappedUserPool<MAPPING>::i_findCondition(key_type key) const {
typename MAPPING::const_iterator i=m_conditions.find(key);
+#if 0
if ( i == m_conditions.end() ) {
- print("*");
+ print("*"); // This causes CTEST to bail out, due too much output!
}
+#endif
return i != m_conditions.end() ? (*i).second : 0;
}
diff --git a/DDCore/CMakeLists.txt b/DDCore/CMakeLists.txt
index fc02fff1c8639e9fa2ef149f46721f4a9531f4b9..d680fcd2126ccfdd5d3cedf5c89d51c75bebd589 100644
--- a/DDCore/CMakeLists.txt
+++ b/DDCore/CMakeLists.txt
@@ -1,5 +1,4 @@
#=================================================================================
-# $Id: $
#
# AIDA Detector description implementation for LCD
#---------------------------------------------------------------------------------
diff --git a/DDCore/src/Evaluator/Evaluator.cpp b/DDCore/src/Evaluator/Evaluator.cpp
index a787ca6831519d364268ba80776ee1ff7a9f2ebf..28656381297ec424c1c3c09c798432a84accfe68 100644
--- a/DDCore/src/Evaluator/Evaluator.cpp
+++ b/DDCore/src/Evaluator/Evaluator.cpp
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// ---------------------------------------------------------------------------
#include "XML/Evaluator.h"
@@ -14,6 +13,17 @@
#include <errno.h>
#include <stdlib.h> // for strtod()
+// Disable some diagnostics, which we know, but need to ignore
+#ifdef __GNUC__
+/* This is OK:
+../DDCore/src/Evaluator/Evaluator.cpp: In function 'int engine(pchar, pchar, double&, char*&, const dic_type&)':
+../DDCore/src/Evaluator/Evaluator.cpp:164:23: warning: 'pp[3]' may be used uninitialized in this function [-Wmaybe-uninitialized]
+ result = (*fcn.f4)(pp[3],pp[2],pp[1],pp[0]);
+....
+ */
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
//---------------------------------------------------------------------------
struct Item {
enum { UNKNOWN, VARIABLE, EXPRESSION, FUNCTION, STRING } what;
diff --git a/DDCore/src/ObjectPrintout.cpp b/DDCore/src/ObjectPrintout.cpp
index 19827822495ea6f2e0a9410545f0a6412d6da0ee..a9201c711b7155eee183a140524391635f5e49ee 100644
--- a/DDCore/src/ObjectPrintout.cpp
+++ b/DDCore/src/ObjectPrintout.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/Primitives.cpp b/DDCore/src/Primitives.cpp
index e61ed5372121670fb12875c0f7be70539a80ff81..32eb287bbb9386852904d8f407b4ceb26bae2fcd 100644
--- a/DDCore/src/Primitives.cpp
+++ b/DDCore/src/Primitives.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/Printout.cpp b/DDCore/src/Printout.cpp
index c342ba62eac741405f1f53db11911adbde58edee..8310a17d167fb6cfbd6ae0ba3521fcf46a9c9d3c 100644
--- a/DDCore/src/Printout.cpp
+++ b/DDCore/src/Printout.cpp
@@ -89,9 +89,9 @@ namespace {
/// Helper function to serialize argument list to a single string
/**
- * @arg argc [int,read-only] Number of arguments.
- * @arg argv [char**,read-only] Argument strings
- * @return String containing the concatenated arguments
+ * \arg argc [int,read-only] Number of arguments.
+ * \arg argv [char**,read-only] Argument strings
+ * \return String containing the concatenated arguments
*/
string DD4hep::arguments(int argc, char** argv) {
stringstream str;
@@ -103,10 +103,10 @@ string DD4hep::arguments(int argc, char** argv) {
}
/** Calls the display action
- * @arg severity [int,read-only] Display severity flag
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg severity [int,read-only] Display severity flag
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::printout(PrintLevel severity, const char* src, const char* fmt, ...) {
if (severity >= print_lvl) {
@@ -119,10 +119,10 @@ int DD4hep::printout(PrintLevel severity, const char* src, const char* fmt, ...)
}
/** Calls the display action
- * @arg severity [int,read-only] Display severity flag
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg severity [int,read-only] Display severity flag
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::printout(PrintLevel severity, const string& src, const char* fmt, ...) {
if (severity >= print_lvl) {
@@ -135,10 +135,10 @@ int DD4hep::printout(PrintLevel severity, const string& src, const char* fmt, ..
}
/** Calls the display action
- * @arg severity [int,read-only] Display severity flag
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg severity [int,read-only] Display severity flag
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::printout(PrintLevel severity, const char* src, const string& fmt, ...) {
if (severity >= print_lvl) {
@@ -151,10 +151,10 @@ int DD4hep::printout(PrintLevel severity, const char* src, const string& fmt, ..
}
/** Calls the display action
- * @arg severity [int,read-only] Display severity flag
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg severity [int,read-only] Display severity flag
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::printout(PrintLevel severity, const string& src, const string& fmt, ...) {
if (severity >= print_lvl) {
@@ -167,10 +167,10 @@ int DD4hep::printout(PrintLevel severity, const string& src, const string& fmt,
}
/** Calls the display action
- * @arg severity [int,read-only] Display severity flag
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg severity [int,read-only] Display severity flag
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::printout(PrintLevel severity, const char* src, const char* fmt, va_list& args) {
if (severity >= print_lvl) {
@@ -180,39 +180,39 @@ int DD4hep::printout(PrintLevel severity, const char* src, const char* fmt, va_l
}
/** Calls the display action
- * @arg severity [int,read-only] Display severity flag
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg severity [int,read-only] Display severity flag
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::printout(PrintLevel severity, const string& src, const char* fmt, va_list& args) {
return printout(severity, src.c_str(), fmt, args);
}
/** Calls the display action
- * @arg severity [int,read-only] Display severity flag
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg severity [int,read-only] Display severity flag
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::printout(PrintLevel severity, const char* src, const string& fmt, va_list& args) {
return printout(severity, src, fmt.c_str(), args);
}
/** Calls the display action
- * @arg severity [int,read-only] Display severity flag
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg severity [int,read-only] Display severity flag
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::printout(PrintLevel severity, const string& src, const string& fmt, va_list& args) {
return printout(severity, src.c_str(), fmt.c_str(), args);
}
/** Calls the display action with ERROR and throws an std::runtime_error exception
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::except(const string& src, const string& fmt, ...) {
va_list args;
@@ -221,9 +221,9 @@ int DD4hep::except(const string& src, const string& fmt, ...) {
}
/** Calls the display action with ERROR and throws an std::runtime_error exception
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
int DD4hep::except(const char* src, const char* fmt, ...) {
va_list args;
@@ -232,10 +232,10 @@ int DD4hep::except(const char* src, const char* fmt, ...) {
}
/** Calls the display action with ERROR and throws an std::runtime_error exception
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @arg args [ap_list,read-only] List with variable number of arguments to fill format string.
- * @return Status code indicating success or failure
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \arg args [ap_list,read-only] List with variable number of arguments to fill format string.
+ * \return Status code indicating success or failure
*/
int DD4hep::except(const string& src, const string& fmt, va_list& args) {
string msg = __format(fmt.c_str(), args);
@@ -246,10 +246,10 @@ int DD4hep::except(const string& src, const string& fmt, va_list& args) {
}
/** Calls the display action with ERROR and throws an std::runtime_error exception
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @arg args [ap_list,read-only] List with variable number of arguments to fill format string.
- * @return Status code indicating success or failure
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \arg args [ap_list,read-only] List with variable number of arguments to fill format string.
+ * \return Status code indicating success or failure
*/
int DD4hep::except(const char* src, const char* fmt, va_list& args) {
string msg = __format(fmt, args);
@@ -260,9 +260,9 @@ int DD4hep::except(const char* src, const char* fmt, va_list& args) {
}
/** Build exception string
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
string DD4hep::format(const string& src, const string& fmt, ...) {
va_list args;
@@ -273,9 +273,9 @@ string DD4hep::format(const string& src, const string& fmt, ...) {
}
/** Build exception string
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @return Status code indicating success or failure
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \return Status code indicating success or failure
*/
string DD4hep::format(const char* src, const char* fmt, ...) {
va_list args;
@@ -286,20 +286,20 @@ string DD4hep::format(const char* src, const char* fmt, ...) {
}
/** Build exception string and throw std::runtime_error
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @arg args [ap_list,read-only] List with variable number of arguments to fill format string.
- * @return Status code indicating success or failure
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \arg args [ap_list,read-only] List with variable number of arguments to fill format string.
+ * \return Status code indicating success or failure
*/
string DD4hep::format(const string& src, const string& fmt, va_list& args) {
return format(src.c_str(), fmt.c_str(), args);
}
/** Build exception string and throw std::runtime_error
- * @arg src [string,read-only] Information source (component, etc.)
- * @arg fmt [string,read-only] Format string for ellipsis args
- * @arg args [ap_list,read-only] List with variable number of arguments to fill format string.
- * @return Status code indicating success or failure
+ * \arg src [string,read-only] Information source (component, etc.)
+ * \arg fmt [string,read-only] Format string for ellipsis args
+ * \arg args [ap_list,read-only] List with variable number of arguments to fill format string.
+ * \return Status code indicating success or failure
*/
string DD4hep::format(const char* src, const char* fmt, va_list& args) {
char str[4096];
diff --git a/DDCore/src/Readout.cpp b/DDCore/src/Readout.cpp
index 4b487831c9068edd7b4b5860ef104f37fd0693b4..2d83926ff9b67ba6e61d4f7a2de24d5435798da0 100644
--- a/DDCore/src/Readout.cpp
+++ b/DDCore/src/Readout.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/SegmentationsInterna.cpp b/DDCore/src/SegmentationsInterna.cpp
index 78591ba84f66d7145db51073d52d9bdd4436de6e..03fb1a3bd3568588486e864d5119f400586edbcc 100644
--- a/DDCore/src/SegmentationsInterna.cpp
+++ b/DDCore/src/SegmentationsInterna.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/SimpleGDMLWriter.cpp b/DDCore/src/SimpleGDMLWriter.cpp
index 510857621bd1b0c8f5b068e1e32b49b29fc2836e..ab01dbe141bfd0b0b161232e1eab26c2efbbeaa3 100644
--- a/DDCore/src/SimpleGDMLWriter.cpp
+++ b/DDCore/src/SimpleGDMLWriter.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/SimpleGDMLWriter.h b/DDCore/src/SimpleGDMLWriter.h
index 75e01d6a7e24eef3f884efd9b00dd9cc4ff4bc11..53bcac151ff641fc3243ec6f794365be9d309aa5 100644
--- a/DDCore/src/SimpleGDMLWriter.h
+++ b/DDCore/src/SimpleGDMLWriter.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/SurfaceInstaller.cpp b/DDCore/src/SurfaceInstaller.cpp
index 2bb57836701e73d033119e2ff8b478b080ee7e63..6abb56218f594af1b71e0ff7eaf4df63e85913f1 100644
--- a/DDCore/src/SurfaceInstaller.cpp
+++ b/DDCore/src/SurfaceInstaller.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/ToStream.cpp b/DDCore/src/ToStream.cpp
index 4567f7f05c05e35309d69a98e60fbf05e374b8e4..a2ead899cf98a58b02a70d6a32b818696514de16 100644
--- a/DDCore/src/ToStream.cpp
+++ b/DDCore/src/ToStream.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/VolumeManager.cpp b/DDCore/src/VolumeManager.cpp
index f4bcd766ba53a495d1d0ae04f19f391e831aa5fd..903a1d4f38a3b7f67c21c6772e8b60c72bb98060 100644
--- a/DDCore/src/VolumeManager.cpp
+++ b/DDCore/src/VolumeManager.cpp
@@ -1,4 +1,3 @@
-// $Id:$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/VolumeManagerInterna.cpp b/DDCore/src/VolumeManagerInterna.cpp
index 4fcdbd245913909f7e1567bccb5df4dcc83b2370..8e0d0f05e8149ea02f93429fab89e823a5f15131 100644
--- a/DDCore/src/VolumeManagerInterna.cpp
+++ b/DDCore/src/VolumeManagerInterna.cpp
@@ -1,4 +1,3 @@
-// $Id:$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/Volumes.cpp b/DDCore/src/Volumes.cpp
index 6ff311e07c82cbb0045e235f3ed8caa84bb3f7b0..ea66ff0461ae071dfbe3fab933cc089c478f6820 100644
--- a/DDCore/src/Volumes.cpp
+++ b/DDCore/src/Volumes.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp
index 424e13be38316ef2964bd13d571f5c7632babf03..58b7a48d612b03e0893bee7d80f07388dee78faa 100644
--- a/DDCore/src/plugins/Compact2Objects.cpp
+++ b/DDCore/src/plugins/Compact2Objects.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/GeometryWalk.cpp b/DDCore/src/plugins/GeometryWalk.cpp
index ffffcabe13f64974d15331e6ae17b60aa504d7be..d93204294d435edf2931175e83ebfb3a08c21c72 100644
--- a/DDCore/src/plugins/GeometryWalk.cpp
+++ b/DDCore/src/plugins/GeometryWalk.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/LCDD2Output.cpp b/DDCore/src/plugins/LCDD2Output.cpp
index a691c6bac8e6577a0cb10626962aa0ffd704accc..de36bd8824657639354f2f5d4b990c79dbe8635f 100644
--- a/DDCore/src/plugins/LCDD2Output.cpp
+++ b/DDCore/src/plugins/LCDD2Output.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/StandardPlugins.cpp b/DDCore/src/plugins/StandardPlugins.cpp
index 2e546c197639d3e223dc3a70c01649f493695500..0c6d39486efe2229977b9ed2bd46b9346907e073 100644
--- a/DDCore/src/plugins/StandardPlugins.cpp
+++ b/DDCore/src/plugins/StandardPlugins.cpp
@@ -465,12 +465,12 @@ template <int flag> long dump_detelement_tree(LCDD& lcdd, int argc, char** argv)
char fmt[128];
switch(value) {
case 0:
- ::snprintf(fmt,sizeof(fmt),"%03d %%-%ds %%s #Dau:%%d VolID:%%08X Place:%%p %%c",level+1,2*level+1);
+ ::snprintf(fmt,sizeof(fmt),"%03d %%-%ds %%s NumDau:%%d VolID:%%08X Place:%%p %%c",level+1,2*level+1);
printout(INFO,"DetectorDump",fmt,"",de.path().c_str(),int(c.size()),
(unsigned long)de.volumeID(), (void*)node, sens);
break;
case 1:
- ::snprintf(fmt,sizeof(fmt),"%03d %%-%ds Detector: %%s #Dau:%%d VolID:%%p",level+1,2*level+1);
+ ::snprintf(fmt,sizeof(fmt),"%03d %%-%ds Detector: %%s NumDau:%%d VolID:%%p",level+1,2*level+1);
printout(INFO,"DetectorDump", fmt, "", de.path().c_str(),
int(c.size()), (void*)de.volumeID());
::snprintf(fmt,sizeof(fmt),"%03d %%-%ds Placement: %%s %%c",level+1,2*level+3);
diff --git a/DDDB/CMakeLists.txt b/DDDB/CMakeLists.txt
index d1632c81df7e3e9440c3eedbf68b390c59c65d28..497863b755932bb9971e156923150359ee62a682 100644
--- a/DDDB/CMakeLists.txt
+++ b/DDDB/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
#==========================================================================
# AIDA Detector description implementation for LCD
#--------------------------------------------------------------------------
diff --git a/DDDB/include/DDDB/DDDBConditionPrinter.h b/DDDB/include/DDDB/DDDBConditionPrinter.h
index 08d78d2120c43aee6e6b0f6ec68f6faa119505f4..8652d216f7c3fe5cafacaea347276a374f82b5e5 100644
--- a/DDDB/include/DDDB/DDDBConditionPrinter.h
+++ b/DDDB/include/DDDB/DDDBConditionPrinter.h
@@ -21,6 +21,7 @@
// Framework includes
#include "DD4hep/ConditionsData.h"
+#include "DD4hep/ConditionsProcessor.h"
using namespace std;
using namespace DD4hep;
@@ -38,7 +39,7 @@ namespace DD4hep {
* \date 31/03/2016
* \ingroup DD4HEP_DDDB
*/
- class ConditionPrinter : public Conditions::Condition::Processor {
+ class ConditionPrinter : public Conditions::ConditionsProcessor {
public:
/// DDDB Conditions data dumper helper to output parameter maps.
@@ -73,16 +74,23 @@ namespace DD4hep {
int m_flag;
public:
- typedef Conditions::Condition Cond;
+ typedef Conditions::Condition Condition;
+ typedef Conditions::Container Container;
/// Initializing constructor
ConditionPrinter(const std::string& prefix="",
- int flag=Cond::NO_NAME|Cond::WITH_IOV|Cond::WITH_ADDRESS,
+ int flag=Condition::NO_NAME|Condition::WITH_IOV|Condition::WITH_ADDRESS,
ParamPrinter* prt=0);
/// Set prefix for prinouts
void setPrefix(const std::string& value) { m_prefix = value; }
/// Callback to output conditions information
- virtual int operator()(Cond cond);
+ virtual int operator()(Condition condition);
+ /// Container callback for object processing
+ virtual int operator()(Container container)
+ { return this->ConditionsProcessor::operator()(container); }
+ /// Callback to output conditions information of an entire DetElement
+ virtual int processElement(DetElement de)
+ { return this->ConditionsProcessor::processElement(de); }
};
} /* End namespace DDDB */
diff --git a/DDDB/include/DDDB/DDDBConditionsLoader.h b/DDDB/include/DDDB/DDDBConditionsLoader.h
index 854eb7a25fbbb1a8f97cf87093df9a21387a3752..90f573c738b71e1736685611a1aab62f258571da 100644
--- a/DDDB/include/DDDB/DDDBConditionsLoader.h
+++ b/DDDB/include/DDDB/DDDBConditionsLoader.h
@@ -1,3 +1,4 @@
+//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
@@ -11,7 +12,13 @@
// \version 1.0
//
//==========================================================================
-// $Id$
+//
+// DDDB is a detector description convention developed by the LHCb experiment.
+// For further information concerning the DTD, please see:
+// http://lhcb-comp.web.cern.ch/lhcb-comp/Frameworks/DetDesc/Documents/lhcbDtd.pdf
+//
+//==========================================================================
+
#ifndef DD4HEP_DDDB_DDDBCONDITONSLOADER_H
#define DD4HEP_DDDB_DDDBCONDITONSLOADER_H
diff --git a/DDDB/include/DDDB/DDDBConversion.h b/DDDB/include/DDDB/DDDBConversion.h
index ac98f68e79efd9b4f3553d767756ca4b53bb3f2a..a711d089d55d16cca90d70b9fbd762a8eae130e0 100644
--- a/DDDB/include/DDDB/DDDBConversion.h
+++ b/DDDB/include/DDDB/DDDBConversion.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/include/DDDB/DDDBDimension.h b/DDDB/include/DDDB/DDDBDimension.h
index 5c665c198496afc073374eb622754eab1d160126..82850dc6d53c4493cb4083454e7d29de1163d406 100644
--- a/DDDB/include/DDDB/DDDBDimension.h
+++ b/DDDB/include/DDDB/DDDBDimension.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
@@ -17,6 +16,7 @@
// http://lhcb-comp.web.cern.ch/lhcb-comp/Frameworks/DetDesc/Documents/lhcbDtd.pdf
//
//==========================================================================
+
#ifndef DD4HEP_DDDB_DIMENSION_H
#define DD4HEP_DDDB_DIMENSION_H
diff --git a/DDDB/include/DDDB/DDDBHelper.h b/DDDB/include/DDDB/DDDBHelper.h
index 3785dd4e6713932d8798a755a19989559393563b..652b292acfe94d5509c6532901cd7ed969e22398 100644
--- a/DDDB/include/DDDB/DDDBHelper.h
+++ b/DDDB/include/DDDB/DDDBHelper.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/include/DDDB/DDDBReader.h b/DDDB/include/DDDB/DDDBReader.h
index 057802aec05072762c377dc655c354d25ce07890..3e77596c3d5c4d5524c175ca88c2caab32022112 100644
--- a/DDDB/include/DDDB/DDDBReader.h
+++ b/DDDB/include/DDDB/DDDBReader.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/include/DDDB/DDDBReaderContext.h b/DDDB/include/DDDB/DDDBReaderContext.h
index 66e8e5550d9a76e9afe34bd6a3681b822708ee6b..bd5ef671174e7da3ae0e86a9b9b4f3c7b65796f3 100644
--- a/DDDB/include/DDDB/DDDBReaderContext.h
+++ b/DDDB/include/DDDB/DDDBReaderContext.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/include/DDDB/DDDBTags.h b/DDDB/include/DDDB/DDDBTags.h
index 380451961a47957b140c49503488af80afae3e3b..6a99edbec7f5c7e70aa4fa240771cda9acfc0b21 100644
--- a/DDDB/include/DDDB/DDDBTags.h
+++ b/DDDB/include/DDDB/DDDBTags.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/CondDB2DDDB.cpp b/DDDB/src/CondDB2DDDB.cpp
index a57cb8a03b7d6b7399b6d735ee1a656ff5eb6cd4..8f9c001d6a4a35209a7976ee23d2c5276c5b169e 100644
--- a/DDDB/src/CondDB2DDDB.cpp
+++ b/DDDB/src/CondDB2DDDB.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDB2Objects.cpp b/DDDB/src/DDDB2Objects.cpp
index b644ea16ec5ddb28d2a10f94206db238d46063fb..beb03cf326f8c6f5eec87c9b1c03a8202701763f 100644
--- a/DDDB/src/DDDB2Objects.cpp
+++ b/DDDB/src/DDDB2Objects.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBAlignmentTest.cpp b/DDDB/src/DDDBAlignmentTest.cpp
index 36d67337fa7a77880c910f924da5d275c584ce1b..450e5a5707581e86848662e9547b67765bc82dbc 100644
--- a/DDDB/src/DDDBAlignmentTest.cpp
+++ b/DDDB/src/DDDBAlignmentTest.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBConditionPrinter.cpp b/DDDB/src/DDDBConditionPrinter.cpp
index 12dd05fa7d2b3d25e3c32d2f5eaaf93d1e8b3116..53b30cb45b3aa805b69efb19998c4e37292a01b7 100644
--- a/DDDB/src/DDDBConditionPrinter.cpp
+++ b/DDDB/src/DDDBConditionPrinter.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
@@ -76,7 +75,7 @@ void ConditionPrinter::ParamPrinter::operator()(const AbstractMap::Params::value
/// Initializing constructor
ConditionPrinter::ConditionPrinter(const string& prefix, int flg, ParamPrinter* prt)
- : m_prefix(prefix), m_print(prt), m_flag(flg)
+ : ConditionsProcessor(0), m_prefix(prefix), m_print(prt), m_flag(flg)
{
}
diff --git a/DDDB/src/DDDBConditionsLoader.cpp b/DDDB/src/DDDBConditionsLoader.cpp
index 409e2c662e91c7889070a1e52f99c5f51a24833e..857b5a9d899e7b458366183b6f6ef7e7825544f4 100644
--- a/DDDB/src/DDDBConditionsLoader.cpp
+++ b/DDDB/src/DDDBConditionsLoader.cpp
@@ -1,3 +1,4 @@
+//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
@@ -11,7 +12,12 @@
// \version 1.0
//
//==========================================================================
-// $Id$
+//
+// DDDB is a detector description convention developed by the LHCb experiment.
+// For further information concerning the DTD, please see:
+// http://lhcb-comp.web.cern.ch/lhcb-comp/Frameworks/DetDesc/Documents/lhcbDtd.pdf
+//
+//==========================================================================
// Framework include files
#include "DDDB/DDDBConditionsLoader.h"
diff --git a/DDDB/src/DDDBConversion.cpp b/DDDB/src/DDDBConversion.cpp
index 9772a9f7be8cea26ebc5d8ecc3be72792af014f5..6fc55fa6302fd321921c18261cc9594c098097c5 100644
--- a/DDDB/src/DDDBConversion.cpp
+++ b/DDDB/src/DDDBConversion.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBDerivedCondTest.cpp b/DDDB/src/DDDBDerivedCondTest.cpp
index b74677cb42939d82762417fd17da59fdfcf6032b..8bfbdc8e58e8afd2afedb5de4970b08320915829 100644
--- a/DDDB/src/DDDBDerivedCondTest.cpp
+++ b/DDDB/src/DDDBDerivedCondTest.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
@@ -251,8 +250,8 @@ namespace {
build_2->detector = de;
build_3->detector = de;
for(RangeConditions::const_iterator ic=rc.begin(); ic!=rc.end(); ++ic) {
- Condition cond = *ic;
- ConditionKey key(cond->value);
+ Condition cond = *ic;
+ ConditionKey key(cond->value);
build_1.add(key);
build_2.add(key);
diff --git a/DDDB/src/DDDBDimension.cpp b/DDDB/src/DDDBDimension.cpp
index 26b2433e73cb3d2a679a10c5945787ef0e12f8ec..38a7d6488e9503719b20c9cd182e20041ea1a6ca 100644
--- a/DDDB/src/DDDBDimension.cpp
+++ b/DDDB/src/DDDBDimension.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBExecutor.cpp b/DDDB/src/DDDBExecutor.cpp
index fe928feb170ba438cdf4ec3bc0e909a6fbf29470..a023aa18c2f23678dcb12576f66cf8f01da8f863 100644
--- a/DDDB/src/DDDBExecutor.cpp
+++ b/DDDB/src/DDDBExecutor.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBFileReader.cpp b/DDDB/src/DDDBFileReader.cpp
index b551185ad3239b0ea08c6cb642b8d9865489e0fd..1e971099f709511347d866450d685dd285524a0d 100644
--- a/DDDB/src/DDDBFileReader.cpp
+++ b/DDDB/src/DDDBFileReader.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBHelper.cpp b/DDDB/src/DDDBHelper.cpp
index 146cc557fbfa4fde6c20c69f2d0d8514b6efc91d..af003817fe718d5888649ded48c5e112435670e7 100644
--- a/DDDB/src/DDDBHelper.cpp
+++ b/DDDB/src/DDDBHelper.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBLogVolumeDump.cpp b/DDDB/src/DDDBLogVolumeDump.cpp
index 67c8fdfd1e08cc1808b233de82d4302a538af316..2ab12cc96eadb27e5fc90bec20cbf57b4076184a 100644
--- a/DDDB/src/DDDBLogVolumeDump.cpp
+++ b/DDDB/src/DDDBLogVolumeDump.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBPlugins.cpp b/DDDB/src/DDDBPlugins.cpp
index 861a475aab903158398b1087a42c63eac2d51cc9..785559e03c7342afe6f257fc00c545e55e85d628 100644
--- a/DDDB/src/DDDBPlugins.cpp
+++ b/DDDB/src/DDDBPlugins.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
@@ -37,11 +36,10 @@ using DD4hep::Geometry::LCDD;
/// Plugin function
static long dddb_dump_conditions(LCDD& lcdd, int , char** ) {
- const void* args[] = { "-processor", "DDDB_ConditionsPrinter", "-prefix", "DDDB", 0};
- lcdd.apply("DD4hep_ConditionsDump", 4, (char**)args);
+ const void* args[] = { "-processor", "DDDB_ConditionsPrinter", "-prefix", "DDDB", "-end-processor", 0};
+ lcdd.apply("DD4hep_ConditionsDump", 5, (char**)args);
return 1;
}
-
DECLARE_APPLY(DDDB_ConditionsDump,dddb_dump_conditions)
//==========================================================================
@@ -49,8 +47,8 @@ DECLARE_APPLY(DDDB_ConditionsDump,dddb_dump_conditions)
/// Anonymous namespace for plugins
namespace {
- /** Basic entry point to print out the detector element hierarchy
- *
+ /// Basic entry point to print out the detector element hierarchy
+ /**
* @author M.Frank
* @version 1.0
* @date 01/04/2014
@@ -105,8 +103,8 @@ DECLARE_APPLY(DDDB_AssignConditionsKeys,dddb_map_condition_keys2detelements)
/// Anonymous namespace for plugins
namespace {
- /** Basic entry point to print out the detector element hierarchy
- *
+ /// Basic entry point to print out the detector element hierarchy
+ /**
* @author M.Frank
* @version 1.0
* @date 01/04/2014
diff --git a/DDDB/src/DDDBReader.cpp b/DDDB/src/DDDBReader.cpp
index c2a12a0fcc20a826e90ce3a28a46a831793a6e90..9b2a5635c96cbc5c7b1db16fd0c4cf0421ff6194 100644
--- a/DDDB/src/DDDBReader.cpp
+++ b/DDDB/src/DDDBReader.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBTags.cpp b/DDDB/src/DDDBTags.cpp
index bb28ec89fce78e3eb3664bcfe8d91b603000478e..e31661b1b8400734c086241442e52b81da781e8d 100644
--- a/DDDB/src/DDDBTags.cpp
+++ b/DDDB/src/DDDBTags.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDDB/src/DDDBvis.cpp b/DDDB/src/DDDBvis.cpp
index f9ed1e16c9d5aa25b72e85f976e8ffdbbfa65d58..9701dfffccee59622f5c92bfdda706d26b1f7ffa 100644
--- a/DDDB/src/DDDBvis.cpp
+++ b/DDDB/src/DDDBvis.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation for LCD
//--------------------------------------------------------------------------
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index 98ad8f0e677ae7b75f9a5a9e8048ff17cec80cb8..89a5c2906b5a492628b74136b0f24db523ce37c1 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: $
#==========================================================================
# AIDA Detector description implementation for LCD
#--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Random.cpp b/DDG4/src/Geant4Random.cpp
index 769193cfc3dd961b28665dc164d7a28a3a6d199c..f8945bf9eb06069e7223800562183864ab7979a9 100644
--- a/DDG4/src/Geant4Random.cpp
+++ b/DDG4/src/Geant4Random.cpp
@@ -60,7 +60,7 @@ namespace {
m_generator->setSeed((long)seed);
}
/// Single shot random number creation
- virtual Double_t Rndm(Int_t) {
+ virtual Double_t Rndm(Int_t=0) {
return m_engine->flat();
}
/// Return an array of n random numbers uniformly distributed in ]0,1].
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 8ebcc1f479004807d4161ca8ec5f424f090def97..551d143a4c88960e078d3df8f6aa3c0a6132592a 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -1,5 +1,4 @@
#=================================================================================
-# $Id: $
#
# AIDA Detector description implementation for LCD
#---------------------------------------------------------------------------------
@@ -17,12 +16,22 @@ message ( STATUS "INCLUDING DD4hepBuild.... c++11:${DD4HEP_USE_CXX11} c++14:${DD
include ( CMakeParseArguments )
set ( DD4hepBuild_included ON )
####set ( DD4HEP_DEBUG_CMAKE ON )
+####set ( CMAKE_CTEST_COMMAND ${CMAKE_CTEST_COMMAND} --test-output-size-passed 4096 )
#---------------------------------------------------------------------------------------------------
macro(dd4hep_to_parent_scope val)
set ( ${val} ${${val}} PARENT_SCOPE )
endmacro(dd4hep_to_parent_scope)
+#---------------------------------------------------------------------------------------------------
+# MACRO: dd4hep_set_compiler_flags
+#
+# Set compiler flags
+#
+# \author M.Frank
+# \version 1.0
+#
+#---------------------------------------------------------------------------------------------------
macro(dd4hep_set_compiler_flags)
if ( DD4HEP_USE_CXX14 )
set ( CMAKE_CXX_FLAGS "-std=c++14 -ftls-model=global-dynamic")
@@ -48,8 +57,8 @@ macro(dd4hep_set_compiler_flags)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND APPLE)
set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup")
endif()
-
endmacro(dd4hep_set_compiler_flags)
+
#---------------------------------------------------------------------------------------------------
# dd4hep_debug
#
diff --git a/examples/AlignDet/CMakeLists.txt b/examples/AlignDet/CMakeLists.txt
index 023deeec911fca4552c972afe7231ad3edf5733a..39c1c7f4828acbb14e6b5d481b1845ea981f230b 100644
--- a/examples/AlignDet/CMakeLists.txt
+++ b/examples/AlignDet/CMakeLists.txt
@@ -27,15 +27,15 @@ dd4hep_configure_scripts( AlignDet DEFAULT_SETUP WITH_TESTS)
#
#---Testing: Load Telescope geometry and read conditions ------------------
-dd4hep_add_test_reg( test_DetAlign_Telescope_dump_geometry
+dd4hep_add_test_reg( test_AlignDet_Telescope_dump_geometry
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
EXEC_ARGS geoPluginRun -volmgr -destroy
-compact file:${CMAKE_CURRENT_SOURCE_DIR}/../AlignDet/compact/Telescope.xml
-plugin DD4hepDetectorDump
- REGEX_PASS "DetectorDump INFO 003 /world/Telescope/module_9 #Dau\\:0 VolID\\:00000903")
+ REGEX_PASS "/world/Telescope/module_9 NumDau\\:1 VolID\\:00000903 Place")
#
#---Testing: Load ALEPH TPC geometry --------------------------------------
-dd4hep_add_test_reg( test_DetAlign_AlephTPC_load
+dd4hep_add_test_reg( test_AlignDet_AlephTPC_load
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
EXEC_ARGS geoPluginRun
-input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/AlephTPC.xml
@@ -43,7 +43,7 @@ dd4hep_add_test_reg( test_DetAlign_AlephTPC_load
REGEX_PASS "189 nodes/ 23 volume UID's in LCDD Geometry" )
#
#---Testing: Load and misalign ALEPH TPC geometry -------------------------
-dd4hep_add_test_reg( test_DetAlign_Global_AlephTPC_align
+dd4hep_add_test_reg( test_AlignDet_Global_AlephTPC_align
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
EXEC_ARGS geoPluginRun
-input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/AlephTPC.xml
@@ -53,7 +53,7 @@ dd4hep_add_test_reg( test_DetAlign_Global_AlephTPC_align
REGEX_PASS "Successfully parsed XML: AlephTPC_alignment.xml")
#
#---Testing: Load and misalign ALEPH TPC geometry -------------------------
-dd4hep_add_test_reg( test_DetAlign_Global_AlephTPC_reset
+dd4hep_add_test_reg( test_AlignDet_Global_AlephTPC_reset
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
EXEC_ARGS geoPluginRun
-input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/AlephTPC.xml
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c70d8454a4dcf4da69156a59fa9bb98abca1c0e3..a63905bcd273293848b4e68e992eb2a93412d9d8 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: $
#==========================================================================
# AIDA Detector description implementation for LCD
#--------------------------------------------------------------------------
diff --git a/examples/Conditions/CMakeLists.txt b/examples/Conditions/CMakeLists.txt
index 738308143d59fc329fb6de1dbc495cfc65e51e88..3c4d2e756ce262cd387d63f1d6dd05719e34bf35 100644
--- a/examples/Conditions/CMakeLists.txt
+++ b/examples/Conditions/CMakeLists.txt
@@ -18,7 +18,8 @@ dd4hep_package ( CLICSiD MAJOR 0 MINOR 0 PATCH 1
USES [ROOT REQUIRED COMPONENTS Geom]
[DD4hep REQUIRED COMPONENTS DDCore]
)
-dd4hep_install_dir( xml DESTINATION ${DD4hep_DIR}/examples/Conditions )
+dd4hep_install_dir( xml DESTINATION ${DD4hep_DIR}/examples/Conditions )
+dd4hep_install_dir( data DESTINATION ${DD4hep_DIR}/examples/Conditions )
dd4hep_configure_scripts ( Conditions DEFAULT_SETUP WITH_TESTS )
#--------------------------------------------------------------------------
#
@@ -29,7 +30,7 @@ dd4hep_add_test_reg( test_Conditions_Telescope_cond_dump_by_pool
-compact file:${CMAKE_CURRENT_SOURCE_DIR}/../AlignDet/compact/Telescope.xml
-plugin DD4hep_ConditionsXMLRepositoryParser file:${CMAKE_CURRENT_SOURCE_DIR}/data/repository.xml
-plugin DD4hep_ConditionsDump
- REGEX_PASS "Data:\\[\\(0,0,29\\), \\{phi\\(Z angle\\)\\: 0 theta\\(Y angle\\)\\: 1.5708 psi\\(X angle\\)\\: 0\\} , 0 0 0 \\]")
+ REGEX_PASS "Data:\\[\\(0,0,1\\), \\{phi\\(Z angle\\)\\: 3.14159 theta\\(Y angle\\)\\: 0 psi\\(X angle\\)\\: 0\\} , 0 0 0 \\]")
#
#
#---Testing: Load Telescope geometry and read conditions ------------------
diff --git a/examples/DDDB/CMakeLists.txt b/examples/DDDB/CMakeLists.txt
index db8bce6cdeff56eeaab1f690bc224970adde590c..a9965552adfbef04b40ae1f96d750dcf8ace2d68 100644
--- a/examples/DDDB/CMakeLists.txt
+++ b/examples/DDDB/CMakeLists.txt
@@ -37,102 +37,102 @@ if (DD4HEP_USE_XERCESC)
dd4hep_configure_scripts ( DDDB DEFAULT_SETUP WITH_TESTS )
#
#---Testing: Extract DDDB data from zip archive -------------------------------
- dd4hep_add_test_reg( test_DDDB_extract
+ dd4hep_add_test_reg( test_DDDB_extract_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/extract_dddb.sh
REGEX_PASS "DDDB Database successfully installed." )
#
#---Testing: Load the geometry from archive -----------------------------------
- dd4hep_add_test_reg( test_DDDB_load
+ dd4hep_add_test_reg( test_DDDB_load_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
REGEX_PASS "Converted 12851 placements" )
#
#---Testing: Load the geometry + conditions from archive ----------------------
- dd4hep_add_test_reg( test_DDDB_conditions
+ dd4hep_add_test_reg( test_DDDB_conditions_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
REGEX_PASS "Converted 9353 conditions" )
#
#---Testing: Load the geometry + conditions dump as view from DetElement ------
- dd4hep_add_test_reg( test_DDDB_conditions_dump_simple
+ dd4hep_add_test_reg( test_DDDB_conditions_dump_simple_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
-exec DDDB_ConditionsDump
- REGEX_PASS "Path:/dd/Conditions/ReadoutConf/Velo/Tell1Module03 Class:5 .DD4hep::Conditions::AbstractMap." )
+ REGEX_PASS "Path\\:/dd/Conditions/ReadoutConf/Velo/Tell1Module03 Class\\:5 \\[DD4hep\\:\\:Conditions\\:\\:AbstractMap\\]" )
#
#---Testing: Load the geometry + dump detector elemets ------------------------
- dd4hep_add_test_reg( test_DDDB_det_elements
+ dd4hep_add_test_reg( test_DDDB_det_elements_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
-exec DDDB_DetectorDump
- REGEX_PASS "Detector: /world/LHCb/UpstreamRegion #Dau:5" )
+ REGEX_PASS "Detector\\: /world/LHCb/UpstreamRegion #Dau\\:5" )
#
#---Testing: Load the geometry + dump volumes ---------------------------------
- dd4hep_add_test_reg( test_DDDB_det_volumes
+ dd4hep_add_test_reg( test_DDDB_det_volumes_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
-exec DDDB_DetectorVolumeDump
- REGEX_PASS "Detector: /world/LHCb/MagnetRegion/BcmDown #Dau:10" )
+ REGEX_PASS "Detector\\: /world/LHCb/MagnetRegion/BcmDown #Dau\\:10" )
#
#---Testing: Load the geometry + dump condition keys --------------------------
- dd4hep_add_test_reg( test_DDDB_det_conditions_keys
+ dd4hep_add_test_reg( test_DDDB_det_conditions_keys_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
-exec DDDB_DetectorConditionKeysDump
- REGEX_PASS "Key: D88E83E7 -> 20537B67 -> /dd/Conditions/ReadoutConf/Prs/Readout")
+ REGEX_PASS "Key\\: D88E83E7 -> 20537B67 -> /dd/Conditions/ReadoutConf/Prs/Readout")
#
#---Testing: Load the geometry + dump condition keys --------------------------
- dd4hep_add_test_reg( test_DDDB_det_conditions_data
+ dd4hep_add_test_reg( test_DDDB_det_conditions_data_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
-exec DDDB_DetectorConditionDump
- REGEX_PASS "Path:/dd/Conditions/Alignment/Spd/SpdCSystem Class:6 .DD4hep::Conditions::AbstractMap." )
+ REGEX_PASS "Path\\:/dd/Conditions/Alignment/Spd/SpdCSystem Class\\:6 .DD4hep\\:\\:Conditions\\:\\:AbstractMap." )
#
#---Testing: Load the geometry + dump condition keys --------------------------
- dd4hep_add_test_reg( test_DDDB_det_conditions_align
+ dd4hep_add_test_reg( test_DDDB_det_conditions_align_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
-exec DDDB_DetectorAlignmentDump
- REGEX_PASS "Number of attached alignments: 2496")
+ REGEX_PASS "Number of attached alignments\\: 2496")
#
#---Testing: Load the geometry + conditions dump as view from DetElement ------
- dd4hep_add_test_reg( test_DDDB_detelement_conditions_dump
+ dd4hep_add_test_reg( test_DDDB_detelement_conditions_dump_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
-exec DDDB_DetElementConditionDump
- REGEX_PASS "Path:/dd/Conditions/Alignment/Spd/SpdCSystem Class:6 .DD4hep::Conditions::AbstractMap." )
+ REGEX_PASS "Path\\:/dd/Conditions/Alignment/Spd/SpdCSystem Class\\:6 .DD4hep\\:\\:Conditions\\:\\:AbstractMap." )
#
#---Testing: Load the geometry + conditions + conditions derives
- dd4hep_add_test_reg( test_DDDB_derived_conditions
+ dd4hep_add_test_reg( test_DDDB_derived_conditions_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
-exec DDDB_DerivedCondTest
- REGEX_PASS "Building dependent condition: /dd/Conditions/Alignment/TT/TTbVLayerR1Module3B/derived_3" )
+ REGEX_PASS "Building dependent condition\\: /dd/Conditions/Alignment/TT/TTbVLayerR1Module3B/derived_3" )
#
#---Testing: Load the geometry + conditions + run basic derived alignments test
- dd4hep_add_test_reg( test_DDDB_derived_alignments
+ dd4hep_add_test_reg( test_DDDB_derived_alignments_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
-config DD4hep_AlignmentsManagerInstaller
-exec DDDB_DerivedAlignmentsTest
- REGEX_PASS "| 24950| 24950| 0|DD4hep::Alignments::Interna::AlignmentConditionObject" )
+ REGEX_PASS "| 24950| 24950| 0|DD4hep\\:\\:Alignments\\:\\:Interna\\:\\:AlignmentConditionObject" )
#
#---Testing: Load the geometry + conditions + access derived alignments from DetElement structures
- dd4hep_add_test_reg( test_DDDB_alignment_access
+ dd4hep_add_test_reg( test_DDDB_alignment_access_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/run_dddb.sh
-config DD4hep_ConditionsManagerInstaller
@@ -142,7 +142,7 @@ if (DD4HEP_USE_XERCESC)
#
#---Testing: Extract DDDB data from zip archive -------------------------------
- dd4hep_add_test_reg( test_DDDB_clean
+ dd4hep_add_test_reg( test_DDDB_clean_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDDB.sh"
EXEC_ARGS ${CMAKE_INSTALL_PREFIX}/bin/extract_dddb.sh -clean
REGEX_PASS "DDDB Database successfully removed" )