Merge branch 'p-coverity' into 'master' (d2d08689) · Commits · XRFLab109 / Allpix Squared

src/core/geometry/DetectorModel.cpp

+8 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,14 @@ DetectorModel::DetectorModel(std::string type, std::shared_ptr<DetectorAssembly>
		std::transform(hole_type.begin(), hole_type.end(), hole_type.begin(), ::tolower);
		auto hole_size = support_config.get<XYVector>("hole_size", {0, 0});
		auto hole_offset = support_config.get<XYVector>("hole_offset", {0, 0});
		addSupportLayer(size, thickness, offset, material, hole_type, location, hole_size, hole_offset);
		addSupportLayer(size,
		thickness,
		std::move(offset),
		std::move(material),
		std::move(hole_type),
		std::move(location),
		hole_size,
		std::move(hole_offset));
		}
		}

src/core/geometry/DetectorModel.hpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -563,12 +563,12 @@ namespace allpix {
		ROOT::Math::XYVector hole_offset) {
		ROOT::Math::XYZVector full_size(size.x(), size.y(), thickness);
		ROOT::Math::XYZVector full_hole_size(hole_size.x(), hole_size.y(), thickness);
		support_layers_.push_back(SupportLayer(full_size,
		support_layers_.push_back(SupportLayer(std::move(full_size),
		std::move(offset),
		std::move(material),
		std::move(type),
		std::move(location),
		full_hole_size,
		std::move(full_hole_size),
		std::move(hole_offset)));
		}

src/core/geometry/GeometryManager.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,8 @@ void GeometryManager::load(ConfigManager* conf_manager, RandomNumberGenerator& s

		// Create the detector and add it without model
		// NOTE: cannot use make_shared here due to the private constructor
		auto detector = std::shared_ptr<Detector>(new Detector(geometry_section.getName(), position, orientation));
		auto detector =
		std::shared_ptr<Detector>(new Detector(geometry_section.getName(), std::move(position), orientation));
		addDetector(detector);

		// Add a link to the detector to add the model later

src/core/geometry/PixelDetectorModel.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ PixelDetectorModel::PixelDetectorModel(std::string type,
		setNPixels(config.get<DisplacementVector2D<Cartesian2D<unsigned int>>>("number_of_pixels"));
		// Size of the pixels
		auto pixel_size = config.get<XYVector>("pixel_size");
		setPixelSize(pixel_size);
		setPixelSize(std::move(pixel_size));
		}

		void PixelDetectorModel::validate() {

src/core/module/ModuleManager.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ std::pair<ModuleIdentifier, Module> ModuleManager::create_unique_modules(void
		// Build module
		Module* module = module_generator(instance_config, messenger, geo_manager);
		// Reset log
		set_module_after(old_settings);
		set_module_after(std::move(old_settings));
		// Update execution time
		auto end = std::chrono::steady_clock::now();
		module_execution_time_[module] += std::chrono::duration_cast<std::chrono::nanoseconds>(end - start).count();
		@@ -458,7 +458,7 @@ std::vector<std::pair<ModuleIdentifier, Module*>> ModuleManager::create_detector
		// Build module
		Module* module = module_generator(instance_config, messenger, instance.first);
		// Reset logging
		set_module_after(old_settings);
		set_module_after(std::move(old_settings));
		// Update execution time
		auto end = std::chrono::steady_clock::now();
		module_execution_time_[module] += std::chrono::duration_cast<std::chrono::nanoseconds>(end - start).count();
		@@ -660,7 +660,7 @@ void ModuleManager::initialize() {
		// Init module
		module->initialize();
		// Reset logging
		set_module_after(old_settings);
		set_module_after(std::move(old_settings));
		// Update execution time
		auto end = std::chrono::steady_clock::now();
		module_execution_time_[module.get()] += std::chrono::duration_cast<std::chrono::nanoseconds>(end - start).count();
		@@ -707,7 +707,7 @@ void ModuleManager::run(RandomNumberGenerator& seeder) {
		module->initializeThread();

		// Reset logging
		ModuleManager::set_module_after(old_settings);
		ModuleManager::set_module_after(std::move(old_settings));
		}
		};

		@@ -722,7 +722,7 @@ void ModuleManager::run(RandomNumberGenerator& seeder) {
		module->finalizeThread();

		// Reset logging
		ModuleManager::set_module_after(old_settings);
		ModuleManager::set_module_after(std::move(old_settings));
		}
		};

		@@ -826,7 +826,7 @@ void ModuleManager::run(RandomNumberGenerator& seeder) {
		}

		// Reset logging
		ModuleManager::set_module_after(old_settings);
		ModuleManager::set_module_after(std::move(old_settings));

		// Update execution time
		auto end = std::chrono::steady_clock::now();
		@@ -956,7 +956,7 @@ void ModuleManager::finalize() {
		module->set_ROOT_directory(nullptr);
		// Remove the config manager
		module->set_config_manager(nullptr);
		set_module_after(old_settings);
		set_module_after(std::move(old_settings));
		// Update execution time
		auto end = std::chrono::steady_clock::now();
		module_execution_time_[module.get()] += std::chrono::duration_cast<std::chrono::nanoseconds>(end - start).count();