LIneGRaphs: get model from module (ea2e4008) · Commits · XRFLab109 / Allpix Squared

src/modules/GenericPropagation/GenericPropagationModule.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -358,18 +358,18 @@ void GenericPropagationModule::run(Event* event) {

		// Output plots if required
		if(output_linegraphs_) {
		LineGraph::Create(event->number, this, model_, config_, output_plot_points, CarrierState::UNKNOWN);
		LineGraph::Create(event->number, this, config_, output_plot_points, CarrierState::UNKNOWN);
		if(output_linegraphs_collected_) {
		LineGraph::Create(event->number, this, model_, config_, output_plot_points, CarrierState::HALTED);
		LineGraph::Create(event->number, this, config_, output_plot_points, CarrierState::HALTED);
		}
		if(output_linegraphs_recombined_) {
		LineGraph::Create(event->number, this, model_, config_, output_plot_points, CarrierState::RECOMBINED);
		LineGraph::Create(event->number, this, config_, output_plot_points, CarrierState::RECOMBINED);
		}
		if(output_linegraphs_trapped_) {
		LineGraph::Create(event->number, this, model_, config_, output_plot_points, CarrierState::TRAPPED);
		LineGraph::Create(event->number, this, config_, output_plot_points, CarrierState::TRAPPED);
		}
		if(config_.get<bool>("output_animations")) {
		LineGraph::Animate(event->number, this, model_, config_, output_plot_points);
		LineGraph::Animate(event->number, this, config_, output_plot_points);
		}
		}

src/modules/ProjectionPropagation/ProjectionPropagationModule.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -423,7 +423,7 @@ void ProjectionPropagationModule::run(Event* event) {

		// Output plots if required
		if(output_linegraphs_) {
		LineGraph::Create(event->number, this, model_, config_, output_plot_points, CarrierState::UNKNOWN);
		LineGraph::Create(event->number, this, config_, output_plot_points, CarrierState::UNKNOWN);
		}

		if(output_plots_) {

src/modules/TransientPropagation/TransientPropagationModule.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -292,18 +292,18 @@ void TransientPropagationModule::run(Event* event) {

		// Output plots if required
		if(output_linegraphs_) {
		LineGraph::Create(event->number, this, model_, config_, output_plot_points, CarrierState::UNKNOWN);
		LineGraph::Create(event->number, this, config_, output_plot_points, CarrierState::UNKNOWN);
		if(output_linegraphs_collected_) {
		LineGraph::Create(event->number, this, model_, config_, output_plot_points, CarrierState::HALTED);
		LineGraph::Create(event->number, this, config_, output_plot_points, CarrierState::HALTED);
		}
		if(output_linegraphs_recombined_) {
		LineGraph::Create(event->number, this, model_, config_, output_plot_points, CarrierState::RECOMBINED);
		LineGraph::Create(event->number, this, config_, output_plot_points, CarrierState::RECOMBINED);
		}
		if(output_linegraphs_trapped_) {
		LineGraph::Create(event->number, this, model_, config_, output_plot_points, CarrierState::TRAPPED);
		LineGraph::Create(event->number, this, config_, output_plot_points, CarrierState::TRAPPED);
		}
		if(config_.get<bool>("output_animations")) {
		LineGraph::Animate(event->number, this, model_, config_, output_plot_points);
		LineGraph::Animate(event->number, this, config_, output_plot_points);
		}
		}

src/tools/line_graphs.h

+3 −4

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ namespace allpix {
		*
		* @param event_num Index for this event
		* @param module Module to generate plots for, used to create output files and to obtain ROOT directory
		* @param model Detector model to generate graphs for, used for obtaining geometrical information
		* @param config Configuration object used for this module instance
		* @param output_plot_points List of points cached for plotting
		* @param plotting_state State of charge carriers to be plotted. If state is set to CarrierState::UNKNOWN, all charge
		@@ -46,11 +45,12 @@ namespace allpix {
		*/
		static void Create(uint64_t event_num, // NOLINT
		Module* module,
		const std::shared_ptr<DetectorModel>& model,
		const Configuration& config,
		const OutputPlotPoints& output_plot_points,
		CarrierState plotting_state) {

		auto model = module->getDetector()->getModel();

		auto title = (plotting_state == CarrierState::UNKNOWN ? "all" : allpix::to_string(plotting_state));
		LOG(TRACE) << "Writing line graph for " << title << " charge carriers";

		@@ -123,18 +123,17 @@ namespace allpix {
		*
		* @param event_num Index for this event
		* @param module Module to generate plots for, used to create output files and to obtain ROOT directory
		* @param model Detector model to generate graphs for, used for obtaining geometrical information
		* @param config Configuration object used for this module instance
		* @param output_plot_points List of points cached for plotting
		* carriers are plotted.
		*/
		static void Animate(uint64_t event_num, // NOLINT
		Module* module,
		const std::shared_ptr<DetectorModel>& model,
		const Configuration& config,
		const OutputPlotPoints& output_plot_points) {

		LOG(TRACE) << "Writing animation for all charge carriers";
		auto model = module->getDetector()->getModel();

		auto [minX, maxX, minY, maxY, scale_x, scale_y, max_charge, total_charge, tot_point_cnt, start_time] =
		get_plot_settings(model, config, output_plot_points);