[RF] Clean up RooFit after modernising RooFit's categories. #5514
Conversation
|
Starting build on |
This comment has been minimized.
This comment has been minimized.
hageboeck
force-pushed
the
cleanupCategories
branch
from
addda31 to
6b55e31
Compare
|
Starting build on |
This comment has been minimized.
This comment has been minimized.
hageboeck
force-pushed
the
cleanupCategories
branch
from
6b55e31 to
ca36c00
Compare
|
Starting build on |
hageboeck
force-pushed
the
cleanupCategories
branch
from
ca36c00 to
b60341f
Compare
|
Starting build on |
hageboeck
force-pushed
the
cleanupCategories
branch
from
b60341f to
ad20740
Compare
|
Starting build on |
|
Build failed on ROOT-debian10-i386/cxx14. Failing tests: |
hageboeck
force-pushed
the
cleanupCategories
branch
from
ad20740 to
7367bb0
Compare
|
Starting build on |
Provide overloads for setting category states from integers, const char* and std::string, as well as from other category states.
Remove explicit uses of the deprecated RooCatType inside roofit. When setting R__LESS_INCLUDES, RooAbsCategory.h stops to automatically include the deprectated RooCatType.h. Here, all explicit uses of this class and header are removed. Only a few classes that weren't easy to update still use it, but these include it directly as `RooFitLegacy/RooCatTypeLegacy.h`.
Make use of the fact that the new category interface also accepts std::string.
Put updated category interface demos in tutorials. Also extend rf404 with instructions on how to query, iterate and set states.
The deprecated RooAbsCategory::lookupType() is sometimes used to check if a string label refers to a valid category state. It returns a pointer to the deprecated RooCatType, but often, the pointer was only checked if it's nullptr. These instances have been replaced with RooAbsCategory::hasLabel().
hageboeck
force-pushed
the
cleanupCategories
branch
from
7367bb0 to
6c66dd6
Compare
|
Starting build on |
eguiraud
left a comment
eguiraud
left a comment
There was a problem hiding this comment.
LGTM, many nice small improvements.
IIUC RooAbsCollection offers some STL compatibility support, namely begin, end, rbegin and rend. At this point it might be good to decide if it should satisfy all of the STL container requirements or not. It's a bit misleading to only offer part of the interface expected from an STL container.
Point taken. This is now: |
Amended to not revert the changes to be commit in PR root-project#5514.
Amended to not revert the changes to be commit in PR root-project#5514.
Amended to not revert the changes to be added in PR root-project#5514.
|
Build failed on ROOT-fedora29/python3. Failing tests: |
Amended to not revert the changes to be added in PR root-project#5514.
Amended to not revert the changes to be added in PR #5514.
Amended to not revert the changes to be added in PR root-project#5514.
3 participants
After giving RooFit's categories a new interface, a lot of legacy code was left in place - the new categories support both the old and new interface.
The PR was split in two parts partly for testing that old code would still work, partly to make #5502 smaller.
Here, the big cleanup happens: