ElectricFieldReader: mark some fields as not having an xy dependency (8907c226) · Commits · XRFLab109 / Allpix Squared

src/modules/ElectricFieldReader/ElectricFieldReaderModule.cpp

+14 −10

Original line number	Diff line number	Diff line
		@@ -128,10 +128,11 @@ void ElectricFieldReaderModule::initialize() {
		<< Units::display(config_.get<double>("minimum_position"), {"um", "mm"}) << " and maximum field "
		<< Units::display(config_.get<double>("maximum_field"), "V/cm") << " at electrode";
		detector_->setElectricFieldFunction(
		get_parabolic_field_function(thickness_domain), thickness_domain, FieldType::CUSTOM);
		get_parabolic_field_function(thickness_domain), thickness_domain, FieldType::CUSTOM1D);
		} else if(field_model == ElectricField::CUSTOM) {
		LOG(TRACE) << "Adding custom electric field";
		detector_->setElectricFieldFunction(get_custom_field_function(), thickness_domain, FieldType::CUSTOM);
		auto [field_function, field_type] = get_custom_field_function();
		detector_->setElectricFieldFunction(field_function, thickness_domain, field_type);
		}

		// Produce histograms if needed
		@@ -195,7 +196,7 @@ ElectricFieldReaderModule::get_parabolic_field_function(std::pair<double, double
		};
		}

		FieldFunction<ROOT::Math::XYZVector> ElectricFieldReaderModule::get_custom_field_function() {
		std::pair<FieldFunction<ROOT::Math::XYZVector>, FieldType> ElectricFieldReaderModule::get_custom_field_function() {

		auto field_functions = config_.getArray<std::string>("field_function");
		auto field_parameters = config_.getArray<double>("field_parameters");
		@@ -219,9 +220,10 @@ FieldFunction<ROOT::Math::XYZVector> ElectricFieldReaderModule::get_custom_field
		}

		LOG(DEBUG) << "Value of custom field at pixel center: " << Units::display(z->Eval(0., 0., 0.), "V/cm");
		return [z = std::move(z)](const ROOT::Math::XYZPoint& pos) {
		return {[z = std::move(z)](const ROOT::Math::XYZPoint& pos) {
		return ROOT::Math::XYZVector(0, 0, z->Eval(pos.x(), pos.y(), pos.z()));
		};
		},
		FieldType::CUSTOM1D};
		} else if(field_functions.size() == 3) {
		LOG(DEBUG) << "Found definition of 3D custom field, applying to three Cartesian axes";
		auto x = std::make_shared<TFormula>("ex", field_functions.at(0).c_str(), false);
		@@ -250,10 +252,12 @@ FieldFunction<ROOT::Math::XYZVector> ElectricFieldReaderModule::get_custom_field
		LOG(DEBUG) << "Value of custom field at pixel center: "
		<< Units::display(ROOT::Math::XYZVector(x->Eval(0., 0., 0.), y->Eval(0., 0., 0.), z->Eval(0., 0., 0.)),
		{"V/cm"});
		return [x = std::move(x), y = std::move(y), z = std::move(z)](const ROOT::Math::XYZPoint& pos) {
		return ROOT::Math::XYZVector(
		x->Eval(pos.x(), pos.y(), pos.z()), y->Eval(pos.x(), pos.y(), pos.z()), z->Eval(pos.x(), pos.y(), pos.z()));
		};
		return {[x = std::move(x), y = std::move(y), z = std::move(z)](const ROOT::Math::XYZPoint& pos) {
		return ROOT::Math::XYZVector(x->Eval(pos.x(), pos.y(), pos.z()),
		y->Eval(pos.x(), pos.y(), pos.z()),
		z->Eval(pos.x(), pos.y(), pos.z()));
		},
		FieldType::CUSTOM};
		} else {
		throw InvalidValueError(config_,
		"field_function",

src/modules/ElectricFieldReader/ElectricFieldReaderModule.hpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -76,8 +76,9 @@ namespace allpix {
		/**
		* @brief Create and apply a custom field from functions
		* @param thickness_domain Domain of the thickness where the field is defined
		* @return Pair with the field function and the deduced field type, CUSTOM or CUSTOM1D
		*/
		FieldFunction<ROOT::Math::XYZVector> get_custom_field_function();
		std::pair<FieldFunction<ROOT::Math::XYZVector>, FieldType> get_custom_field_function();

		/**
		* @brief Read field from a file in init or apf format