Skip to content
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

Feature flexible binning #89

Merged
merged 48 commits into from
Aug 30, 2024
Merged

Feature flexible binning #89

merged 48 commits into from
Aug 30, 2024

Conversation

EdAtkin
Copy link
Contributor

@EdAtkin EdAtkin commented Aug 22, 2024

Pull request description:

Various changes on the FD side to make the setup slightly more flexible and some smaller changes. No more binning opt to set the the number of dimensions you want your sample to be binned in. Also a change so that you don't have to pass oscillation parameters (or a null array) to the reweight function.

Changes or fixes:

No more binning opt.
Fix to spline evaluation and now use maps to get the systematic and spline indices for particular DetIds

Examples:

NA

EdAtkin added 29 commits April 22, 2024 17:19
… y_var accordingly. Also made x_var, y_var const pointers so they can't be altered in the core code, they can still be altered in the daughter class
…y the splines directly along with the strings associated with each variable that the spline is binned in. This always is assumed to mean that your spline are binned in true neutrino energy plus your sample binning
…so removing the hard-coded *0.001 to the xvar which was baked in there due to a GeV vs MeV problem.
…sample binning. Can now have different binning for sample and spline but still has to be in the same variables
…access beyond xArray size of spline knots when nKnots was 2. I also made the FindSplineSegment near identical to how it is done for the ND in the SplineMonolithClass
…e of nPars is one extra if statement we don't need in the reweighting
…is means we no longer need to pass oscillation parameters to the reweight call. Instead we just have an array of pointers to the proposed oscillation parameter, a lot more like the covarianceXsec parameters
…this was just not a problem with previous versions of ROOT?
…the global index, this is needed for accessing vectors which can be of size _fNumPar of _fNumSplines
@EdAtkin EdAtkin requested a review from KSkwarczynski August 22, 2024 15:17
@EdAtkin EdAtkin requested a review from dbarrow257 August 22, 2024 15:18
@EdAtkin EdAtkin marked this pull request as draft August 22, 2024 17:46
mcmc/CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
samplePDF/samplePDFInterface.h Outdated Show resolved Hide resolved
mcmc/stretch.cpp Outdated Show resolved Hide resolved
…icated function defintions in covarianceXsec.h and remove pot from samplePDFBase init functions
@EdAtkin EdAtkin marked this pull request as ready for review August 22, 2024 21:50
Copy link
Member

@KSkwarczynski KSkwarczynski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I left some nitpicky comments

samplePDF/samplePDFFDBase.h Outdated Show resolved Hide resolved
samplePDF/samplePDFFDBase.h Outdated Show resolved Hide resolved
samplePDF/samplePDFBase.h Show resolved Hide resolved
@EdAtkin EdAtkin merged commit c036945 into develop Aug 30, 2024
3 checks passed
@EdAtkin EdAtkin deleted the feature_FlexibleBinning branch August 30, 2024 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants