Skip to content

Commit 838d57a

Browse files
committed
Prepare for 5.0.1 release
1 parent 078fbdb commit 838d57a

File tree

4 files changed

+11
-20
lines changed

4 files changed

+11
-20
lines changed

changes.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# JSROOT changelog
22

3-
## Changes in dev
4-
1. Support ROOT files with old zip algorithm (before 2010)
3+
## Changes in 5.0.1
4+
1. Support older ROOT files, created before 2010
55
2. Support TBranchObject - appears in old files
6-
3. Fix - problem with zooming in THStack
7-
4. Fix - empty baskets at the end of branch store
8-
5. Fix - solve problem with empty STL containers
9-
6. Fix - correcty set buffer position for the entry
6+
3. Correcty set TBasket buffer position for the entry
7+
4. Fix - problem with empty STL containers
8+
5. Fix - empty baskets at the end of branch store
9+
6. Fix - problem with zooming in THStack
1010

1111

1212
## Changes in 5.0.0

readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ JavaScript ROOT provides interactive ROOT-like graphics in the web browsers.
44
Data can be read and displayed from binary and JSON ROOT files.
55
JSROOT implements user interface for THttpServer class.
66

7-
<a href="https://root.cern/js/latest/?nobrowser&file=../files/hsimple.root&item=hpxpy;1&opt=COLZ"><img src="http://jsroot.gsi.de/files/img/th2.png" align="left" hspace="10" vspace="6" alt="TH2 drawing" title="Draw TH2 histogram with COLZ options"></a>
8-
<a href="https://root.cern/js/latest/?nobrowser&file=../files/danilo6.root&item=canvas;1"><img src="http://jsroot.gsi.de/files/img/tf1.png" align="left" hspace="10" vspace="6" alt="TF1 drawing" title="Superimpose histogram with fit results"></a>
9-
<a href="https://root.cern/js/latest/?nobrowser&json=../files/simple_alice.json.gz"><img src="http://jsroot.gsi.de/files/img/tgeo.png" align="left" hspace="10" vspace="6" alt="TGeo drawing" title="Extraction from ALICE geometry"></a>
7+
<a href="https://root.cern/js/latest/?nobrowser&file=../files/hsimple.root&item=ntuple;1&opt=px:py::pz>4"><img src="http://jsroot.gsi.de/files/img/ttree.png" align="left" hspace="10" vspace="6" alt="TTree::Draw()" title="2-dimensional TTree::Draw with cut options"></a>
8+
<a href="https://root.cern/js/latest/?nobrowser&file=../files/histpainter6.root&item=draw_hstack;1"><img src="http://jsroot.gsi.de/files/img/thstack.png" align="left" hspace="10" vspace="6" alt="THStack" title="Several varians of THStack drawing"></a>
9+
<a href="https://root.cern/js/latest/?nobrowser&json=../files/geom/simple_alice.json.gz&file=../files/geom/tracks_hits.root&item=simple_alice.json.gz+tracks_hits.root/tracks;1+tracks_hits.root/hits;1"><img src="http://jsroot.gsi.de/files/img/geo_tracks.png" align="left" hspace="10" vspace="6" alt="Geometry" title="Drawing of TGeo model superimposed with tracks and hits"></a>
1010
<br/>
1111
<br/>
1212
<br/>

scripts/JSRootCore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
}
9494
} (function(JSROOT) {
9595

96-
JSROOT.version = "5.0.0 3/02/2017";
96+
JSROOT.version = "5.0.1 7/02/2017";
9797

9898
JSROOT.source_dir = "";
9999
JSROOT.source_min = false;

scripts/JSRootIOEvolution.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,8 +2017,6 @@
20172017
console.log('!!! Reuse basic type ',member.conttype,' from file streamer infos');
20182018
}
20192019

2020-
// console.log('Create streamer for ', member.typename, 'container', member.conttype, 'typeid', member.typeid);
2021-
20222020
// check
20232021
if (element.fCtype && (element.fCtype < 20) && (element.fCtype !== member.typeid)) {
20242022
console.warn('Contained type ', member.conttype, 'not recognized as basic type', element.fCtype, 'FORCE');
@@ -2091,7 +2089,6 @@
20912089
if (!element.$fictional) {
20922090

20932091
member.read_version = function(buf, cnt) {
2094-
20952092
if (cnt===0) return null;
20962093
var o = buf.o, ver = buf.ReadVersion();
20972094
this.member_wise = ((ver.val & JSROOT.IO.kStreamedMemberWise) !== 0);
@@ -2118,8 +2115,6 @@
21182115

21192116
var ver = this.read_version(buf, cnt);
21202117

2121-
// console.log('read ', this.conttype, 'cnt', cnt, 'ver', ver, 'bufpos', buf.o);
2122-
21232118
for (var n=0;n<cnt;++n)
21242119
arr[n] = buf.ReadNdimArray(this, function(buf2,member2) { return member2.readelem(buf2); });
21252120

@@ -2141,8 +2136,6 @@
21412136

21422137
var arr = obj[this.name0]; // objects array where reading is done
21432138

2144-
// console.log('Read branch', this.name, 'length', arr.length);
2145-
21462139
var ver = this.read_version(buf, arr.length);
21472140

21482141
for (var n=0;n<arr.length;++n) {
@@ -2728,11 +2721,9 @@
27282721

27292722
var n = buf.ntou4(), streamer = null, ver = this.stl_version;
27302723

2731-
// console.log('member-wise streaming for of', this.conttype, n);
2732-
27332724
if (n===0) return []; // for empty vector no need to search splitted streamers
27342725

2735-
if (n>200000) {
2726+
if (n>1000000) {
27362727
throw new Error('member-wise streaming of ' + this.conttype + " num " + n + ' member ' + this.name);
27372728
return [];
27382729
}

0 commit comments

Comments
 (0)