diff --git a/Algorithms/ParticleGun/include/ACTFW/ParticleGun/ParticleGunOptions.hpp b/Algorithms/ParticleGun/include/ACTFW/ParticleGun/ParticleGunOptions.hpp index 4dce54c69f4287d0d26072daf696b39e992b0dc2..739ac8e79542545c3cd2d17fb88a0f3fab26431e 100644 --- a/Algorithms/ParticleGun/include/ACTFW/ParticleGun/ParticleGunOptions.hpp +++ b/Algorithms/ParticleGun/include/ACTFW/ParticleGun/ParticleGunOptions.hpp @@ -46,19 +46,24 @@ namespace Options { "flip the charge (and change PDG accordingly).")( "pg-d0range", po::value<read_range>()->multitoken()->default_value({0., 0.}), - "range in which the d0 parameter is simulated in [mm].")( + "range in which the d0 parameter is simulated in [mm]. Please hand" + "over by simply seperating the values by space")( "pg-z0range", po::value<read_range>()->multitoken()->default_value({0., 0.}), - "range in which the z0 parameter is simulated in [mm].")( + "range in which the z0 parameter is simulated in [mm]. Please hand" + "over by simply seperating the values by space")( "pg-phirange", po::value<read_range>()->multitoken()->default_value({-M_PI, M_PI}), - "range in which the phi0 parameter is simulated.")( + "range in which the phi0 parameter is simulated. Please hand over by " + "simply seperating the values by space")( "pg-etarange", po::value<read_range>()->multitoken()->default_value({-4., 4.}), - "range in which the eta parameter is simulated.")( + "range in which the eta parameter is simulated. Please hand over by " + "simply seperating the values by space")( "pg-ptrange", po::value<read_range>()->multitoken()->default_value({100., 1e5}), - "range in which the pt in [MeV] parameter is simulated."); + "range in which the pt in [MeV] parameter is simulated. Please hand " + "over by simply seperating the values by space"); } /// read the particle gun options and return a Config file diff --git a/Algorithms/ReadEvgen/include/ACTFW/ReadEvgen/ReadEvgenOptions.hpp b/Algorithms/ReadEvgen/include/ACTFW/ReadEvgen/ReadEvgenOptions.hpp index bf7025ff8dcaa262f80c9daf3eb319623b4be5ce..93fd375bc257d76d30ade2e55c228a93233f181d 100644 --- a/Algorithms/ReadEvgen/include/ACTFW/ReadEvgen/ReadEvgenOptions.hpp +++ b/Algorithms/ReadEvgen/include/ACTFW/ReadEvgen/ReadEvgenOptions.hpp @@ -32,10 +32,12 @@ namespace Options { "Number of instantaneous pile-up events.")( "evg-vertex-xyrange", po::value<read_range>()->multitoken()->default_value({0., 0.015}), - "transverse range of the vertex in xy.")( + "transverse range of the vertex in xy. Please hand over by simply " + "seperating the values by space")( "evg-vertex-zrange", po::value<read_range>()->multitoken()->default_value({0., 5.5}), - "transverse range of the vertex in z."); + "transverse range of the vertex in z. Please hand over by simply " + "seperating the values by space"); } /// read the evgen options and return a Config file @@ -60,4 +62,4 @@ namespace Options { } } -#endif // ACTFW_OPTIONS_EVGENOPTIONS_HPP \ No newline at end of file +#endif // ACTFW_OPTIONS_EVGENOPTIONS_HPP diff --git a/Core/include/ACTFW/Framework/StandardOptions.hpp b/Core/include/ACTFW/Framework/StandardOptions.hpp index 27515eb115f450e525b8853da416f743c5d3c478..c115d466de43762fad51e1e18d9521e6ab821208 100644 --- a/Core/include/ACTFW/Framework/StandardOptions.hpp +++ b/Core/include/ACTFW/Framework/StandardOptions.hpp @@ -33,7 +33,8 @@ namespace Options { "The number of events to be processed")( "loglevel,l", po::value<size_t>()->default_value(defaultValue), - "The output log level."); + "The output log level. Please set the wished number (0 = VERBOSE, 1 = " + "DEBUG, 2 = INFO, 3 = WARNING, 4 = ERROR, 5 = FATAL)."); } // read standard options @@ -43,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 7216c7bbdc00f55c911ae7fb66be31c4bd429934..9b6503527f9a29873ec19cfb60457033ca9a30b7 100644 --- a/Plugins/DD4hep/include/ACTFW/Plugins/DD4hep/DD4hepDetectorOptions.hpp +++ b/Plugins/DD4hep/include/ACTFW/Plugins/DD4hep/DD4hepDetectorOptions.hpp @@ -42,7 +42,12 @@ namespace Options { "The envelop cover in z for DD4hep volumes.")( "dd4hep-digitizationmodules", po::value<bool>()->default_value(false), - "The envelop cover in z for DD4hep volumes."); + "The envelop cover in z for DD4hep volumes.")( + "dd4hep-loglevel", + po::value<size_t>()->default_value(2), + "The output log level of the geometry building. Please set the wished " + "number (0 = VERBOSE, 1 = " + "DEBUG, 2 = INFO, 3 = WARNING, 4 = ERROR, 5 = FATAL)."); } /// read the particle gun options and return a Config file @@ -50,9 +55,13 @@ namespace Options { FW::DD4hep::GeometryService::Config readDD4hepConfig(const AMAP& vm) { + Acts::Logging::Level 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; // DETECTOR configuration: // -------------------------------------------------------------------------------- - FW::DD4hep::GeometryService::Config gsConfig("GeometryService"); + FW::DD4hep::GeometryService::Config gsConfig("GeometryService", logLevel); gsConfig.xmlFileName = vm["dd4hep-input"].template as<std::string>(); gsConfig.bTypePhi = Acts::equidistant; gsConfig.bTypeR = Acts::arbitrary;