Support tori with partial θ ranges in Geant4 extension
#459
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In an `AbstractConstructiveGeometry`, if the volume `A` has no volume, the overall `origin` and `rotation` should correspond to those of volume `B` (not `A`).
fhagemann
added
bug
fhagemann
changed the title
parse_origin and parse_rotation in Geant4 extensionθ ranges in Geant4 extension
fhagemann
commented
Feb 12, 2025
Comment on lines
+359
to
+364
| function _rectangle_point(x::T)::Tuple{T,T} where {T <: Real} | ||
| return ( | ||
| clamp(tand(abs(mod(x-90,360)-180)-90),-1,1), | ||
| clamp(tand(abs(mod( x,360)-180)-90),-1,1) | ||
| ) | ||
| end |
There was a problem hiding this comment.
Some back info: For tori with partial θ ranges, I intersect a full torus with a PolyCone.
The function _rectangle_point returns a point on a rectangle at a given θ (in degrees):
using SolidStateDetectors
using Geant4
using Plots
const G4 = Base.get_extension(SolidStateDetectors, :SolidStateDetectorsGeant4Ext)
base_plot = plot([1,1,-1,-1,1],[1,-1,-1,1,1], color = :black, ratio = 1, size = (400,400), label = "", xlims = (-2,2), ylims = (-2,2))
@gif for x in 0:5.:360-5
p = G4._rectangle_point(x)
plot(deepcopy(base_plot))
scatter!([p[1]], [p[2]], label = "", color = :black)
end
Comment on lines
+379
to
+387
| points = Tuple{T,T}[(zero(T), zero(T))] | ||
| push!(points, _rectangle_point(theta2)) | ||
| tmp::T = theta2 - mod(theta2 - 45, 90) | ||
| while theta1 < tmp && tmp > 0 | ||
| push!(points, _rectangle_point(tmp)) | ||
| tmp -= 90 | ||
| end | ||
| push!(points, _rectangle_point(theta1)) | ||
| push!(points, (zero(T), zero(T))) |
There was a problem hiding this comment.
I can use this to create a shape that spans over a rectangle with given theta1 and theta2:
T = Float64
# generate random values for theta1 and theta2
theta2 = 360 * rand(T)
theta1 = theta2 * rand(T)
points = Tuple{T,T}[(zero(T), zero(T))]
push!(points, G4._rectangle_point(theta2))
tmp::T = theta2 - mod(theta2 - 45, 90)
while theta1 < tmp && tmp > 0
push!(points, G4._rectangle_point(tmp))
tmp -= 90
end
push!(points, G4._rectangle_point(theta1))
push!(points, (zero(T), zero(T)))
plot(deepcopy(base_plot), legend = :topleft)
plot!(getindex.(points,1), getindex.(points,2), color = :red, lw = 2, label = "θ1 = $(theta1),\nθ2 = $(theta2)")
Comment on lines
+388
to
+393
| Polycone( | ||
| r = getindex.(points,1) .* rmax .+ e.r_torus, | ||
| z = getindex.(points,2) .* rmax, | ||
| origin = e.origin, | ||
| rotation = e.rotation | ||
| ) |
There was a problem hiding this comment.
... to then intersect the full-θ Torus with the newly defined Polycone
|
Looks perfect to me. Tested and good to go from my side! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In an
AbstractConstructiveGeometry, if the volumeAhas no volume, the overalloriginandrotationshould correspond to those of volumeB(notA).This fixes the issue reported in #457, where parts of boolean volumes were placed at the wrong position when the first volume was flagged as
has_volume == false.