Skip to content

Commit

Permalink
Merge pull request #163 from lmh91/csg_updates
Browse files Browse the repository at this point in the history
Refactor Volume Primitives and Improvements in Painting

Thanks both of you for your comments!
  • Loading branch information
lmh91 authored Jun 30, 2021
2 parents 3dafb40 + 325f0e8 commit ba44cc3
Show file tree
Hide file tree
Showing 91 changed files with 4,651 additions and 2,360 deletions.
4 changes: 4 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
ParallelProcessingTools = "8e8a01fc-6193-5ca1-a2f1-20776dae4199"
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
PolygonOps = "647866c9-e3ac-4575-94e7-e3d426903924"
Polynomials = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
RadiationDetectorSignals = "bf2c0563-65cf-5db2-a620-ceb7de82658c"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Expand All @@ -41,6 +44,7 @@ IntervalSets = "0.3, 0.4, 0.5"
JSON = "0.21"
LaTeXStrings = "1"
ParallelProcessingTools = "0.4"
PolygonOps = "0.1"
ProgressMeter = "1.2"
RadiationDetectorSignals = "0.1"
RecipesBase = "0.7, 0.8, 1.0"
Expand Down
14 changes: 7 additions & 7 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ function fix_literate_output(content)
return content
end

gen_content_dir = joinpath(@__DIR__, "src")
tutorial_src = joinpath(@__DIR__, "src", "tutorial_lit.jl")
Literate.markdown(tutorial_src, gen_content_dir, name = "tutorial", documenter = true, credit = true, postprocess = fix_literate_output)
#Literate.markdown(tutorial_src, gen_content_dir, name = "tutorial", codefence = "```@repl tutorial" => "```", documenter = true, credit = true)
Literate.notebook(tutorial_src, gen_content_dir, execute = false, name = "ssd_tutorial", documenter = true, credit = true)
Literate.script(tutorial_src, gen_content_dir, keep_comments = false, name = "ssd_tutorial", documenter = true, credit = false)
# gen_content_dir = joinpath(@__DIR__, "src")
# tutorial_src = joinpath(@__DIR__, "src", "tutorial_lit.jl")
# Literate.markdown(tutorial_src, gen_content_dir, name = "tutorial", documenter = true, credit = true, postprocess = fix_literate_output)
# #Literate.markdown(tutorial_src, gen_content_dir, name = "tutorial", codefence = "```@repl tutorial" => "```", documenter = true, credit = true)
# Literate.notebook(tutorial_src, gen_content_dir, execute = false, name = "ssd_tutorial", documenter = true, credit = true)
# Literate.script(tutorial_src, gen_content_dir, keep_comments = false, name = "ssd_tutorial", documenter = true, credit = false)


makedocs(
Expand All @@ -44,7 +44,7 @@ makedocs(
"Drift Fields" => "man/drift_fields.md",
"IO" => "man/IO.md",
],
"Tutorial" => "tutorial.md",
# "Tutorial" => "tutorial.md",
"API" => "api.md",
"LICENSE" => "LICENSE.md",
],
Expand Down
118 changes: 0 additions & 118 deletions examples/example_config_files/public_CGD_config.json

This file was deleted.

105 changes: 105 additions & 0 deletions examples/example_config_files/public_CGD_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
name: ExampleCuboid
units:
length: mm
angle: deg
potential: V
temperature: K
grid:
coordinates: cartesian
axes:
x:
from: -9
to: 9
boundaries: inf
y:
from: -9
to: 9
boundaries: inf
z:
from: -9
to: 9
boundaries: inf
medium: vacuum
detectors:
- translate:
x: 0
rotate:
Z: 45
bulk:
material: HPGe
temperature: 78
impurity_density:
name: linear
x:
init: 0
gradient: 0
y:
init: 0
gradient: 0
z:
init: 10000000
gradient: 50000
charge_drift_model:
include: ADLChargeDriftModel/drift_velocity_config.json
geometry:
box:
x: 10 # width in x
y: 10 # width in y
z: 10 # width in z
contacts:
- material: HPGe
name: n+ contact
potential: 2000
channel: 1
geometry:
union:
- box:
x:
from: -5
to: -4.5
y: 10
z: 10
- translate:
z: 4.5
box:
x:
from: -4.5
to: -4
y: 10
z: 1
- material: HPGe
name: p+ contact
potential: 0
channel: 2
geometry:
translate:
y: 0
difference:
- box:
x:
from: 4.5
to: 5
y: 10
z: 10
- box:
x:
from: 4
to: 5.5
y: 4
z: 4

surroundings:
- name: Base
material: Copper
potential: 0
geometry:
box:
x:
from: -9
to: 9
y:
from: -9
to: 9
z:
from: -9
to: -7
104 changes: 104 additions & 0 deletions examples/example_config_files/public_CGD_config_cyl_grid.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: ExampleCuboid
units:
length: mm
angle: deg
potential: V
temperature: K
grid:
coordinates: cylindrical
axes:
r:
to: 9
boundaries: inf
y:
from: 0
to: 0
boundaries: periodic
z:
from: -9
to: 9
boundaries: inf
medium: vacuum
detectors:
- translate:
x: 0
rotate:
Z: 45
bulk:
material: HPGe
temperature: 78
impurity_density:
name: linear
x:
init: 0
gradient: 0
y:
init: 0
gradient: 0
z:
init: 10000000
gradient: 50000
charge_drift_model:
include: ADLChargeDriftModel/drift_velocity_config.json
geometry:
box:
x: 10 # width in x
y: 10 # width in y
z: 10 # width in z
contacts:
- material: HPGe
name: n+ contact
potential: 2000
channel: 1
geometry:
union:
- box:
x:
from: -5
to: -4.5
y: 10
z: 10
- translate:
z: 4.5
box:
x:
from: -4.5
to: -4
y: 10
z: 1
- material: HPGe
name: p+ contact
potential: 0
channel: 2
geometry:
translate:
y: 0
difference:
- box:
x:
from: 4.5
to: 5
y: 10
z: 10
- box:
x:
from: 4
to: 5.5
y: 4
z: 4

surroundings:
- name: Base
material: Copper
potential: 0
geometry:
box:
x:
from: -9
to: 9
y:
from: -9
to: 9
z:
from: -9
to: -7
Loading

0 comments on commit ba44cc3

Please sign in to comment.