Skip to content

Commit a8a8208

Browse files
authored
[skip-ci] fixes needed after tutorials renaming (root-project#17584)
1 parent 432c500 commit a8a8208

File tree

8 files changed

+44
-45
lines changed

8 files changed

+44
-45
lines changed

documentation/doxygen/makeNotebooks.sh

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,23 @@ while read notebook dependencies; do
3838
done
3939
fi
4040
done <<EOF
41-
math/unfold/testUnfold5d.C math/unfold/testUnfold5a.C math/unfold/testUnfold5b.C math/unfold/testUnfold5c.C
42-
io/xml/xmlreadfile.C io/xml/xmlnewfile.C
43-
roofit/rf503_wspaceread.C roofit/rf502_wspacewrite.C roofit/rf502_wspacewrite.py
44-
io/readCode.C io/importCode.C
45-
math/fit/fit1.C hist/fillrandom.C
46-
math/fit/myfit.C math/fit/fitslicesy.C
47-
math/foam/foam_demopers.C math/foam/foam_demo.C
48-
io/tree/tree502_staff.C io/tree/tree501_cernbuild.C
49-
io/tree/tree501_cernstaff.C io/tree/tree500_cernbuild.C
50-
hist/hbars.C io/tree/tree501_cernbuild.C
51-
io/tree/ntuple1.py hsimple.py
52-
math/fit/fit1.py hist/fillrandom.py
53-
tmva/TMVAClassificationApplication.C tmva/TMVAClassification.C
54-
tmva/TMVAClassificationCategory.C tmva/TMVAClassification.C
55-
tmva/TMVAClassificationCategoryApplication.C tmva/TMVAClassificationCategory.C
56-
tmva/TMVAMulticlass.C tmva/TMVAMultipleBackgroundExample.C
57-
tmva/TMVAMulticlassApplication.C tmva/TMVAMulticlass.C
58-
tmva/TMVARegressionApplication.C tmva/TMVARegression.C
41+
analysis/unfold/testUnfold5d.C analysis/unfold/testUnfold5a.C
42+
analysis/unfold/testUnfold5b.C analysis/unfold/testUnfold5c.C
43+
io/xml/xmlreadfile.C io/xml/xmlnewfile.C
44+
roofit/roofit/rf503_wspaceread.C roofit/roofit/rf502_wspacewrite.C roofit/roofit/rf502_wspacewrite.py
45+
io/readCode.C io/importCode.C
46+
math/fit/fit1.C hist/hist001_TH1_fillrandom.C
47+
math/fit/myfit.C math/fit/fitslicesy.C
48+
math/foam/foam_demopers.C math/foam/foam_demo.C
49+
io/tree/tree500_cernbuild.C io/tree/tree501_cernstaff.C io/tree/tree502_staff.C
50+
hist/hist006_TH1_bar_charts.C io/tree/ntuple1.py hsimple.py
51+
math/fit/fit1.py hist/hist001_TH1_fillrandom.py
52+
machine_learning/TMVAClassificationApplication.C machine_learning/TMVAClassification.C
53+
machine_learning/TMVAClassificationCategory.C machine_learning/TMVAClassification.C
54+
machine_learning/TMVAClassificationCategoryApplication.C machine_learning/TMVAClassificationCategory.C
55+
machine_learning/TMVAMulticlass.C machine_learning/TMVAMultipleBackgroundExample.C
56+
machine_learning/TMVAMulticlassApplication.C machine_learning/TMVAMulticlass.C
57+
machine_learning/TMVARegressionApplication.C machine_learning/TMVARegression.C
5958
EOF
6059

6160
# Run rest in parallel

documentation/doxygen/parallelNotebooks.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,27 @@
1414
for element in inputs:
1515
dependenciesgraph.add(element)
1616

17-
dependenciesgraph.add("math/unfold/testUnfold5d.C",["math/unfold/testUnfold5c.C"])
18-
dependenciesgraph.add("math/unfold/testUnfold5c.C",["math/unfold/testUnfold5b.C"])
19-
dependenciesgraph.add("math/unfold/testUnfold5b.C",["math/unfold/testUnfold5a.C"])
17+
dependenciesgraph.add("analysis/unfold/testUnfold5d.C",["analysis/unfold/testUnfold5c.C"])
18+
dependenciesgraph.add("analysis/unfold/testUnfold5c.C",["analysis/unfold/testUnfold5b.C"])
19+
dependenciesgraph.add("analysis/unfold/testUnfold5b.C",["analysis/unfold/testUnfold5a.C"])
2020
dependenciesgraph.add("io/xml/xmlreadfile.C",["io/xml/xmlnewfile.C"])
21-
dependenciesgraph.add("roofit/rf503_wspaceread.C",["roofit/rf502_wspacewrite.C"])
21+
dependenciesgraph.add("roofit/roofit/rf503_wspaceread.C",["roofit/roofit/rf502_wspacewrite.C"])
2222
dependenciesgraph.add("io/readCode.C",["io/importCode.C"])
23-
dependenciesgraph.add("math/fit/fit1.C",["hist/fillrandom.C"])
23+
dependenciesgraph.add("math/fit/fit1.C",["hist/hist001_TH1_fillrandom.C"])
2424
dependenciesgraph.add("math/fit/myfit.C",["math/fit/fitslicesy.C"])
25-
dependenciesgraph.add("math/foam/foam_demopers.C",["math/oam/foam_demo.C"])
25+
dependenciesgraph.add("math/foam/foam_demopers.C",["math/foam/foam_demo.C"])
2626
dependenciesgraph.add("io/tree/tree502_staff.C",["io/tree/tree500_cernbuild.C"])
2727
dependenciesgraph.add("io/tree/tree501_cernstaff.C",["io/tree/tree500_cernbuild.C"])
28-
dependenciesgraph.add("hist/hbars.C",["io/tree/tree500_cernbuild.C"])
28+
dependenciesgraph.add("hist/hist006_TH1_bar_charts.C",["io/tree/tree500_cernbuild.C"])
2929
dependenciesgraph.add("io/tree/ntuple1.py",["hsimple.py"])
30-
dependenciesgraph.add("math/fit/fit1.py",["hist/fillrandom.py"])
31-
dependenciesgraph.add("tmva/TMVAClassificationApplication.C",["tmva/TMVAClassification.C"])
32-
dependenciesgraph.add("tmva/TMVAClassificationCategory.C",["tmva/TMVAClassification.C"])
33-
dependenciesgraph.add("tmva/TMVAClassificationCategoryApplication.C",["tmva/TMVAClassificationCategory.C"])
34-
dependenciesgraph.add("tmva/TMVAMulticlass.C",["tmva/TMVAMultipleBackgroundExample.C"])
35-
dependenciesgraph.add("tmva/TMVAMulticlassApplication.C",["tmva/TMVAMulticlass.C"])
36-
dependenciesgraph.add("tmva/TMVARegressionApplication.C",["tmva/TMVARegression.C"])
37-
30+
dependenciesgraph.add("math/fit/fit1.py",["hist/hist001_TH1_fillrandom.py"])
31+
dependenciesgraph.add("machine_learning/TMVAClassificationApplication.C",["machine_learning/TMVAClassification.C"])
32+
dependenciesgraph.add("machine_learning/TMVAClassificationCategory.C",["machine_learning/TMVAClassification.C"])
33+
dependenciesgraph.add("machine_learning/TMVAClassificationCategoryApplication.C",["machine_learning/TMVAClassificationCategory.C"])
34+
dependenciesgraph.add("machine_learning/TMVAMulticlass.C",["machine_learning/TMVAMultipleBackgroundExample.C"])
35+
dependenciesgraph.add("machine_learning/TMVAMulticlassApplication.C",["machine_learning/TMVAMulticlass.C"])
36+
dependenciesgraph.add("machine_learning/TMVARegressionApplication.C",["machine_learning/TMVARegression.C"])
37+
3838
for node in dependenciesgraph.nodes:
3939
dependenciesgraph.stale(node)
4040

@@ -55,8 +55,8 @@
5555

5656
def processInput(inputFile):
5757
subprocess.call([sys.executable,
58-
'./converttonotebook.py',
59-
os.path.join(os.environ['DOXYGEN_SOURCE_DIRECTORY'], 'tutorials', inputFile),
58+
'./converttonotebook.py',
59+
os.path.join(os.environ['DOXYGEN_SOURCE_DIRECTORY'], 'tutorials', inputFile),
6060
outDir])
6161

6262
num_cores = multiprocessing.cpu_count()

documentation/users-guide/Graphics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ primitives in this pad. The same can be achieved with the graphics
730730
editor. For example:
731731

732732
``` {.cpp}
733-
root[] .x tutorials/hist/h1draw.C
733+
root[] .x tutorials/hist/hist015_TH1_read_and_draw.C
734734
root[] TPad *newpad=new TPad("newpad","Transparent pad",0,0,1,1);
735735
root[] newpad->SetFillStyle(4000);
736736
root[] newpad->Draw();

documentation/users-guide/Histograms.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ further categories, depending on the set of possible bin values:
2626

2727
- **`TH1I, TH2I and TH3I`** contain one integer (four bytes) per bin
2828
(maximum bin content = 2 147 483 647).
29-
29+
3030
- **`TH1L, TH2L and TH3L`** contain one long64 (eight bytes) per bin
3131
(maximum bin content = 9 223 372 036 854 775 807).
3232

@@ -887,7 +887,7 @@ bar1`", "`bar2`", "`bar3`", "`bar4`".
887887
Use **`TH1`**`::SetBarWidth()` to control the bar width (default is
888888
the bin width). Use **`TH1`**`::SetBarOffset` to control the bar
889889
offset (default is 0). See the example
890-
`$ROOTSYS/tutorials/hist/hbars.C`
890+
`$ROOTSYS/tutorials/hist/hist006_TH1_bar_charts.C`
891891

892892
The options for the horizontal bar chart are "`hbar`", "`hbar0`",
893893
"`hbar1`", "`hbar2`", "`hbar3`", and "`hbar4`".
@@ -906,7 +906,7 @@ The options for the horizontal bar chart are "`hbar`", "`hbar0`",
906906

907907
Use **`TH1`**`::SetBarWidth` to control the bar width (default is the
908908
bin width). Use **`TH1`**`::SetBarOffset` to control the bar offset
909-
(default is 0). See the example `$ROOTSYS/tutorials/hist/hbars.C`
909+
(default is 0). See the example `$ROOTSYS/tutorials/hist/hist006_TH1_bar_charts.C`
910910

911911
![Horizontal bar charts](pictures/02000037.png)
912912

hist/histpainter/doc/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Some related tutorials:
66

77
- gr001_simple.C: Using and drawing a simple TGraph.
88
- gr011_graph2d_errorsfit.C: TGraph2D with errors drawing.
9-
- h1draw.C: Drawing Options for 1D Histograms.
10-
- hbars.C: Demo of option bar with histograms.
9+
- hist015_TH1_read_and_draw.C: Drawing Options for 1D Histograms.
10+
- hist006_TH1_bar_charts.C: Demo of option bar with histograms.
1111
- hsimple.C: Simple drawing of a 1D Histograms.
1212
- hsum.C: Filling several histograms and some graphics options.
1313
- surfaces.C: Drawing a TH2 as a 2-D surface.

test/stressGUI.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2210,7 +2210,7 @@ void testControlBars()
22102210
bar->AddButton("fillrandom",".x hist/fillrandom.C", "Histograms with Random Numbers from a Function");
22112211
bar->AddButton("fit1", ".x fit/fit1.C", "A Simple Fitting Example");
22122212
bar->AddButton("multifit", ".x fit/multifit.C", "Fitting in Subranges of Histograms");
2213-
bar->AddButton("h1draw", ".x hist/h1draw.C", "Drawing Options for 1D Histograms");
2213+
bar->AddButton("h1draw", ".x hist/hist015_TH1_read_and_draw.C", "Drawing Options for 1D Histograms");
22142214
bar->AddButton("graph", ".x graphs/gr001_graph.C", "Example of a Simple Graph");
22152215
bar->AddButton("gerrors", ".x graphs/gr002_errors.C", "Example of a Graph with Error Bars");
22162216
bar->AddButton("tornado", ".x visualisation/graphics/tornado.C", "Examples of 3-D PolyMarkers");

tutorials/demos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
bar.AddButton( 'fillrandom', r'TPython::Exec( "' + to_run.format('hist/fillrandom.py') + '" );','Histograms with Random Numbers from a Function' )
3939
bar.AddButton( 'fit1', r'TPython::Exec( "' + to_run.format('math/fit/fit1.py') + '" );', 'A Simple Fitting Example' )
4040
bar.AddButton( 'multifit', r'TPython::Exec( "' + to_run.format('math/fit/multifit.py') + '" );', 'Fitting in Subranges of Histograms' )
41-
bar.AddButton( 'h1draw', r'TPython::Exec( "' + to_run.format('hist/h1ReadAndDraw.py') + '" );', 'Drawing Options for 1D Histograms' )
41+
bar.AddButton( 'h1draw', r'TPython::Exec( "' + to_run.format('hist/hist015_TH1_read_and_draw.py') + '" );', 'Drawing Options for 1D Histograms' )
4242
bar.AddButton( 'graph', r'TPython::Exec( "' + to_run.format('visualisation/graphs/graph.py') + '" );', 'Example of a Simple Graph' )
4343
bar.AddButton( 'gerrors', r'TPython::Exec( "' + to_run.format('visualisation/graphs/gerrors.py') + '" );', 'Example of a Graph with Error Bars' )
4444
bar.AddButton( 'tornado', r'TPython::Exec( "' + to_run.format('visualisation/graphics/tornado.py') + '" );', 'Examples of 3-D PolyMarkers' )

tutorials/hist/hist006_TH1_bar_charts.C

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ TCanvas *hist006_TH1_bar_charts()
2727

2828
auto file = std::unique_ptr<TFile>(TFile::Open(filename, "READ"));
2929
if (!file) {
30-
Error("hbars", "file cernstaff.root not found");
30+
Error("hist006_TH1_bar_charts", "file cernstaff.root not found");
3131
return nullptr;
3232
}
3333

3434
// Retrieve the TTree named "T" contained in the file
3535
auto tree = file->Get<TTree>("T");
3636
if (!tree) {
37-
Error("hbars", "Tree T is not present in file %s", file->GetName());
37+
Error("hist006_TH1_bar_charts", "Tree T is not present in file %s", file->GetName());
3838
return nullptr;
3939
}
4040
tree->SetFillColor(45);

0 commit comments

Comments
 (0)