From 858dd11a0e3e9848ef6ac052f86399b84eda8187 Mon Sep 17 00:00:00 2001
From: jhrdinka <julia.hrdinka@cern.ch>
Date: Wed, 22 Nov 2017 14:32:18 +0100
Subject: [PATCH] Remove distinction of default set value and user set value
---
Core/include/ACTFW/Framework/StandardOptions.hpp | 7 +------
.../ACTFW/Plugins/DD4hep/DD4hepDetectorOptions.hpp | 10 ++--------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/Core/include/ACTFW/Framework/StandardOptions.hpp b/Core/include/ACTFW/Framework/StandardOptions.hpp
index f0086f54..c115d466 100644
--- a/Core/include/ACTFW/Framework/StandardOptions.hpp
+++ b/Core/include/ACTFW/Framework/StandardOptions.hpp
@@ -44,12 +44,7 @@ namespace Options {
{
size_t nEvents = vm["events"].template as<size_t>();
- if (vm.count("events")) {
- nEvents = vm["events"].template as<size_t>();
- std::cout << "- running " << nEvents << " events " << std::endl;
- } else {
- std::cout << "- using standard number of events " << nEvents << std::endl;
- }
+ std::cout << "- running " << nEvents << " events " << std::endl;
Acts::Logging::Level logLevel
= Acts::Logging::Level(vm["loglevel"].template as<size_t>());
if (vm.count("loglevel")) {
diff --git a/Plugins/DD4hep/include/ACTFW/Plugins/DD4hep/DD4hepDetectorOptions.hpp b/Plugins/DD4hep/include/ACTFW/Plugins/DD4hep/DD4hepDetectorOptions.hpp
index c00c7c71..9b650352 100644
--- a/Plugins/DD4hep/include/ACTFW/Plugins/DD4hep/DD4hepDetectorOptions.hpp
+++ b/Plugins/DD4hep/include/ACTFW/Plugins/DD4hep/DD4hepDetectorOptions.hpp
@@ -57,14 +57,8 @@ namespace Options {
{
Acts::Logging::Level logLevel
= Acts::Logging::Level(vm["dd4hep-loglevel"].template as<size_t>());
- if (vm.count("dd4hep-loglevel")) {
- logLevel
- = Acts::Logging::Level(vm["dd4hep-loglevel"].template as<size_t>());
- std::cout << "- the geometry building output log level is set to "
- << logLevel << std::endl;
- } else {
- std::cout << "- default log level is " << logLevel << std::endl;
- }
+ std::cout << "- the geometry building output log level is set to "
+ << logLevel << std::endl;
// DETECTOR configuration:
// --------------------------------------------------------------------------------
FW::DD4hep::GeometryService::Config gsConfig("GeometryService", logLevel);
--
GitLab