Adding x_sep for integration of NuSTAR like optics #74
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
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
jgalan
reviewed
Aug 28, 2023
src/TRestAxionTrueWolterOptics.cxx
Outdated
| @@ -174,6 +174,10 @@ void TRestAxionTrueWolterOptics::Initialize() { | |||
| fAlpha = GetAlpha(); | |||
| fThickness = GetThickness(); | |||
|
|
|||
| fXSep.clear(); | |||
| for (const auto& a : fAlpha) | |||
| fXSep.push_back(2 * (fR1 - fR3 - fMirrorLength * TMath::Sin(a)) / TMath::Tan(a)); | |||
There was a problem hiding this comment.
fR3 is a std::vector that's why the compilation is failing, and validation is not going through.
Your need to access the elements of fR1 and fR3.
for( size_t n = 0; n < fAlpha.size(); n++ )
fXSep.push_back(2 * (fR1[n] - fR3[n] - fMirrorLength * TMath::Sin(fAlpha[n])) / TMath::Tan(fAlpha[n]));
where I am assuming fAlpha, fR1 and fR3 have the same number of elements.
There was a problem hiding this comment.
Ah, yeah, that's true!
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
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.
X_sep as the distance between the mirror stacks has to be added to both TRestAxionTrueWolterOptics and TRestAxionWolterOptics.
Update: It is now added to everything but the GetConeVectorIntersection(), where the vector intersects with the cone in the framework.