-
Notifications
You must be signed in to change notification settings - Fork 45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Mirror ribs #471
base: main
Are you sure you want to change the base?
Mirror ribs #471
Conversation
Use an updated base branch. Until you do, checks will fail. |
Hi @wdconinc thanks a lot! I just noticed it. I will take care of it. |
src/DRICH_geo.cpp
Outdated
double mirrorTheta2 = 0.4*mirrorThetaRot + std::asin((mirrorRmax - mirrorCenterX) / mirrorRadius); | ||
double mirrorTheta3 = 0.41*mirrorThetaRot + std::asin((mirrorRmax - mirrorCenterX) / mirrorRadius); | ||
double mirrorTheta4 = 1.0*mirrorThetaRot + std::asin((mirrorRmax - mirrorCenterX) / mirrorRadius); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move hard-coded numbers (0.4 and 0.41) to drich.xml
.
src/DRICH_geo.cpp
Outdated
Tube pieSlice(0.01 * cm, vesselRmax2, tankLength / 2.0, -mirrorPhiw / 2.0, mirrorPhiw / 2.0); | ||
Tube pieSlice1(0.01 * cm, vesselRmax2, tankLength / 2.0, -mirrorPhiw / 2.0, (0.05*mirrorPhiw) / 2.0); | ||
Tube pieSlice2(0.01 * cm, vesselRmax2, tankLength / 2.0, (0.06*mirrorPhiw) / 2.0, mirrorPhiw / 2.0); | ||
IntersectionSolid mirrorSolid2(pieSlice, mirrorSolid1, mirrorPlacement); | ||
IntersectionSolid mirrorSolid4(pieSlice1, mirrorSolid3, mirrorPlacement); | ||
IntersectionSolid mirrorSolid5(pieSlice2, mirrorSolid3, mirrorPlacement); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps it's time to come up with clearer names than using incrementing numbers, since we are now at "5".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't have any good ideas, but maybe something like
- mirrorSolidInnerTile
- mirrorSolidOuterTileA
- mirrorSolidOuterTileB
Or you could put these in some STL container, such as std::set
, so that you don't really have to give them names.
src/DRICH_geo.cpp
Outdated
Volume mirrorVol(detName + "_mirror_0" + secName, mirrorSolid2, mirrorMat); | ||
Volume mirrorVol2(detName + "_mirror_1" + secName, mirrorSolid4, mirrorMat); | ||
Volume mirrorVol3(detName + "_mirror_2" + secName, mirrorSolid5, mirrorMat); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Volume mirrorVol(detName + "_mirror_0" + secName, mirrorSolid2, mirrorMat); | |
Volume mirrorVol2(detName + "_mirror_1" + secName, mirrorSolid4, mirrorMat); | |
Volume mirrorVol3(detName + "_mirror_2" + secName, mirrorSolid5, mirrorMat); | |
Volume mirrorVol(detName + "_mirror_tile0" + secName, mirrorSolid2, mirrorMat); | |
Volume mirrorVol2(detName + "_mirror_tile1" + secName, mirrorSolid4, mirrorMat); | |
Volume mirrorVol3(detName + "_mirror_tile2" + secName, mirrorSolid5, mirrorMat); |
or some suitable name, just so it's clear what 0
, 1
, and 2
mean.
@c-dilks I have changed the variables names to something more meaningful and have also added a set of ribs. |
This is how it looks now: |
8fa2d84
to
2435232
Compare
for more information, see https://pre-commit.ci
Looks good enough to me.
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll defer to @c-dilks here
LGTM. Mark ready and add to merge queue. |
Please don't merge now! |
@c-dilks I had a discussion with Macro today, and he is right. That this gap should not be carbon fibre but C2F6, as these open region is useful for alignment of the mirror. This aligns with my first implementation. I will change the rib material. |
@chchatte92 What is the status of this PR? Should it be included in the February release for simulation campaign? |
Briefly, what does this PR introduce?
What kind of change does this PR introduce?
Please check if this PR fulfills the following:
Does this PR introduce breaking changes? What changes might users need to make to their code?
Does this PR change default behavior?