From 1d1b884538c5225a7075579e37402eb2c5aa2b50 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Mon, 21 Aug 2017 14:13:58 +0200
Subject: [PATCH] Improve doxygen information
---
.../DDCond/ConditionsTreePersistency.h | 3 +-
DDCond/src/ConditionsDictionary.h | 2 +-
DDCond/src/ConditionsTreePersistency.cpp | 3 +-
examples/Conditions/CMakeLists.txt | 30 +++++++++----------
.../src/ConditionExample_manual.cpp | 8 ++---
5 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/DDCond/include/DDCond/ConditionsTreePersistency.h b/DDCond/include/DDCond/ConditionsTreePersistency.h
index 95ec3fb62..b3696b7ec 100644
--- a/DDCond/include/DDCond/ConditionsTreePersistency.h
+++ b/DDCond/include/DDCond/ConditionsTreePersistency.h
@@ -1,4 +1,3 @@
-#if 0
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
@@ -141,4 +140,4 @@ namespace dd4hep {
} /* End namespace cond */
} /* End namespace dd4hep */
#endif /* DD4HEP_CONDITIONS_CONDITIONSTREEPERSISTENCY_H */
-#endif
+
diff --git a/DDCond/src/ConditionsDictionary.h b/DDCond/src/ConditionsDictionary.h
index 50e12ca56..404f817cf 100644
--- a/DDCond/src/ConditionsDictionary.h
+++ b/DDCond/src/ConditionsDictionary.h
@@ -64,7 +64,7 @@ using namespace dd4hep;
//#pragma link C++ class std::list<cond::ConditionsRootPersistency::IOVPool>+;
#pragma link C++ class cond::ConditionsRootPersistency+;
-//#pragma link C++ class cond::ConditionsTreePersistency+;
+#pragma link C++ class cond::ConditionsTreePersistency+;
#endif
diff --git a/DDCond/src/ConditionsTreePersistency.cpp b/DDCond/src/ConditionsTreePersistency.cpp
index dfb99c331..23868711a 100644
--- a/DDCond/src/ConditionsTreePersistency.cpp
+++ b/DDCond/src/ConditionsTreePersistency.cpp
@@ -10,7 +10,7 @@
// Author : M.Frank
//
//==========================================================================
-#if 0
+
// Framework include files
#include "DD4hep/Printout.h"
#include "DDCond/ConditionsSlice.h"
@@ -315,4 +315,3 @@ int ConditionsTreePersistency::save(const string& fname) {
}
return -1;
}
-#endif
diff --git a/examples/Conditions/CMakeLists.txt b/examples/Conditions/CMakeLists.txt
index bf40f6848..989dd9479 100644
--- a/examples/Conditions/CMakeLists.txt
+++ b/examples/Conditions/CMakeLists.txt
@@ -50,7 +50,7 @@ dd4hep_add_test_reg( Conditions_Telescope_cond_dump_by_detelement
#---Testing: Simple stress: Load Telescope geometry and have multiple runs on IOVs
dd4hep_add_test_reg( Conditions_Telescope_populate
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_ConditionExample_populate
+ EXEC_ARGS geoPluginRun -destroy -plugin DD4hep_ConditionExample_populate
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml -iovs 5
REGEX_PASS "Accessed a total of 800 conditions \\(S: 500,L: 0,C: 300,M:0\\)"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
@@ -59,7 +59,7 @@ dd4hep_add_test_reg( Conditions_Telescope_populate
#---Testing: Simple stress: Load Telescope geometry and have multiple runs on IOVs
dd4hep_add_test_reg( Conditions_Telescope_stress
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_ConditionExample_stress
+ EXEC_ARGS geoPluginRun -destroy -plugin DD4hep_ConditionExample_stress
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml -iovs 10 -runs 20
REGEX_PASS "\\+ Accessed a total of 3200 conditions \\(S: 2660,L: 0,C: 540,M:0\\)"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
@@ -68,7 +68,7 @@ dd4hep_add_test_reg( Conditions_Telescope_stress
#---Testing: Simple stress: Load Telescope geometry and have multiple runs on IOVs
dd4hep_add_test_reg( Conditions_Telescope_stress2
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_ConditionExample_stress2
+ EXEC_ARGS geoPluginRun -destroy -plugin DD4hep_ConditionExample_stress2
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml -iovs 10
REGEX_PASS "\\+ Accessed a total of 1600 conditions \\(S: 1000,L: 0,C: 600,M:0\\)"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
@@ -77,7 +77,7 @@ dd4hep_add_test_reg( Conditions_Telescope_stress2
#---Testing: Multi-threading test: Load CLICSiD geometry and have multiple parallel runs on IOVs
dd4hep_add_test_reg( Conditions_Telescope_MT_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_ConditionExample_MT
+ EXEC_ARGS geoPluginRun -destroy -plugin DD4hep_ConditionExample_MT
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml -iovs 30 -runs 10 -threads 1
REGEX_PASS "\\+ Accessed a total of 286400 conditions \\(S:268400,L: 0,C: 18000,M:0\\)"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
@@ -86,7 +86,7 @@ dd4hep_add_test_reg( Conditions_Telescope_MT_LONGTEST
#---Testing: Save conditions to ROOT file
dd4hep_add_test_reg( Conditions_Telescope_root_save
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -print WARNING -volmgr -destroy -plugin DD4hep_ConditionExample_save
+ EXEC_ARGS geoPluginRun -print WARNING -destroy -plugin DD4hep_ConditionExample_save
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml -iovs 30
-conditions TelescopeConditions.root
REGEX_PASS "\\+ Successfully saved 14400 condition to file."
@@ -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 DEBUG -volmgr -destroy -plugin DD4hep_ConditionExample_load
+ EXEC_ARGS geoPluginRun -print DEBUG -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 DEBUG -volmgr -destroy -plugin DD4hep_ConditionExample_load
+ EXEC_ARGS geoPluginRun -print DEBUG -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
@@ -118,7 +118,7 @@ dd4hep_add_test_reg( Conditions_Telescope_root_load_usr
#---Testing: Save conditions to ROOT file
dd4hep_add_test_reg( Conditions_Telescope_root_load_pool
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -print WARNING -volmgr -destroy -plugin DD4hep_ConditionExample_load
+ EXEC_ARGS geoPluginRun -print WARNING -destroy -plugin DD4hep_ConditionExample_load
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml
-conditions TelescopeConditions.root -iovs 30 -restore condpool
DEPENDS Conditions_Telescope_root_save
@@ -129,7 +129,7 @@ dd4hep_add_test_reg( Conditions_Telescope_root_load_pool
#---Testing: Simple stress: Load CLICSiD geometry and have multiple runs on IOVs
dd4hep_add_test_reg( Conditions_CLICSiD_stress_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_ConditionExample_stress
+ EXEC_ARGS geoPluginRun -destroy -plugin DD4hep_ConditionExample_stress
-input file:${DD4hep_DIR}/examples/CLICSiD/compact/compact.xml -iovs 10 -runs 100
REGEX_PASS "\\+ Accessed a total of 28008800 conditions \\(S:26958470,L: 0,C:1050330,M:0\\)"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
@@ -138,7 +138,7 @@ dd4hep_add_test_reg( Conditions_CLICSiD_stress_LONGTEST
#---Testing: Simple stress: Load CLICSiD geometry and have multiple runs on IOVs
dd4hep_add_test_reg( Conditions_CLICSiD_stress2_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_ConditionExample_stress2
+ EXEC_ARGS geoPluginRun -destroy -plugin DD4hep_ConditionExample_stress2
-input file:${DD4hep_DIR}/examples/CLICSiD/compact/compact.xml -iovs 20
REGEX_PASS "\\+ Accessed a total of 5601760 conditions \\(S:3501100,L: 0,C:2100660,M:0\\)"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
@@ -147,7 +147,7 @@ dd4hep_add_test_reg( Conditions_CLICSiD_stress2_LONGTEST
#---Testing: Multi-threading test: Load CLICSiD geometry and have multiple parallel runs on IOVs
dd4hep_add_test_reg( Conditions_CLICSiD_MT_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -volmgr -destroy -plugin DD4hep_ConditionExample_MT
+ EXEC_ARGS geoPluginRun -destroy -plugin DD4hep_ConditionExample_MT
-input file:${DD4hep_DIR}/examples/CLICSiD/compact/compact.xml -iovs 3 -runs 2 -threads 1
REGEX_PASS "\\+ Accessed a total of 9522992 conditions \\(S:8892794,L: 0,C:630198,M:0\\)"
REGEX_FAIL " ERROR ;EXCEPTION;Exception"
@@ -156,7 +156,7 @@ dd4hep_add_test_reg( Conditions_CLICSiD_MT_LONGTEST
#---Testing: Save conditions to ROOT file
dd4hep_add_test_reg( Conditions_CLICSiD_root_save_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -print WARNING -volmgr -destroy -plugin DD4hep_ConditionExample_save
+ EXEC_ARGS geoPluginRun -print WARNING -destroy -plugin DD4hep_ConditionExample_save
-input file:${DD4hep_DIR}/examples/CLICSiD/compact/compact.xml -iovs 3
-conditions CLICSiDConditions.root
REGEX_PASS "\\+ Successfully saved 2520792 condition to file."
@@ -166,7 +166,7 @@ dd4hep_add_test_reg( Conditions_CLICSiD_root_save_LONGTEST
#---Testing: Save conditions to ROOT file
dd4hep_add_test_reg( Conditions_CLICSiD_root_load_iov_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -print WARNING -volmgr -destroy -plugin DD4hep_ConditionExample_load
+ EXEC_ARGS geoPluginRun -print WARNING -destroy -plugin DD4hep_ConditionExample_load
-input file:${DD4hep_DIR}/examples/CLICSiD/compact/compact.xml -iovs 3 -restore iovpool
-conditions CLICSiDConditions.root
DEPENDS Conditions_CLICSiD_root_save_LONGTEST
@@ -177,7 +177,7 @@ dd4hep_add_test_reg( Conditions_CLICSiD_root_load_iov_LONGTEST
#---Testing: Save conditions to ROOT file
dd4hep_add_test_reg( Conditions_CLICSiD_root_load_usr_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -print WARNING -volmgr -destroy -plugin DD4hep_ConditionExample_load
+ EXEC_ARGS geoPluginRun -print WARNING -destroy -plugin DD4hep_ConditionExample_load
-input file:${DD4hep_DIR}/examples/CLICSiD/compact/compact.xml -iovs 3 -restore userpool
-conditions CLICSiDConditions.root
DEPENDS Conditions_CLICSiD_root_save_LONGTEST
@@ -188,7 +188,7 @@ dd4hep_add_test_reg( Conditions_CLICSiD_root_load_usr_LONGTEST
#---Testing: Save conditions to ROOT file
dd4hep_add_test_reg( Conditions_CLICSiD_root_load_cond_LONGTEST
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_Conditions.sh"
- EXEC_ARGS geoPluginRun -print WARNING -volmgr -destroy -plugin DD4hep_ConditionExample_load
+ EXEC_ARGS geoPluginRun -print WARNING -destroy -plugin DD4hep_ConditionExample_load
-input file:${DD4hep_DIR}/examples/CLICSiD/compact/compact.xml -iovs 3 -restore condpool
-conditions CLICSiDConditions.root
DEPENDS Conditions_CLICSiD_root_save_LONGTEST
diff --git a/examples/Conditions/src/ConditionExample_manual.cpp b/examples/Conditions/src/ConditionExample_manual.cpp
index a22e52562..11e96e403 100644
--- a/examples/Conditions/src/ConditionExample_manual.cpp
+++ b/examples/Conditions/src/ConditionExample_manual.cpp
@@ -17,7 +17,7 @@
This plugin behaves like a main program.
Invoke the plugin with something like this:
- geoPluginRun -volmgr -destroy -plugin DD4hep_ConditionExample_load \
+ geoPluginRun -volmgr -destroy -plugin DD4hep_ConditionExample_manual \
-input file:${DD4hep_DIR}/examples/AlignDet/compact/Telescope.xml \
-conditions Conditions.root
@@ -40,7 +40,7 @@ static void help(int argc, char** argv) {
/// Help printout describing the basic command line interface
cout <<
"Usage: -plugin <name> -arg [-arg] \n"
- " name: factory name DD4hep_ConditionExample_load \n"
+ " name: factory name DD4hep_ConditionExample_manual \n"
" -input <string> Geometry file \n"
" -conditions <string> Conditions input file \n"
" -iovs <number> Number of parallel IOV slots for processing. \n"
@@ -51,7 +51,7 @@ static void help(int argc, char** argv) {
/// Plugin function: Condition program example
/**
- * Factory: DD4hep_ConditionExample_load
+ * Factory: DD4hep_ConditionExample_manual
*
* \author M.Frank
* \version 1.0
@@ -143,4 +143,4 @@ static int condition_example (Detector& description, int argc, char** argv) {
}
// first argument is the type from the xml file
-DECLARE_APPLY(DD4hep_ConditionExample_load,condition_example)
+DECLARE_APPLY(DD4hep_ConditionExample_manual,condition_example)
--
GitLab