Build and eslint with elist parameter

Author: linev

build/jsroot.js

@@ -12,7 +12,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '11/04/2025',
+version_date = '14/04/2025',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -113723,7 +113723,8 @@ class TDrawSelector extends TSelector {
 
    /** @summary Parse parameters */
    parseParameters(tree, args, expr) {
-      if (!expr || !isStr(expr)) return '';
+      if (!expr || !isStr(expr))
+         return '';
 
       // parse parameters which defined at the end as expression;par1name:par1value;par2name:par2value
       let pos = expr.lastIndexOf(';');
@@ -113740,12 +113741,43 @@ class TDrawSelector extends TSelector {
             intvalue = undefined;
 
          switch (parname) {
-            case 'entries':
+            case 'elist':
                if ((parvalue.at(0) === '[') && (parvalue.at(-1) === ']')) {
-                  args.entries = JSON.parse(parvalue);
-                  break;
+                  parvalue = parvalue.slice(1, parvalue.length - 1).replaceAll(/\s/g, '');
+                  args.elist = [];
+                  let p = 0, last_v = -1;
+                  const getInt = () => {
+                     const p0 = p;
+                     while ((p < parvalue.length) && (parvalue.charCodeAt(p) >= 48) && (parvalue.charCodeAt(p) < 58))
+                        p++;
+                     return parseInt(parvalue.slice(p0, p));
+                  };
+
+                  while (p < parvalue.length) {
+                     const v1 = getInt();
+                     if (v1 <= last_v) {
+                        console.log('position', p);
+                        throw Error(`Wrong entry id ${v1} in elist last ${last_v}`);
+                     }
+                     let v2 = v1;
+                     if (parvalue[p] === '.' && parvalue[p + 1] === '.') {
+                        p += 2;
+                        v2 = getInt();
+                        if (v2 < v1)
+                           throw Error(`Wrong entry id ${v2} in range ${v1}`);
+                     }
+                     if (parvalue[p] === ',' || p === parvalue.length) {
+                        for (let v = v1; v <= v2; ++v) {
+                           args.elist.push(v);
+                           last_v = v;
+                        }
+                        p++;
+                     } else
+                        throw Error('Wrong syntax for elist');
+                  }
                }
-            // eslint-disable-next-line  no-fallthrough
+               break;
+            case 'entries':
             case 'num':
             case 'numentries':
                if (parvalue === 'all')
@@ -113819,6 +113851,8 @@ class TDrawSelector extends TSelector {
          }
          if (harg === 'dump')
             args.dump = true;
+         else if (harg === 'elist')
+            args.dump_entries = true;
          else if (harg.indexOf('Graph') === 0)
             args.graph = true;
          else if (pos < 0) {
@@ -113840,15 +113874,31 @@ class TDrawSelector extends TSelector {
       if (args.dump) {
          this.dump_values = true;
          args.reallocate_objects = true;
-         if (args.numentries === undefined)
+         if (args.numentries === undefined) {
             args.numentries = 10;
+            args._dflt_entries = true;
+         }
       }
 
       return expr;
    }
 
    /** @summary Create draw expression for N-dim with cut */
    createDrawExpression(tree, names, cut, args) {
+      if (args.dump && names.length === 1 && names[0] === 'Entry$') {
+         args.dump_entries = true;
+         args.dump = false;
+      }
+
+      if (args.dump_entries) {
+         this.dump_entries = true;
+         this.hist = [];
+         if (args._dflt_entries) {
+            delete args._dflt_entries;
+            delete args.numentries;
+         }
+      }
+
       let is_direct = !cut && !this.dump_entries;
 
       this.ndim = names.length;
@@ -113900,7 +113950,7 @@ class TDrawSelector extends TSelector {
          cut = args.cut;
       else {
          pos = expr.replace(/TMath::/g, 'TMath__').lastIndexOf('::'); // avoid confusion due-to :: in the namespace
-         if (pos > 0) {
+         if (pos >= 0) {
             cut = expr.slice(pos + 2).trim();
             expr = expr.slice(0, pos).trim();
          }
@@ -113927,15 +113977,14 @@ class TDrawSelector extends TSelector {
       if (!nbr1 && !nbr2 && (pos > prev))
          names.push(expr.slice(prev, pos));
 
-      if ((names.length < 1) || (names.length > 3))
-         return false;
-
       if (args.staged) {
          args.staged_names = names;
          names = ['Entry$'];
-         this.dump_entries = true;
-         this.hist = [];
-      }
+         args.dump_entries = true;
+      } else if (cut && args.dump_entries)
+         names = ['Entry$'];
+      else if ((names.length < 1) || (names.length > 3))
+         return false;
 
       return this.createDrawExpression(tree, names, cut, args);
    }
@@ -114583,7 +114632,7 @@ function detectBranchMemberClass(brlst, prefix, start) {
   * @param {object} [args] - different arguments
   * @param {number} [args.firstentry] - first entry to process, 0 when not specified
   * @param {number} [args.numentries] - number of entries to process, all when not specified
-  * @param {Array} [args.entries] - entries id to process
+  * @param {Array} [args.elist] - arrays of entries id to process
   * @return {Promise} with TSelector instance */
 async function treeProcess(tree, selector, args) {
    if (!args) args = {};
@@ -115209,10 +115258,10 @@ async function treeProcess(tree, selector, args) {
 
    let resolveFunc, rejectFunc; // Promise methods
 
-   if (args.entries) {
-      args.firstentry = args.entries.at(0);
-      args.numentries = args.entries.at(-1) - args.entries.at(0) + 1;
-      handle.process_entries = args.entries;
+   if (args.elist) {
+      args.firstentry = args.elist.at(0);
+      args.numentries = args.elist.at(-1) - args.elist.at(0) + 1;
+      handle.process_entries = args.elist;
       handle.process_entries_indx = 0;
       handle.process_arrays = false; // do not use arrays process for selected entries
    }
@@ -115632,8 +115681,8 @@ async function treeProcess(tree, selector, args) {
   * @param {string} [args.drawopt=undefined] - draw options for result histogram
   * @param {number} [args.firstentry=0] - first entry to process
   * @param {number} [args.numentries=undefined] - number of entries to process, all by default
-  * @param {Array} [args.entries] - array of entries to process
-  * @param {boolean} [args.staged] - staged processing, first cut selection and then perform drawing
+  * @param {Array} [args.elist=undefined] - array of entries id to process, all by default
+  * @param {boolean} [args.staged] - staged processing, first apply cut to select entries and then perform drawing for selected entries
   * @param {object} [args.branch=undefined] - TBranch object from TTree itself for the direct drawing
   * @param {function} [args.progress=undefined] - function called during histogram accumulation with obj argument
   * @return {Promise} with produced object */
@@ -115658,10 +115707,12 @@ async function treeDraw(tree, args) {
       if (!args.staged)
          return sel;
 
+      delete args.dump_entries;
+
       const selector2 = new TDrawSelector(),
             args2 = Object.assign({}, args);
       args2.staged = false;
-      args2.entries = sel.hist; // assign entries found in first selection
+      args2.elist = sel.hist; // assign entries found in first selection
       if (!selector2.createDrawExpression(tree, args.staged_names, '', args2))
          return Promise.reject(Error(`Fail to create final draw expression ${args.expr}`));
       ['arr_limit', 'htype', 'nmatch', 'want_hist', 'hist_nbins', 'hist_name', 'hist_args', 'draw_title']
@@ -159714,8 +159765,9 @@ async function treeDrawProgress(obj, final) {
    if (!final && !this.last_pr)
       return;
 
-   if (this.dump || this.testio) {
-      if (!final) return;
+   if (this.dump || this.dump_entries || this.testio) {
+      if (!final)
+         return;
       if (isBatchMode()) {
          const painter = new BasePainter(this.drawid);
          painter.selectDom().property('_json_object_', obj);

changes.md

@@ -1,7 +1,8 @@
 # JSROOT changelog
 
 ## Changes in dev
-1. Implement 'staged' method for `TTree::Draw` to first select entries and then apply draw expression
+1. Implement 'nmatch' parameter for `TTree::Draw` to limit processed events
+1. Implement 'elist' parameter for `TTree::Draw` to specify entries list for processing
 1. Implement 'nmatch' parameter for `TTree::Draw` to limit processed events
 1. Implement 'cont5' draw option for `TGraph2D` using Delaunay algorithm
 1. Implement 'pol' and 'arr_colz' draw option for `TH2`
@@ -10,7 +11,7 @@
 1. Implement 'box1' for `TH3` with negative bins
 1. Introduce `settings.FilesTimeout` to configure global timeout for file reading operations
 1. Introduce `settings.FilesRemap` to let provide fallback address for http server, used for `root.cern`
-1. Introduce 'settings.TreeReadBunchSize' to configure bunch read size for TTree readingevents
+1. Introduce `settings.TreeReadBunchSize` to configure bunch read size for `TTree` processing
 1. Adjust histogram title drawing with native implementation
 1. Improve float to string conversion when 'g' is specified
 1. Support 'same' option for first histogram, draw directly on pad

docs/JSROOT.md

@@ -334,7 +334,7 @@ At the end of expression one can add several parameters with the syntax:
 Following parameters are supported:
   - "first" - id of the first entry to process
   - "entries" - number of entries to process
-  - "elist" - array of selected entries like `[7,12,25]`
+  - "elist" - array of selected entries like `[7,12..25,40]`
   - "nmatch" - abort processing after accumulated number of matched entries
   - "staged" - first search entries with cut selection and then performed TTree::Draw
   - "monitor" - periodically show intermediate draw results (interval in milliseconds)

modules/core.mjs

@@ -4,7 +4,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '11/04/2025',
+version_date = '14/04/2025',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}

modules/tree.mjs

@@ -772,15 +772,15 @@ class TDrawSelector extends TSelector {
          switch (parname) {
             case 'elist':
                if ((parvalue.at(0) === '[') && (parvalue.at(-1) === ']')) {
-                  parvalue = parvalue.slice(1, parvalue.length - 1).replaceAll(/\s/g,'');
+                  parvalue = parvalue.slice(1, parvalue.length - 1).replaceAll(/\s/g, '');
                   args.elist = [];
                   let p = 0, last_v = -1;
                   const getInt = () => {
                      const p0 = p;
                      while ((p < parvalue.length) && (parvalue.charCodeAt(p) >= 48) && (parvalue.charCodeAt(p) < 58))
                         p++;
                      return parseInt(parvalue.slice(p0, p));
-                  }
+                  };
 
                   while (p < parvalue.length) {
                      const v1 = getInt();
@@ -802,7 +802,7 @@ class TDrawSelector extends TSelector {
                         }
                         p++;
                      } else
-                        throw Error(`Wrong syntax for elist`);
+                        throw Error('Wrong syntax for elist');
                   }
                }
                break;
@@ -1010,9 +1010,9 @@ class TDrawSelector extends TSelector {
          args.staged_names = names;
          names = ['Entry$'];
          args.dump_entries = true;
-      } else if (cut && args.dump_entries) {
+      } else if (cut && args.dump_entries)
          names = ['Entry$'];
-      } else if ((names.length < 1) || (names.length > 3))
+      else if ((names.length < 1) || (names.length > 3))
          return false;
 
       return this.createDrawExpression(tree, names, cut, args);