From f23a0253bd91c471b0423a86c035b5188e8e5fbd Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Mon, 21 Aug 2017 13:19:45 +0200
Subject: [PATCH] Improve doxygen information
---
examples/Conditions/CMakeLists.txt | 4 ++--
examples/Conditions/src/ConditionExample_load.cpp | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/examples/Conditions/CMakeLists.txt b/examples/Conditions/CMakeLists.txt
index 6b5e10c32..bf40f6848 100644
--- a/examples/Conditions/CMakeLists.txt
+++ b/examples/Conditions/CMakeLists.txt
@@ -96,7 +96,7 @@ dd4hep_add_test_reg( Conditions_Telescope_root_save
#---Testing: Save conditions to ROOT file
dd4hep_add_test_reg( Conditions_Telescope_root_load_iov
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -print WARNING -volmgr -destroy -plugin DD4hep_ConditionExample_load
+ EXEC_ARGS geoPluginRun -print DEBUG -volmgr -destroy -plugin DD4hep_ConditionExample_load
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
-conditions TelescopeConditions.root -iovs 30 -restore iovpool
DEPENDS Conditions_Telescope_root_save
@@ -107,7 +107,7 @@ dd4hep_add_test_reg( Conditions_Telescope_root_load_iov
#---Testing: Save conditions to ROOT file
dd4hep_add_test_reg( Conditions_Telescope_root_load_usr
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -print WARNING -volmgr -destroy -plugin DD4hep_ConditionExample_load
+ EXEC_ARGS geoPluginRun -print DEBUG -volmgr -destroy -plugin DD4hep_ConditionExample_load
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
-conditions TelescopeConditions.root -iovs 30 -restore userpool
DEPENDS Conditions_Telescope_root_save
diff --git a/examples/Conditions/src/ConditionExample_load.cpp b/examples/Conditions/src/ConditionExample_load.cpp
index e5b81bd8a..5b51d74ae 100644
--- a/examples/Conditions/src/ConditionExample_load.cpp
+++ b/examples/Conditions/src/ConditionExample_load.cpp
@@ -85,7 +85,7 @@ static int condition_example (Detector& description, int argc, char** argv) {
Scanner(ConditionsDependencyCreator(*content,DEBUG),description.world());
/******************** Load the conditions from file *********************/
- {
+ try {
auto pers = cond::ConditionsRootPersistency::load(conditions.c_str(),"DD4hep Conditions");
printout(ALWAYS,"Statistics","+=========================================================================");
printout(ALWAYS,"Statistics","+ Loaded conditions object from file %s. Took %8.3f seconds.",
@@ -104,6 +104,11 @@ static int condition_example (Detector& description, int argc, char** argv) {
num_cond, restore.c_str(), pers->duration);
printout(ALWAYS,"Statistics","+=========================================================================");
}
+ catch(const exception& e) {
+ printout(ERROR,"ConditionsExample","Failed to import ROOT object(s): %s",e.what());
+ throw;
+ }
+
// ++++++++++++++++++++++++ Now compute the conditions for each of these IOVs
const IOVType* iov_typ = manager.iovType("run");
cond::ConditionsIOVPool* pool = manager.iovPool(*iov_typ);
--
GitLab