Formating around return

Author: linev

modules/hist2d/TGraphPainter.mjs

@@ -825,9 +825,11 @@ class TGraphPainter extends ObjectPainter {
          let vleft = vv, vright = vv, htop = hh, hbottom = hh, bb;
 
          const mainLine = (dx, dy) => {
-            if (!options.MainError) return `M${dx},${dy}`;
+            if (!options.MainError)
+               return `M${dx},${dy}`;
             const res = 'M0,0';
-            if (dx) return res + (dy ? `L${dx},${dy}` : `H${dx}`);
+            if (dx)
+               return res + (dy ? `L${dx},${dy}` : `H${dx}`);
             return dy ? res + `V${dy}` : res;
          };
 

modules/hist2d/TH2Painter.mjs

@@ -1572,7 +1572,8 @@ class TH2Painter extends THistPainter {
             if (!cmd) {
                cmd = `M${x},${y}`; x0 = x; y0 = y;
             } else if ((i === iplus) && (iminus !== iplus) && (x === x0) && (y === y0)) {
-               if (!isany) return ''; // all same points
+               if (!isany)
+                  return ''; // all same points
                cmd += 'z'; do_close = false; matched = true;
             } else {
                const dx = x - lastx, dy = y - lasty;
@@ -1611,11 +1612,13 @@ class TH2Painter extends THistPainter {
          iminus--;
          while ((iminus < iplus - 1) && !pnt1)
             pnt1 = get_intersect(++iminus, 1);
-         if (!pnt1) return '';
+         if (!pnt1)
+            return '';
          iplus++;
          while ((iminus < iplus - 1) && !pnt2)
             pnt2 = get_intersect(--iplus, -1);
-         if (!pnt2) return '';
+         if (!pnt2)
+            return '';
 
          // TODO: now side is always same direction, could be that side should be checked more precise
 
@@ -2267,13 +2270,15 @@ class TH2Painter extends THistPainter {
          for (let j = 0; j < proj.length; ++j) {
             if (proj[j] > 0) {
                res.max = Math.max(res.max, proj[j]);
-               if (res.first < 0) res.first = j;
+               if (res.first < 0)
+                  res.first = j;
                res.last = j;
             }
             integral += proj[j];
             sum1 += proj[j]*(xx[j]+xx[j+1])/2;
          }
-         if (integral <= 0) return null;
+         if (integral <= 0)
+            return null;
 
          res.entries = integral;
          res.mean = sum1/integral;
@@ -2873,7 +2878,8 @@ class TH2Painter extends THistPainter {
                if (axis.fLabels) {
                   for (let i = 0; i < axis.fLabels.arr.length; ++i) {
                      const tstr = axis.fLabels.arr[i];
-                     if (tstr.fUniqueID === indx+1) return tstr.fString;
+                     if (tstr.fUniqueID === indx + 1)
+                        return tstr.fString;
                   }
                }
                return indx.toString();

modules/hist2d/THStackPainter.mjs

@@ -116,7 +116,8 @@ class THStackPainter extends ObjectPainter {
             domax = false;
          }
 
-         if (!domin && !domax) return res;
+         if (!domin && !domax)
+            return res;
 
          let i1 = 1, i2 = hist.fXaxis.fNbins, j1 = 1, j2 = 1, first = true;
 

modules/hist2d/THistPainter.mjs

@@ -735,19 +735,25 @@ class HistContour {
          return Math.floor(0.01 + (zc - this.colzmin) * (this.arr.length - 1) / (this.colzmax - this.colzmin));
 
       let l = 0, r = this.arr.length - 1;
-      if (zc < this.arr[0]) return -1;
-      if (zc >= this.arr[r]) return r;
-      while (l < r-1) {
+      if (zc < this.arr[0])
+         return -1;
+      if (zc >= this.arr[r])
+         return r;
+      while (l < r - 1) {
          const mid = Math.round((l+r)/2);
-         if (this.arr[mid] > zc) r = mid; else l = mid;
+         if (this.arr[mid] > zc)
+            r = mid;
+         else
+            l = mid;
       }
       return l;
    }
 
    /** @summary Get palette color */
    getPaletteColor(palette, zc) {
       const zindx = this.getContourIndex(zc);
-      if (zindx < 0) return null;
+      if (zindx < 0)
+         return null;
       const pindx = palette.calcColorIndex(zindx, this.arr.length);
       return palette.getColor(pindx);
    }
@@ -962,12 +968,18 @@ class THistPainter extends ObjectPainter {
    /** @summary Returns number of histogram dimensions */
    getDimension() {
       const histo = this.getHisto();
-      if (!histo) return 0;
-      if (histo._typename.match(/^TH2/)) return 2;
-      if (histo._typename === clTProfile2D) return 2;
-      if (histo._typename.match(/^TH3/)) return 3;
-      if (histo._typename === clTProfile3D) return 3;
-      if (this.isTH2Poly()) return 2;
+      if (!histo)
+         return 0;
+      if (histo._typename.match(/^TH2/))
+         return 2;
+      if (histo._typename === clTProfile2D)
+         return 2;
+      if (histo._typename.match(/^TH3/))
+         return 3;
+      if (histo._typename === clTProfile3D)
+         return 3;
+      if (this.isTH2Poly())
+         return 2;
       return 1;
    }
 
@@ -1238,15 +1250,20 @@ class THistPainter extends ObjectPainter {
          if (axis.fXbins.length >= axis.fNbins) {
             axis.GetBinCoord = function(bin) {
                const indx = Math.round(bin);
-               if (indx <= 0) return this.fXmin;
-               if (indx > this.fNbins) return this.fXmax;
-               if (indx === bin) return this.fXbins[indx];
+               if (indx <= 0)
+                  return this.fXmin;
+               if (indx > this.fNbins)
+                  return this.fXmax;
+               if (indx === bin)
+                  return this.fXbins[indx];
                const indx2 = (bin < indx) ? indx - 1 : indx + 1;
                return this.fXbins[indx] * Math.abs(bin-indx2) + this.fXbins[indx2] * Math.abs(bin-indx);
             };
             axis.FindBin = function(x, add) {
-               for (let k = 1; k < this.fXbins.length; ++k)
-                  if (x < this.fXbins[k]) return Math.floor(k-1+add);
+               for (let k = 1; k < this.fXbins.length; ++k) {
+                  if (x < this.fXbins[k])
+                     return Math.floor(k - 1 + add);
+               }
                return this.fNbins;
             };
          } else {
@@ -1562,8 +1579,10 @@ class THistPainter extends ObjectPainter {
          return null;
 
       if (!force && !o.ForceStat) {
-         if (o.NoStat || histo.TestBit(kNoStats) || !settings.AutoStat) return null;
-         if (!this.isMainPainter()) return null;
+         if (o.NoStat || histo.TestBit(kNoStats) || !settings.AutoStat)
+            return null;
+         if (!this.isMainPainter())
+            return null;
       }
 
       const st = gStyle;
@@ -2327,7 +2346,8 @@ class THistPainter extends ObjectPainter {
       } else {
          pal_painter.Enabled = true;
          // real drawing will be perform at the end
-         if (postpone_draw) return pal_painter;
+         if (postpone_draw)
+            return pal_painter;
          pr = pal_painter.drawPave(arg);
       }