Add template for multiple weights with diff between histogram with di…

RootInteractive/InteractiveDrawing/bokeh/CDSJoin.py

@@ -17,7 +17,7 @@ class CDSJoin(ColumnarDataSource):
     on_left = List(String)
     on_right = List(String)
     prefix_left = String(help="Prefix to use for columns in the left column data source")
-    prefix_right = String(help="Prefix to use for columns in the left column data source")
+    prefix_right = String(help="Prefix to use for columns in the right column data source")
     how = String(default="inner")
     tolerance = Float(default=1e-5)
     print("Import ", __implementation__)

RootInteractive/InteractiveDrawing/bokeh/CDSJoin.ts

@@ -43,9 +43,12 @@ export class CDSJoin extends ColumnarDataSource {
   _indices_left: number[] | null
   _indices_right: number[] | null
 
+  cached_columns: Set<string>
+
   initialize(){
     super.initialize()
     this.data = {}
+    this.cached_columns = new Set()
     this.compute_indices()
   }
 
@@ -73,6 +76,9 @@ export class CDSJoin extends ColumnarDataSource {
       if (on_right.length === 0){
         this._indices_left = null
         this._indices_right = null
+        this.cached_columns.clear()
+        change.emit()
+        return
       }
     } else if(on_left.length === 1 && on_right.length === 0){
       this._indices_left = null
@@ -176,30 +182,31 @@ export class CDSJoin extends ColumnarDataSource {
       this._indices_left = indices_left
       this._indices_right = indices_right
     }
-    for (const key of left.columns()) {
-      const col = left.get_array(key)
-      if(col !== null) this.data[key] = this.join_column(col, this._indices_left)
-    }
-    for (const key of right.columns()) {
-      const col = right.get_array(key)
-      if(col !== null) this.data[key] = this.join_column(col, this._indices_right)
-    }
     // selected.indices = this.source.selected.indices
+    this.cached_columns.clear()
     change.emit()
   }
 
   get_column(key: string){
-    const {left, right, data} = this
-    if (data[key] != null) return data[key]
+    const {left, right, data, prefix_left, prefix_right} = this
+    if (this.cached_columns.has(key)) return data[key]
     let column = null
-    try {
-      column = left.get_column(key)
-    }
-    catch {
-      column = right.get_column(key)
-    }
-    if (column == null){
-      column = right.get_column(key)
+    if (prefix_left && key.startsWith(prefix_left)){
+      let key_new = key.replace(prefix_left,"")
+      column = left.get_column(key_new)
+    } else if(prefix_right && key.startsWith(prefix_right)){
+      let key_new = key.replace(prefix_right,"")
+      column = right.get_column(key_new)      
+    } else {
+      try {
+        column = left.get_column(key)
+      }
+      catch {
+        column = right.get_column(key)
+      }
+      if (column == null){
+        column = right.get_column(key)
+      }
     }
     if(column != null) {
       if (!Array.isArray(column)){
@@ -208,11 +215,26 @@ export class CDSJoin extends ColumnarDataSource {
         data[key] = this.join_column(column, this._indices_right)
       }
     }
+    this.cached_columns.add(key)
     return data[key]
   }
 
   get_length(){
-    if (this._indices_left == null) return 0
+    if (this._indices_left == null){
+      if(this._indices_right == null){
+        let l = this.left.get_length()
+        if(l == null){
+          return this.right.get_length()
+        }
+        let r = this.right.get_length()
+        if(r == null){
+          return l
+        }
+        return Math.min(l, r)
+      } else {
+        return this._indices_right.length
+      }
+    }
     return this._indices_left.length
   }
 

RootInteractive/InteractiveDrawing/bokeh/ConcatenatedString.ts

@@ -42,6 +42,7 @@ export class ConcatenatedString extends Model {
   compute(): string{
     if (this.#is_dirty){
         this.#value = String.prototype.concat(...this.components)
+        this.#is_dirty = false
     }
     return this.#value
   }

RootInteractive/InteractiveDrawing/bokeh/DownsamplerCDS.ts

@@ -56,7 +56,7 @@ export class DownsamplerCDS extends ColumnDataSource {
     this.low = 0
     this.high = -1
     this._needs_update = true
-    this._is_trivial = false
+    this._is_trivial = this.nPoints < 0 && this.filter == null
     this._cached_columns = new Set()
   }
 
@@ -86,8 +86,10 @@ export class DownsamplerCDS extends ColumnDataSource {
   update(){
     const {source, nPoints, selected, filter, _indices} = this
     const l = source.length
+    console.log(this.name)
     if(filter == null && (nPoints < 0 || nPoints >= l)){
       this._is_trivial = true
+      this._needs_update = false
       return
     }
     if(nPoints < 0 || nPoints >= l){
@@ -226,6 +228,9 @@ export class DownsamplerCDS extends ColumnDataSource {
     }
   }
 
-  //Needed because of typescript, is supposed to be a nop
-  on_visible_change(){}
+  on_visible_change(){
+    if(this.watched && this._needs_update){
+      this.change.emit()
+    }   
+  }
 }

RootInteractive/InteractiveDrawing/bokeh/LazyTabs.ts

@@ -62,11 +62,13 @@ export namespace LazyTabs {
         const {active, _last_index} = this
         const old_renderers = this.renderers[_last_index]
         for(let i=0; i<old_renderers.length; i++){
-          old_renderers[i].watched = false
+          old_renderers[i].properties.watched._value = false
+          old_renderers[i].on_visible_change()
         }
         const active_renderers = this.renderers[active]
         for(let i=0; i<active_renderers.length; i++){
-          active_renderers[i].watched = true
+          active_renderers[i].properties.watched._value = true
+          active_renderers[i].on_visible_change()
         }
         this._last_index = active
     }
@@ -75,7 +77,8 @@ export namespace LazyTabs {
       const {_last_index, watched} = this
       const active_renderers = this.renderers[_last_index]
       for(let i=0; i<active_renderers.length; i++){
-        active_renderers[i].watched = watched
+        active_renderers[i].properties.watched._value = watched
+        active_renderers[i].on_visible_change()
       }
    //   tabs[_last_index].child.visible = visible
     }