[v640][RF] RooFit backports#22673
Merged
Merged
Conversation
Update xRooFit again, to accommodate more features/improvements made in past week while working on the Higgs discovery workspaces. (cherry picked from commit d536fdf)
Fix various memory leaks from cases where functions that return an owned return value were used without deleting the return value. This is addressed by using `std::unique_ptr`. (cherry picked from commit 2b876bb)
The `static_range_cast` and `dynamic_range_cast` are RooFit helper functions to iterate over polymorphic collections like `RooArgSet` and `RooArgList`. Using them instead of casting in a separate line makes the code more concise with fewer lines and throw-away temoprary variables. (cherry picked from commit 4f2cf43)
Added I/O for RooWrapperPdf and changed extendpdf I/O to be compliant with HS3. (cherry picked from commit d75a72f)
Refactor the HS3 serialization code to remove duplicated logic without any change in behavior. All hs3, histfactory and JSON tests still pass. JSONFactories_RooFitCore.cxx: - Drop RooLegacyExpPolyFactory; it was identical to the existing RooPolynomialFactory<RooLegacyExpPoly>, which is now registered directly. - Drop RooLegacyExpPolyStreamer; it was identical to RooPolynomialStreamer<RooLegacyExpPoly>. - Merge RooHistFuncStreamer/RooHistPdfStreamer into RooHistStreamer<T> and RooHistFuncFactory/RooHistPdfFactory into RooHistFactory<T>; each pair differed only by the concrete RooFit type. RooJSONFactoryWSTool.cxx: - Remove fillSeqSanitizedName, which had no callers anywhere in ROOT. - Factor the "make a valid name but refuse to change the first character" block (exportCategory, exportCombinedData) into makeValidNameOrError(). - Collapse the repeated ofstream/ifstream open-and-error boilerplate in exportJSON/exportYML/importJSON/importYML. error() is [[noreturn]], so the trailing 'return false' statements were dead code. JSONFactories_HistFactory.cxx: - Remove a redundant mid-file block of #includes (<regex> was already included; the others were already used earlier in the translation unit). JSONIO.cxx: - Deduplicate removeImporters/removeExporters and printImporters/ printExporters into shared templated helpers. (cherry picked from commit b763ff1)
Test Results 22 files 22 suites 3d 13h 31m 30s ⏱️ For more details on these failures, see this check. Results for commit d8bbec3. |
guitargeek
merged commit 1fdc0eb
into
root-project:v6-40-00-patches
34 of 37 checks passed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
RooFit backports to 6.40 requested by the experiments ATLAS and CMS.