Skip to content

[hist] Fix label merge when one axis is numerical and extendable#11045

Merged
lmoneta merged 1 commit intoroot-project:masterfrom
lmoneta:fix_th1_merge_10828
Sep 23, 2022
Merged

[hist] Fix label merge when one axis is numerical and extendable#11045
lmoneta merged 1 commit intoroot-project:masterfrom
lmoneta:fix_th1_merge_10828

Conversation

@lmoneta
Copy link
Copy Markdown
Member

@lmoneta lmoneta commented Jul 25, 2022

Create a new type of merging, a special case when the histogram has an axis with label and the other axis is numeric and different but compatible.

A new test is added also in stressHIstogram for this new case

This fixes #10828

@lmoneta lmoneta requested a review from Axel-Naumann as a code owner July 25, 2022 16:44
@phsft-bot
Copy link
Copy Markdown

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Copy Markdown

Build failed on windows10/cxx14.
See console output.

@lmoneta lmoneta self-assigned this Jul 25, 2022
@phsft-bot
Copy link
Copy Markdown

Build failed on ROOT-performance-centos8-multicore/cxx17.
Running on olbdw-01.cern.ch:/data/sftnight/workspace/root-pullrequests-build
See console output.

Failing tests:

@lmoneta lmoneta requested a review from couet August 1, 2022 10:24
Create a new type of merging, a special case when histogram has an axis with label and one axis can be merge numerically but are compatible.

A new test is added also in stressHIstogram for this new case

This should fix ROOT-10828
@lmoneta lmoneta force-pushed the fix_th1_merge_10828 branch from 6361b14 to 830aa4c Compare August 1, 2022 15:47
@phsft-bot
Copy link
Copy Markdown

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Copy Markdown

Build failed on windows10/cxx14.
Running on null:C:\build\workspace\root-pullrequests-build
See console output.

Errors:

  • [2022-08-01T15:53:45.975Z] LINK : fatal error LNK1104: cannot open file 'C:\build\workspace\root-pullrequests-build\build\bin\libCore.dll' [C:\build\workspace\root-pullrequests-build\build\core\Core.vcxproj]

@lmoneta lmoneta merged commit e5e5552 into root-project:master Sep 23, 2022
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.

TH1::Merge does not extend axes properly for certain histograms with labels

3 participants