Commit 238a649d authored by Simon Spannagel's avatar Simon Spannagel
Browse files

MeshCOnverter: Allow Parsing LogLevel from Config 

(cherry picked from commit d55cdae2)
parent c6449ae9

tools/mesh_converter/MeshConverter.cpp

+18 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int main(int argc, char** argv) { 
        std::string log_file_name;



        std::string conf_file_name;

        allpix::LogLevel log_level = allpix::LogLevel::INFO;

        allpix::LogLevel log_level = allpix::LogLevel::NONE;



        for(int i = 1; i < argc; i++) {

            if(strcmp(argv[i], "-h") == 0) {
@@ -143,6 +143,23 @@ int main(int argc, char** argv) { 
            return return_code;

        }



        std::ifstream file(conf_file_name);

        allpix::ConfigReader reader(file, conf_file_name);

        allpix::Configuration config = reader.getHeaderConfiguration();



        if(allpix::Log::getReportingLevel() == allpix::LogLevel::NONE) {

            auto log_level_string = config.get<std::string>("log_level", "INFO");

            std::transform(log_level_string.begin(), log_level_string.end(), log_level_string.begin(), ::toupper);

            try {

                log_level = allpix::Log::getLevelFromString(log_level_string);

                allpix::Log::setReportingLevel(log_level);

            } catch(std::invalid_argument& e) {

                LOG(ERROR) << "Log level \"" << log_level_string

                           << "\" specified in the configuration is invalid, defaulting to INFO instead";

                allpix::Log::setReportingLevel(allpix::LogLevel::INFO);

            }

        }



        // NOTE: this stream should be available for the duration of the logging

        std::ofstream log_file;

        if(!log_file_name.empty()) {
@@ -157,9 +174,6 @@ int main(int argc, char** argv) { 


        LOG(STATUS) << "Welcome to the Mesh Converter Tool of Allpix^2 " << ALLPIX_PROJECT_VERSION;

        LOG(STATUS) << "Using " << conf_file_name << " configuration file";

        std::ifstream file(conf_file_name);

        allpix::ConfigReader reader(file, conf_file_name);

        allpix::Configuration config = reader.getHeaderConfiguration();



        // Output file format:

        auto format = config.get<std::string>("model", "apf");

tools/mesh_converter/README.md

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ It should be noted that the Mesh Converter depends on the core utilities of the 
* `xyz`: Array to replace the system coordinates of the mesh. A detailed description of how to use this parameter is given below.

* `workers`: Number of worker threads to be used for the interpolation. Defaults to the available number of cores on the machine (hardware concurrency).

* `vector_field`: Select if the observable is a vector field or scalar field (Defaults to `true` matching the default observable `ElectricField`).

* `log_level`: Specifies the lowest log level which should be reported. Possible values are the same as for the Allpix Squared framework.



### Usage

To run the program, the following command should be executed from the installation folder: