Fix validating the input to linear and cylindrical impurity/charge density (#574)

* Fix validating the input to linear and cylindrical impurity/charge density

* Fix impurity density for test detector

Author: fhagemann

examples/example_config_files/ivc_splitted_config/impurity_density.yaml

@@ -1,11 +1,5 @@
 impurity_density:
   name: linear
-  phi:
-    init: 0
-    gradient: 0
-  r:
-    init: 0
-    gradient: 0
   z:
     init: -10000000
     gradient: -100000

src/ChargeDensities/CylindricalChargeDensity.jl

@@ -32,7 +32,7 @@ function ChargeDensity(T::DataType, t::Val{:cylindrical}, dict::AbstractDict, in
     offsets, gradients = zeros(T,3), zeros(T,3)
     density_unit = internal_charge_unit * input_units.length^(-3)
     density_gradient_unit = internal_charge_unit * input_units.length^(-4)
-    if prod(map(k -> k in ["r","z"], collect(keys(dict)))) @warn "Only r and z are supported in the cylindrical charge density model.\nChange the charge density model in the config file or remove all other entries." end
+    if !prod(map(k -> k in ("r","z"), filter(x -> x != "name", collect(keys(dict))))) @warn "Only r and z are supported in the cylindrical charge density model.\nChange the charge density model in the config file or remove all other entries." end
     if haskey(dict, "r")     
         if haskey(dict["r"], "init")     offsets[1]   = _parse_value(T, dict["r"]["init"], density_unit) end
         if haskey(dict["r"], "gradient") gradients[1] = _parse_value(T, dict["r"]["gradient"], density_gradient_unit) end

src/ChargeDensities/LinearChargeDensity.jl

@@ -31,7 +31,7 @@ function ChargeDensity(T::DataType, t::Val{:linear}, dict::AbstractDict, input_u
     offsets, gradients = zeros(T,3), zeros(T,3)
     density_unit = internal_charge_unit * input_units.length^(-3)
     density_gradient_unit = internal_charge_unit * input_units.length^(-4)
-    if prod(map(k -> k in ["x","y","z"], collect(keys(dict)))) @warn "Only x, y and z are supported in the linear charge density model.\nChange the charge density model in the config file or remove all other entries." end
+    if !prod(map(k -> k in ("x","y","z"), filter(x -> x != "name", collect(keys(dict))))) @warn "Only x, y and z are supported in the linear charge density model.\nChange the charge density model in the config file or remove all other entries." end
     if haskey(dict, "x")
         if haskey(dict["x"], "init")     offsets[1]   = _parse_value(T, dict["x"]["init"], density_unit) end
         if haskey(dict["x"], "gradient") gradients[1] = _parse_value(T, dict["x"]["gradient"], density_gradient_unit) end

src/ImpurityDensities/CylindricalImpurityDensity.jl

@@ -32,7 +32,7 @@ function ImpurityDensity(T::DataType, t::Val{:cylindrical}, dict::AbstractDict,
     offsets, gradients = zeros(T,3), zeros(T,3)
     density_unit = input_units.length^(-3)
     density_gradient_unit = input_units.length^(-4)
-    if prod(map(k -> k in ["r","z"], collect(keys(dict)))) @warn "Only r and z are supported in the cylindrical impurity density model.\nChange the impurity density model in the config file or remove all other entries." end
+    if !prod(map(k -> k in ("r","z"), filter(x -> !(x in ("name", "corrections")), collect(keys(dict))))) @warn "Only r and z are supported in the cylindrical impurity density model.\nChange the impurity density model in the config file or remove all other entries." end
     if haskey(dict, "r")     
         if haskey(dict["r"], "init")     offsets[1]   = _parse_value(T, dict["r"]["init"], density_unit) end
         if haskey(dict["r"], "gradient") gradients[1] = _parse_value(T, dict["r"]["gradient"], density_gradient_unit) end

src/ImpurityDensities/LinearImpurityDensity.jl

@@ -31,7 +31,7 @@ function ImpurityDensity(T::DataType, t::Val{:linear}, dict::AbstractDict, input
     offsets, gradients = zeros(T,3), zeros(T,3)
     density_unit = input_units.length^(-3)
     density_gradient_unit = input_units.length^(-4)
-    if prod(map(k -> k in ["x","y","z"], collect(keys(dict)))) @warn "Only x, y and z are supported in the linear impurity density model.\nChange the impurity density model in the config file or remove all other entries." end
+    if !prod(map(k -> k in ("x","y","z"), filter(x -> !(x in ("name", "corrections")), collect(keys(dict))))) @warn "Only x, y and z are supported in the linear impurity density model.\nChange the impurity density model in the config file or remove all other entries." end
     if haskey(dict, "x")     
         if haskey(dict["x"], "init")     offsets[1]   = _parse_value(T, dict["x"]["init"], density_unit) end
         if haskey(dict["x"], "gradient") gradients[1] = _parse_value(T, dict["x"]["gradient"], density_gradient_unit) end

test/test_geant4.jl

@@ -57,7 +57,7 @@ end
 @testset "Run Geant4 simulations" begin
 
     # Create G4JLApplication
-    sim = Simulation{T}(SSD_examples[:InvertedCoaxInCryostat])
+    sim = @test_nowarn Simulation{T}(SSD_examples[:InvertedCoaxInCryostat])
     source = MonoenergeticSource("gamma", 2.615u"MeV", CartesianPoint(0.04, 0, 0.05), CartesianVector(-1,0,0))
     app = Geant4.G4JLApplication(sim, source)