Skip to content

Commit 513f99d

Browse files
committed
Update version in all docu/comments
1 parent 4e188c8 commit 513f99d

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

docs/HttpServer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ To start the http server, at any time, create an instance of the [THttpServer](h
1414

1515
This will start a [civetweb](https://github.com/bel2125/civetweb)-based http server on the port 8080. Then one should be able to open the address "http://localhost:8080" in any modern browser (IE9, Firefox, Chrome, Opera) and browse objects created in application. By default, the server can access files, canvases, and histograms via the gROOT pointer. All those objects can be displayed with JSROOT graphics.
1616

17-
There is a [snapshot (frozen copy)](https://root.cern.ch/js/3.5/httpserver.C/) of such server, running in [tutorials/http/httpserver.C](https://root.cern.ch/gitweb?p=root.git;a=blob_plain;f=tutorials/http/httpserver.C;hb=HEAD) macro from ROOT tutorial.
17+
There is a [snapshot (frozen copy)](https://root.cern.ch/js/3.6/httpserver.C/) of such server, running in [tutorials/http/httpserver.C](https://root.cern.ch/gitweb?p=root.git;a=blob_plain;f=tutorials/http/httpserver.C;hb=HEAD) macro from ROOT tutorial.
1818

19-
<iframe width="800" height="500" src="https://root.cern.ch/js/3.5/httpserver.C/?layout=simple&item=Canvases/c1">
19+
<iframe width="800" height="500" src="https://root.cern.ch/js/3.6/httpserver.C/?layout=simple&item=Canvases/c1">
2020
</iframe>
2121

2222
One could specify several options when creating http server. They could be add as additional URL parameters to the constructor arguments like:

docs/JSROOT.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The latest version of JSROOT can also be found online on <http://root.cern.ch/js
1414

1515
## Reading ROOT files in JSROOT
1616

17-
[The main page](https://root.cern.ch/js/3.5/) of the JSROOT project provides the possibility to interactively open ROOT files and draw objects like histogram or canvas.
17+
[The main page](https://root.cern.ch/js/3.6/) of the JSROOT project provides the possibility to interactively open ROOT files and draw objects like histogram or canvas.
1818

1919
The following parameters can be specified in the URL string:
2020

@@ -35,13 +35,13 @@ One could skip quotes when specifying elements names `item=[file1.root/hpx,file2
3535

3636
Examples:
3737

38-
- <https://root.cern.ch/js/3.5/index.htm?file=../files/hsimple.root&item=hpx;1>
39-
- <https://root.cern.ch/js/3.5/index.htm?file=../files/hsimple.root&nobrowser&item=hpxpy;1&opt=colz>
40-
- <https://root.cern.ch/js/3.5/index.htm?file=../files/hsimple.root&noselect&layout=grid2x2&item=hprof;1>
38+
- <https://root.cern.ch/js/3.6/index.htm?file=../files/hsimple.root&item=hpx;1>
39+
- <https://root.cern.ch/js/3.6/index.htm?file=../files/hsimple.root&nobrowser&item=hpxpy;1&opt=colz>
40+
- <https://root.cern.ch/js/3.6/index.htm?file=../files/hsimple.root&noselect&layout=grid2x2&item=hprof;1>
4141

4242
One can very easy integrate JSROOT graphic into other HTML pages using a __iframe__ tag:
4343

44-
<iframe width="600" height="500" src="https://root.cern.ch/js/3.5/index.htm?nobrowser&file=../files/hsimple.root&item=hpxpy;1&opt=colz">
44+
<iframe width="600" height="500" src="https://root.cern.ch/js/3.6/index.htm?nobrowser&file=../files/hsimple.root&item=hpxpy;1&opt=colz">
4545
</iframe>
4646

4747
In principle, one could open any ROOT file placed in the web, providing the full URL to it like:
@@ -68,7 +68,7 @@ In such case one could use the server with its default settings.
6868
A simple case is to copy only the top index.htm file on the server and specify the full path to JSRootCore.js script like:
6969

7070
...
71-
<script type="text/javascript" src="https://root.cern.ch/js/3.5/scripts/JSRootCore.js?gui"></script>
71+
<script type="text/javascript" src="https://root.cern.ch/js/3.6/scripts/JSRootCore.js?gui"></script>
7272
...
7373

7474
In such case one can also specify a custom files list:
@@ -87,13 +87,13 @@ JSROOT is used to implement the user interface in the web browsers.
8787

8888
The layout of the main page coming from THttpServer is similar to the file I/O one.
8989
One could browse existing items and display them. A snapshot of running
90-
server can be seen on the [demo page](https://root.cern.ch/js/3.5/httpserver.C/).
90+
server can be seen on the [demo page](https://root.cern.ch/js/3.6/httpserver.C/).
9191

9292
One could also specify similar URL parameters to configure the displayed items and drawing options.
9393

9494
It is also possible to display one single item from the THttpServer server like:
9595

96-
<https://root.cern.ch/js/3.5/httpserver.C/Files/job1.root/hpxpy/draw.htm?opt=colz>
96+
<https://root.cern.ch/js/3.6/httpserver.C/Files/job1.root/hpxpy/draw.htm?opt=colz>
9797

9898

9999
## Data monitoring with JSROOT
@@ -106,7 +106,7 @@ changes and request only the items currently displayed in the browser.
106106
To enable monitoring, one should activate the appropriate checkbox or
107107
provide __monitoring__ parameter in the URL string like:
108108

109-
<https://root.cern.ch/js/3.5/httpserver.C/Files/job1.root/hprof/draw.htm?monitoring=1000>
109+
<https://root.cern.ch/js/3.6/httpserver.C/Files/job1.root/hprof/draw.htm?monitoring=1000>
110110

111111
The parameter value is the update interval in milliseconds.
112112

@@ -120,16 +120,16 @@ create JSON files for selected objects and write such files in a directory,
120120
which can be accessed via web server. Then one can use JSROOT to read such files and display objects in a web browser.
121121
There is a demonstration page showing such functionality:
122122

123-
<https://root.cern.ch/js/3.5/demo/demo.htm>
123+
<https://root.cern.ch/js/3.6/demo/demo.htm>
124124

125-
<iframe width="500" height="300" src="https://root.cern.ch/js/3.5/demo/demo.htm">
125+
<iframe width="500" height="300" src="https://root.cern.ch/js/3.6/demo/demo.htm">
126126
</iframe>
127127

128128
This demo page reads in cycle 20 json files and displays them.
129129

130130
If one has a web server which already provides such JSON file, one could specify the URL to this file like:
131131

132-
<https://root.cern.ch/js/3.5/demo/demo.htm?addr=../httpserver.C/Canvases/c1/root.json.gz>
132+
<https://root.cern.ch/js/3.6/demo/demo.htm?addr=../httpserver.C/Canvases/c1/root.json.gz>
133133

134134
Here the same problem with [Cross-Origin Request](https://developer.mozilla.org/en/http_access_control) can appear.
135135
If the web server configuration cannot be changed, just copy JSROOT to the web server itself.
@@ -151,7 +151,7 @@ Let say that major classes like TH1 or TGraph or TCanvas will be supported, but
151151

152152
If somebody still wants to use monitoring of data from ROOT files, could try link like:
153153

154-
<https://root.cern.ch/js/3.5/index.htm?nobrowser&file=../files/hsimple.root+&item=hpx;1&monitoring=2000>
154+
<https://root.cern.ch/js/3.6/index.htm?nobrowser&file=../files/hsimple.root+&item=hpx;1&monitoring=2000>
155155

156156
In this particular case, the histogram is not changing.
157157

@@ -160,7 +160,7 @@ In this particular case, the histogram is not changing.
160160

161161
Even without any server-side application, JSROOT provides nice ROOT-like graphics,
162162
which could be used in arbitrary HTML pages.
163-
There is [example page](https://root.cern.ch/js/3.5/demo/example.htm),
163+
There is [example page](https://root.cern.ch/js/3.6/demo/example.htm),
164164
where a 2-D histogram is artificially generated and displayed.
165165
Details about the JSROOT API can be found in the next chapters.
166166

@@ -177,7 +177,7 @@ Before JSROOT can be used, all appropriate scripts should be loaded.
177177
Any HTML pages where JSROOT is used should include the JSRootCore.js script.
178178
The `<head>` section of the HTML page should have the following line:
179179

180-
<script type="text/javascript" src="https://root.cern.ch/js/3.5/scripts/JSRootCore.js?gui"></script>
180+
<script type="text/javascript" src="https://root.cern.ch/js/3.6/scripts/JSRootCore.js?gui"></script>
181181

182182
Here, the default location of JSROOT is specified. One could have a local copy on the file system or on a private web server. When JSROOT is used with THttpServer, the address looks like:
183183

@@ -254,4 +254,4 @@ For example, reading an object from a file and displaying it will look like:
254254

255255
## Links collection
256256

257-
Many different examples of JSROOT usage can be found on [links collection](https://root.cern.ch/js/3.5/demo/jslinks.htm) page
257+
Many different examples of JSROOT usage can be found on [links collection](https://root.cern.ch/js/3.6/demo/jslinks.htm) page

index.htm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
This is JSROOT main page, which aims to display content of ROOT files.
1919
Several URL parameters could be specified when opening page:
2020
file - name of the file(s), which will be automatically open with page loading
21+
json - name of JSON file(s) with ROOT object, stored by TBufferJSON::ConvertToJSON method
2122
item - object name(s) in the file to display
2223
opt - draw option(s) for the item(s)
2324
layout - can be 'simple', 'collapsible', 'tabs' or gridNxM where N and M are integer values
@@ -26,17 +27,17 @@
2627
mathjax - use MathJax for Latex output (automatically loaded for TMathText objects)
2728
2829
Example:
29-
https://root.cern.ch/js/3.5/?file=../files/hsimple.root&layout=grid2x2&item=[hpx;1,hpxpy;1]&opts=[,colz]
30+
https://root.cern.ch/js/3.6/?file=../files/hsimple.root&layout=grid2x2&item=[hpx;1,hpxpy;1]&opts=[,colz]
3031
3132
Page can be used to open files from other web servers like:
32-
https://root.cern.ch/js/3.5/?file=https://web-docs.gsi.de/~linev/js/files/hsimple.root
33+
https://root.cern.ch/js/3.6/?file=https://web-docs.gsi.de/~linev/js/files/hsimple.root
3334
3435
But one should be aware about Cross-Origin Request blocking.
3536
Read https://developer.mozilla.org/en/http_access_control for more details.
3637
3738
To avoid problem at all, one can copy only index.htm on the web server where data files are located.
3839
And specify full path to the JSRootCore.js script like
39-
<script type="text/javascript" src="https://root.cern.ch/js/3.5/scripts/JSRootCore.min.js?gui"></script>
40+
<script type="text/javascript" src="https://root.cern.ch/js/3.6/scripts/JSRootCore.min.js?gui"></script>
4041
4142
If necessary, complete JSROOT can be installed on the web server.
4243
All sources can be found in $ROOTSYS/etc/http/ directory.

0 commit comments

Comments
 (0)