Commit 34382c0f authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'geometryConfigErrors' into 'master' 

Added warnings for unused keywords in the detector geometry definition.

Closes #278

See merge request allpix-squared/allpix-squared!1075
parents e34f3859 cbc1b06c

models/rd53a_25.conf

+4 −1
Original line number Diff line number Diff line
@@ -8,7 +8,10 @@ number_of_pixels = 200 384 
pixel_size = 100um 25um



sensor_thickness = 150um

sensor_excess_direction = 0.0mm 0.0mm 0.6um 0.6um 

sensor_excess_top = 0.0mm

sensor_excess_bottom = 0.0mm

sensor_excess_right = 0.6um

sensor_excess_left = 0.6um

bump_sphere_radius = 9.0um

bump_cylinder_radius = 7.0um

bump_height = 20.0um

models/rd53a_50.conf

+4 −1
Original line number Diff line number Diff line
@@ -8,7 +8,10 @@ number_of_pixels = 400 192 
pixel_size = 50um 50um



sensor_thickness = 150um

sensor_excess_direction = 0.0mm 0.0mm 0.6um 0.6um 

sensor_excess_top = 0.0mm

sensor_excess_bottom = 0.0mm

sensor_excess_right = 0.6um

sensor_excess_left = 0.6um

bump_sphere_radius = 9.0um

bump_cylinder_radius = 7.0um

bump_height = 20.0um

src/core/config/ConfigManager.hpp

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ namespace allpix { 
         * is guaranteed to have a configuration value 'identifier' that contains an unique identifier for every same config

         * name.

         */

        std::list<Configuration>& getInstanceConfigurations() { return instance_configs_; }

        const std::list<Configuration>& getInstanceConfigurations() const { return instance_configs_; }



        /**

         * @brief Drops an instance configuration from instance configuration storage

src/core/config/ConfigReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ ConfigReader& ConfigReader::operator=(const ConfigReader& other) { 
void ConfigReader::copy_init_map() {

    conf_map_.clear();

    for(auto iter = conf_array_.begin(); iter != conf_array_.end(); ++iter) {

        conf_map_[iter->getName()].push_back(iter);

        conf_map_[allpix::transform(iter->getName(), ::tolower)].push_back(iter);

    }

}

src/core/config/ConfigReader.hpp

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ namespace allpix { 
        unsigned int countConfigurations(std::string name) const;



        /**

         * @brief Get cmobined configuration of all empty sections (usually the header)

         * @brief Get combined configuration of all empty sections (usually the header)

         * @note Typically this is only the section at the top of the file

         * @return Configuration object for the empty section

         */