|
7973 | 7973 | var nhists = stack.fHists.arr.length; |
7974 | 7974 | if (nhists <= 0) return false; |
7975 | 7975 | var lst = JSROOT.Create("TList"); |
7976 | | - lst.Add(JSROOT.clone(stack.fHists.arr[0])); |
| 7976 | + lst.Add(JSROOT.clone(stack.fHists.arr[0]), stack.fHists.opt[0]); |
7977 | 7977 | this.haserrors = this.HasErrors(stack.fHists.arr[0]); |
7978 | 7978 | for (var i=1;i<nhists;++i) { |
7979 | 7979 | var hnext = JSROOT.clone(stack.fHists.arr[i]), |
7980 | | - hprev = lst.arr[i-1]; |
| 7980 | + hnextopt = stack.fHists.opt[i], |
| 7981 | + hprev = lst.arr[i-1]; |
7981 | 7982 |
|
7982 | 7983 | if ((hnext.fNbins != hprev.fNbins) || |
7983 | 7984 | (hnext.fXaxis.fXmin != hprev.fXaxis.fXmin) || |
|
7993 | 7994 | for (var n = 0; n < hnext.fArray.length; ++n) |
7994 | 7995 | hnext.fArray[n] += hprev.fArray[n]; |
7995 | 7996 |
|
7996 | | - lst.Add(hnext); |
| 7997 | + lst.Add(hnext, hnextopt); |
7997 | 7998 | } |
7998 | 7999 | stack.fStack = lst; |
7999 | 8000 | return true; |
|
8097 | 8098 | hist = hlst.arr[rindx]; |
8098 | 8099 | hopt = hlst.opt[rindx] || hist.fOption || opt; |
8099 | 8100 | if (hopt.toUpperCase().indexOf(opt)<0) hopt += opt; |
| 8101 | + if (this.draw_errors && !hopt) hopt = "E"; |
8100 | 8102 | hopt += " same"; |
8101 | 8103 |
|
8102 | 8104 | // if there is auto colors assignment, try to provide it |
|
8141 | 8143 | lsame = d.check("SAME"); |
8142 | 8144 |
|
8143 | 8145 | this.nostack = d.check("NOSTACK"); |
| 8146 | + if (d.check("STACK")) this.nostack = false; |
8144 | 8147 |
|
8145 | 8148 | this._pfc = d.check("PFC"); |
8146 | 8149 | this._plc = d.check("PLC"); |
|
8155 | 8158 | this.dolego = d.check("LEGO"); |
8156 | 8159 |
|
8157 | 8160 | // if any histogram appears with pre-calculated errors, use E for all histograms |
8158 | | - if (!this.nostack && this.haserrors && !this.dolego && !d.check("HIST")) opt+=" E"; |
| 8161 | + if (!this.nostack && this.haserrors && !this.dolego && !d.check("HIST")) this.draw_errors = true; |
8159 | 8162 |
|
8160 | 8163 | // order used to display histograms in stack direct - true, reverse - false |
8161 | 8164 | this.horder = this.nostack || this.dolego; |
|
0 commit comments