Feature osc class magic #161
Merged
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
…class for low memory structs
…file name to base object
…on taken from manager
…correct forward declared function signature
…how shifts and weights are applied
…FFDBase::SetupNuOscillator
…h3 into feature_OscClassMagic Latest changes from Dan
luketpickering
approved these changes
Oct 17, 2024
| #pragma omp parallel for | ||
| #endif | ||
| for(int i=0; i<splineKnots; i++){ | ||
| for(int i = 0; i < splineKnots; i++){ | ||
|
|
||
| if(tmpXCoeffArr[i]==-999){ |
There was a problem hiding this comment.
hard coded magic numbers
There was a problem hiding this comment.
these checks on -999 don't actually make any sense so I'll remove them. The spline coefficients are initialised to -999 here: https://github.com/mach3-software/MaCh3/blob/develop/splines/splineFDBase.cpp#L767
But then we immediately call GetCoef() where if the there is some failure here we would not get -999 out. So I have removed this check.
| @@ -394,13 +395,13 @@ std::vector<TAxis *> splineFDBase::FindSplineBinning(std::string FileName, std:: | |||
| TFile *File = new TFile(FileName.c_str()); | |||
There was a problem hiding this comment.
best to do something like:
auto File = std::unique_ptr<TFile>(TFile::Open(Filename.c_str()));| @@ -414,9 +415,8 @@ std::vector<TAxis *> splineFDBase::FindSplineBinning(std::string FileName, std:: | |||
| Obj = File->Get("dev_tmp.0.0"); | |||
There was a problem hiding this comment.
can use typed TFile::Get<T>
| @@ -683,7 +682,7 @@ void splineFDBase::PrepForReweight() | |||
| UniqueSystSplines[iSpline]->GetKnot(iKnot, xPoint, yPoint); | |||
| if (xPoint == -999 || yPoint == -999) | |||
There was a problem hiding this comment.
another case where this won't actually do anything since if GetKnot fails it won't just return -999.
…ointerToKinematicParameter as it's more accurate
…h3 into feature_OscClassMagic Latest changes from origin
Merged
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.
Pull request description
Contains both samplePDFFD clean up changes and uses the NuOscillator class for oscillation calculation.
Changes or fixes
Moves a lot of the samplePDFFD constructor into core which simplifies setting up a derived class.
Removed of a lot of the boiler plate for oscillation weights and calculations since this is now done in NuOscillator.
Examples