DetectorField: always check for z position, introduce FielType::CUSTOM1D to mark xy dependency (17914279) · Commits · XRFLab109 / Allpix Squared

src/core/geometry/DetectorField.hpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ namespace allpix {
		CONSTANT, ///< Constant field
		LINEAR, ///< Linear field (linearity determined by function)
		GRID, ///< Field supplied through a regularized grid
		CUSTOM1D, ///< Custom field function, dependent only on z
		CUSTOM, ///< Custom field function
		};

src/core/geometry/DetectorField.tpp

+9 −21

Original line number	Diff line number	Diff line
		@@ -28,22 +28,17 @@ namespace allpix {
		return {};
		}

		auto z = pos.z();

		if(type_ == FieldType::CONSTANT) {
		// Constant field - return value
		return function_(pos);
		} else if(type_ == FieldType::LINEAR) {
		// Linear field - return value at given depth

		// Check if we need to extrapolate along the z axis or if is inside thickness domain:
		if(extrapolate_z) {
		z = std::clamp(z, thickness_domain_.first, thickness_domain_.second);
		} else if(z < thickness_domain_.first \|\| thickness_domain_.second < z) {
		auto z = (extrapolate_z ? std::clamp(pos.z(), thickness_domain_.first, thickness_domain_.second) : pos.z());
		if(z < thickness_domain_.first \|\| thickness_domain_.second < z) {
		return {};
		}

		// Calculate the field from the configured function:
		if(type_ == FieldType::CONSTANT) {
		// Constant field - return value:
		return function_({});
		} else if(type_ == FieldType::LINEAR \|\| type_ == FieldType::CUSTOM1D) {
		// Linear field or custom field function with z dependency only - calculate value from configured function:
		return function_(ROOT::Math::XYZPoint(0, 0, z));
		} else {

		@@ -82,13 +77,6 @@ namespace allpix {
		ret_val = get_field_from_grid(
		ROOT::Math::XYZPoint(x * normalization_[0] + 0.5, y * normalization_[1] + 0.5, pos.z()), extrapolate_z);
		} else {
		// Check if we need to extrapolate along the z axis or if is inside thickness domain:
		if(extrapolate_z) {
		z = std::clamp(z, thickness_domain_.first, thickness_domain_.second);
		} else if(z < thickness_domain_.first \|\| thickness_domain_.second < z) {
		return {};
		}

		// Calculate the field from the configured function:
		ret_val = function_(ROOT::Math::XYZPoint(x, y, z));
		}