@@ -86905,7 +86905,7 @@ let TH2Painter$2 = class TH2Painter extends THistPainter {
8690586905
8690686906 for (let j = handle.j2 - 1; j >= handle.j1; --j) {
8690786907 binz = histo.getBinContent(i + 1, j + 1);
86908- is_zero = (binz === 0) && (has_sumw2 && histo.fSumw2[histo.getBin(i + 1, j + 1)] === 0);
86908+ is_zero = (binz === 0) && (! has_sumw2 || histo.fSumw2[histo.getBin(i + 1, j + 1)] === 0);
8690986909
8691086910 skip_bin = is_zero && ((skip_zero === 1) ? !histo.getBinEntries(i + 1, j + 1) : skip_zero);
8691186911
@@ -87056,7 +87056,7 @@ let TH2Painter$2 = class TH2Painter extends THistPainter {
8705687056 for (let i = handle.i1; i < handle.i2; ++i) {
8705787057 for (let j = handle.j2 - 1; j >= handle.j1; --j) {
8705887058 binz = histo.getBinContent(i + 1, j + 1);
87059- is_zero = (binz === 0) && (has_sumw2 && histo.fSumw2[histo.getBin(i + 1, j + 1)] === 0);
87059+ is_zero = (binz === 0) && (! has_sumw2 || histo.fSumw2[histo.getBin(i + 1, j + 1)] === 0);
8706087060
8706187061 skip_bin = is_zero && ((skip_zero === 1) ? !histo.getBinEntries(i + 1, j + 1) : skip_zero);
8706287062
@@ -88740,19 +88740,19 @@ let TH2Painter$2 = class TH2Painter extends THistPainter {
8874088740 getBinTooltips(i, j) {
8874188741 const histo = this.getHisto(),
8874288742 profile2d = this.matchObjectType(clTProfile2D) && isFunc(histo.getBinEntries),
88743- bincontent = histo.getBinContent(i+ 1, j+ 1);
88743+ bincontent = histo.getBinContent(i + 1, j + 1);
8874488744 let binz = bincontent;
8874588745
8874688746 if (histo.$baseh)
88747- binz -= histo.$baseh.getBinContent(i+ 1, j+ 1);
88747+ binz -= histo.$baseh.getBinContent(i + 1, j + 1);
8874888748
8874988749 const lines = [this.getObjectHint(),
8875088750 'x = ' + this.getAxisBinTip('x', histo.fXaxis, i),
8875188751 'y = ' + this.getAxisBinTip('y', histo.fYaxis, j),
88752- `bin = ${histo.getBin(i+ 1, j+ 1)} x: ${i+ 1} y: ${j+ 1}`,
88752+ `bin = ${histo.getBin(i + 1, j + 1)} x: ${i + 1} y: ${j + 1}`,
8875388753 'content = ' + ((binz === Math.round(binz)) ? binz : floatToString(binz, gStyle.fStatFormat))];
8875488754
88755- if ((this.options.TextKind === 'E') || profile2d) {
88755+ if ((this.options.TextKind === 'E') || profile2d || histo.fSumw2?.length ) {
8875688756 const errs = this.getBinErrors(histo, histo.getBin(i + 1, j + 1), bincontent);
8875788757 if (errs.poisson)
8875888758 lines.push('error low = ' + floatToString(errs.low, gStyle.fPaintTextFormat), 'error up = ' + floatToString(errs.up, gStyle.fPaintTextFormat));
0 commit comments