[v626][RF] Backports of RooFit PRs to v6-26-00-patches: Part 18
#11057
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
Last year, with commit 3657e7c, the parameter index calculation was changed to be on the fly instead of using a look-up map, which is much faster. However, the implemented formula was not correct for two or three dimensions, which is fixed by this commit. To make sure that the index computation is correct this time, the new code was tested in this code snippet with various inputs: ```C++ void runTest(int nx = 42, int ny = 42, int nz = 42) { const int nxy = nx * ny; const int nyz = ny * nz; for (int i = 0; i < nx; ++i) { for (int j = 0; j < ny; ++j) { for (int k = 0; k < nz; ++k) { const int index = k + j * nz + i * ny * nz; const int gammaIndex = i + j * nx + k * nx * ny; const int i2 = index / nyz; const int tmp = index % nyz; const int j2 = tmp / nz; const int k2 = tmp % nz; const int gammaIndex2 = i2 + j2 * nx + k2 * nxy; if (gammaIndex2 != gammaIndex) { std::cout << "The unraveled indices were not correct!" << std::endl; return; } } } } } ``` Needs to be backported to the 6.26 branch to get into the 6.26.06 patch release. This commit the following problem reported on the forum: https://root-forum.cern.ch/t/cpycppyy-segfault-on-mac-m1/50822
The RDataFrameHelper should be consistent with creating a RooDataSet from a TTree, meaning out-of-range events should be skipped. This is implemented in this commit, borrowing the logic from `RooTreeDataStore::loadValues()`. A unit test is also implemented. The previous logic of just taking just all values to fill the dataset was very dangerous, because these values then clipped to the RooRealVar limits and biased the number of events observed at the boundaries. Closes root-project#11017.
This commit removes the `_curNormSet` and `_ownParameters` member variables from the RooLagrangianMorphFunc. The `_ownParameters` was simply unused, and the `_curNormSet` was redundant because there is already `RooAbsReal::_lastNSet` that also points to the current normalization set. Now, the `RooLagrangianMorphFunc::getValV()` can also be removed because the sole purpose was to set `_curNormSet`, and also the private `RooLagrangianMorphFunc::getCache()` interface can be changed to take no normSet parameter (as it was unused anyway). The `RooLagrangianMorphFunc::_cacheMgr` declaration is also moved to the bottom of the file together with the other member variables.
This is to enable IO for the RooLagrangianMorphFunc.
The title for the x-axis of the first plot should be `"p_{T}^{V}"` and
not `"c_{Hq^{(3)}}"`.
Also, the title for the observable is changed to `"p_{T}^{V}"` to get
the right axis label for the x-axes of the plots.
|
Starting build on |
|
Build failed on ROOT-performance-centos8-multicore/cxx17. Failing tests:
|
|
Build failed on windows10/cxx14. Errors:
|
|
Build failed on mac11/cxx14. Failing tests:
|
guitargeek
force-pushed
the
v6-26-00-patches_roofit_backports_18
branch
from
3b9183b to
e7ac26b
Compare
|
Starting build on |
16 tasks
20 tasks
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.
This is a backport of all the relevant bugfix RooFit PRs that were recently merged to
mastertov6-26-00-patches(in the right order, to not have the commit history diverge too much).