Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/ImpurityDensities/ImpurityDensities.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,24 @@ In this matter the detector impurities are automatically determined from those o
abstract type AbstractImpurityDensity{T <: SSDFloat} end

@inline function ImpurityDensity(T::DataType, dict::AbstractDict, input_units::NamedTuple)
return ImpurityDensity(T, Val{Symbol(dict["name"])}(), dict, input_units)
imp = ImpurityDensity(T, Val{Symbol(dict["name"])}(), dict, input_units)
if !haskey(dict, "corrections")
imp
else
scale = _parse_value(T, get(dict["corrections"], "scale", 1), NoUnits)
offset = _parse_value(T, get(dict["corrections"], "offset", 0), input_units.length^(-3))
(scale * imp) + offset
end
end

(*)(idm::AbstractImpurityDensity, scale::Real) = (*)(scale, idm)
(+)(idm::AbstractImpurityDensity, offset::Union{<:Real, <:Quantity{<:Real, Unitful.𝐋^(-3)}}) = (+)(offset, idm)

# Throw ConfigFileError for impurity densities that do not support corrections
(*)(scale::Real, ::I) where {I <: AbstractImpurityDensity} = throw(ConfigFileError("Impurity density $(I.name.name) does not support corrections"))
(+)(offset::Union{<:Real, <:Quantity{<:Real, Unitful.𝐋^(-3)}}, ::I) where {I <: AbstractImpurityDensity} = throw(ConfigFileError("Impurity density $(I.name.name) does not support corrections"))


"""
get_impurity_density(id::AbstractImpurityDensity, pt::AbstractCoordinatePoint)

Expand Down
5 changes: 1 addition & 4 deletions src/SolidStateDetector/Semiconductor.jl
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ end
function Semiconductor{T}(dict::AbstractDict, input_units::NamedTuple, outer_transformations) where T <: SSDFloat

impurity_density_model = if haskey(dict, "impurity_density")
hascorrections = haskey(dict["impurity_density"], "corrections")
impurity_density_scale = hascorrections ? _parse_value(T, get(dict["impurity_density"]["corrections"], "scale", 1), NoUnits) : T(1)
impurity_density_offset = hascorrections ? _parse_value(T, get(dict["impurity_density"]["corrections"], "offset", 0), input_units.length^(-3)) : T(0)
impurity_density_scale * ImpurityDensity(T, dict["impurity_density"], input_units) + impurity_density_offset
imp = ImpurityDensity(T, dict["impurity_density"], input_units)
elseif haskey(dict, "charge_density_model")
@warn "Config file deprication: The field \"charge_density_model\" under semiconductor is deprecated.
It should be changed to \"impurity_density\". In later version this will result in an error.
Expand Down
Loading