Log and build

Author: linev

build/jsroot.js

@@ -97566,8 +97566,8 @@ class TDrawSelector extends TSelector {
       res.k = res.nbins / (res.max - res.min);
 
       res.GetBin = function(value) {
-         const bin = this.lbls?.indexOf(value) ?? Math.floor((value - this.min) * this.k);
-         return (bin < 0) ? 0 : ((bin > this.nbins) ? this.nbins + 1 : bin + 1);
+         const bin = this.lbls?.indexOf(value) ?? Number.isFinite(value) ? Math.floor((value - this.min) * this.k) : this.nbins + 1;
+         return bin < 0 ? 0 : ((bin > this.nbins) ? this.nbins + 1 : bin + 1);
       };
 
       return res;
@@ -97732,7 +97732,7 @@ class TDrawSelector extends TSelector {
       let bin = this.x.GetBin(xvalue);
       this.hist.fArray[bin] += weight;
 
-      if (!this.x.lbls) {
+      if (!this.x.lbls && Number.isFinite(xvalue)) {
          this.hist.fTsumw += weight;
          this.hist.fTsumwx += weight * xvalue;
          this.hist.fTsumwx2 += weight * xvalue * xvalue;
@@ -97742,10 +97742,10 @@ class TDrawSelector extends TSelector {
    /** @summary Fill 2D histogram */
    fill2DHistogram(xvalue, yvalue, weight) {
       let xbin = this.x.GetBin(xvalue),
-         ybin = this.y.GetBin(yvalue);
+          ybin = this.y.GetBin(yvalue);
 
       this.hist.fArray[xbin + (this.x.nbins + 2) * ybin] += weight;
-      if (!this.x.lbls && !this.y.lbls) {
+      if (!this.x.lbls && !this.y.lbls && Number.isFinite(xvalue) && Number.isFinite(yvalue)) {
          this.hist.fTsumw += weight;
          this.hist.fTsumwx += weight * xvalue;
          this.hist.fTsumwy += weight * yvalue;
@@ -97758,11 +97758,11 @@ class TDrawSelector extends TSelector {
    /** @summary Fill 3D histogram */
    fill3DHistogram(xvalue, yvalue, zvalue, weight) {
       let xbin = this.x.GetBin(xvalue),
-         ybin = this.y.GetBin(yvalue),
-         zbin = this.z.GetBin(zvalue);
+          ybin = this.y.GetBin(yvalue),
+          zbin = this.z.GetBin(zvalue);
 
       this.hist.fArray[xbin + (this.x.nbins + 2) * (ybin + (this.y.nbins + 2) * zbin)] += weight;
-      if (!this.x.lbls && !this.y.lbls && !this.z.lbls) {
+      if (!this.x.lbls && !this.y.lbls && !this.z.lbls && Number.isFinite(xvalue) && Number.isFinite(yvalue) && Number.isFinite(zvalue)) {
          this.hist.fTsumw += weight;
          this.hist.fTsumwx += weight * xvalue;
          this.hist.fTsumwy += weight * yvalue;

changes.md

@@ -4,7 +4,7 @@
 
 1. Fix - unzoom z on lego2 plots
 2. Fix - browsing TLists with nullptr inside
-3. Fix - check NaN values when creating histogram for TTree::Draw()
+3. Fix - check NaN values when performing TTree::Draw()
 
 
 ## Changes in 7.4.1