From 32ad6f7714513fcfe0d0824646e8c4893341f318 Mon Sep 17 00:00:00 2001 From: Olivier Couet Date: Thu, 15 Apr 2021 17:01:13 +0200 Subject: [PATCH] Fix some invalid drupal links (#7877) --- bindings/r/inc/TRDataFrame.h | 7 +++---- bindings/r/inc/TRFunctionExport.h | 7 +++---- bindings/r/inc/TRFunctionImport.h | 1 - bindings/r/inc/TRInterface.h | 25 ++++++++++++------------- bindings/r/inc/TRObject.h | 9 ++++----- graf2d/gpad/doc/index.md | 10 +++++----- hist/doc/Hist.md | 10 +++++----- hist/hbook/doc/index.md | 11 +++++++++++ hist/hbook/doc/index.txt | 12 ------------ main/src/h2root.cxx | 4 ++-- 10 files changed, 45 insertions(+), 51 deletions(-) create mode 100644 hist/hbook/doc/index.md delete mode 100644 hist/hbook/doc/index.txt diff --git a/bindings/r/inc/TRDataFrame.h b/bindings/r/inc/TRDataFrame.h index 8cc28079592f2..1d5124b01bc85 100644 --- a/bindings/r/inc/TRDataFrame.h +++ b/bindings/r/inc/TRDataFrame.h @@ -169,7 +169,6 @@ namespace ROOT { \endcode

Users Guide

http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide
- https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface @ingroup R */ @@ -389,7 +388,7 @@ namespace ROOT { } /** - Method to get the number of colunms + Method to get the number of columns \return number of cols */ Int_t GetNcols() { return df.size(); } @@ -400,7 +399,7 @@ namespace ROOT { Int_t GetNrows() { return df.nrows(); } /** Method to get labels of dataframe - \return colunms names + \return columns names */ TVectorString GetColNames() { @@ -423,7 +422,7 @@ namespace ROOT { /** Method to print the dataframe in stdout or a column given the label - \param label nomber of the column to print + \param label number of the column to print */ void Print(const Char_t *label = "") { diff --git a/bindings/r/inc/TRFunctionExport.h b/bindings/r/inc/TRFunctionExport.h index c52f12528ca40..3349b3142e761 100644 --- a/bindings/r/inc/TRFunctionExport.h +++ b/bindings/r/inc/TRFunctionExport.h @@ -28,8 +28,8 @@ namespace ROOT {

The next example was based in
- - http://root.cern.ch/root/html/tutorials/fit/NumericalMinimization.C.html + + https://root.cern/doc/master/NumericalMinimization_8C.html
http://stat.ethz.ch/R-manual/R-devel/library/stats/html/optim.html
@@ -42,7 +42,7 @@ namespace ROOT { It's known that this function has a minimum when \f$ y = x^{2}\f$ , and \f$ x = 1.\f$ Let's get the minimum using R's optim package through ROOTR's interface. In the code this function was called "Double_t RosenBrock(const TVectorD xx )", because for - optim, the input in your function deļ¬nition must be a single vector. + optim, the input in your function definition must be a single vector. The Gradient is formed by @@ -131,7 +131,6 @@ namespace ROOT { \endcode

Users Guide

http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide
- https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface @ingroup R */ diff --git a/bindings/r/inc/TRFunctionImport.h b/bindings/r/inc/TRFunctionImport.h index 8e2550be3aa10..0872df7ca3cb4 100644 --- a/bindings/r/inc/TRFunctionImport.h +++ b/bindings/r/inc/TRFunctionImport.h @@ -111,7 +111,6 @@ namespace ROOT { \endcode

Users Guide

http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide
- https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface @ingroup R */ diff --git a/bindings/r/inc/TRInterface.h b/bindings/r/inc/TRInterface.h index 237980f933692..687edc224f886 100644 --- a/bindings/r/inc/TRInterface.h +++ b/bindings/r/inc/TRInterface.h @@ -37,7 +37,6 @@ namespace ROOT { RInside

Users Guide

http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide
- https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface \ingroup R */ @@ -47,11 +46,11 @@ namespace ROOT {

TRInterface class

- The TRInterface class lets you procces R code from ROOT.
+ The TRInterface class lets you process R code from ROOT.
You can call R libraries and their functions, plot results in R or ROOT,
and use the power of ROOT and R at the same time.
It also lets you pass scalars, vectors and matrices from ROOT to R
- and from R to ROOT using TRObject; but you can to use overloaded opetarors [],<< and >>
+ and from R to ROOT using TRObject; but you can to use overloaded operators [],<< and >>
to work with ROOTR like work with streams of data.
TRInterface class can not be instantiated directly, but you can create objects using the static methods @@ -203,7 +202,7 @@ namespace ROOT { }; private: /** - The command line arguments are by deafult argc=0 and argv=NULL, + The command line arguments are by default argc=0 and argv=NULL, The verbose mode is by default disabled but you can enable it to show procedures information in stdout/stderr \note some time can produce so much noise in the output \param argc default 0 \param argv default null @@ -227,7 +226,7 @@ namespace ROOT { Method to eval R code and you get the result in a reference to TRObject \param code R code \param ans reference to TRObject - \return an true or false if the execution was sucessful or not. + \return an true or false if the execution was successful or not. */ Int_t Eval(const TString &code, TRObject &ans); // parse line, returns in ans; error code rc /** @@ -248,32 +247,32 @@ namespace ROOT { /** - Template method to assign C++ variables into R enviroment + Template method to assign C++ variables into R environment \param var any R wrappable datatype - \param name name of the variable in R's enviroment + \param name name of the variable in R's environment */ templatevoid Assign(const T &var, const TString &name) { // This method lets you pass variables from ROOT to R. // The template T should be a supported ROOT datatype and - // the TString's name is the name of the variable in the R enviroment. + // the TString's name is the name of the variable in the R environment. fR->assign(var, name.Data()); } /** - Method to assign TRFunctionExport in R's enviroment + Method to assign TRFunctionExport in R's environment \param fun TRFunctionExport - \param name name of the variable in R's enviroment + \param name name of the variable in R's environment */ void Assign(const TRFunctionExport &fun, const TString &name); /** - Method to assign TRDataFrame in R's enviroment + Method to assign TRDataFrame in R's environment \param df TRDataFrame - \param name name of the variable in R's enviroment + \param name name of the variable in R's environment */ void Assign(const TRDataFrame &df, const TString &name); /** - Method to get a R prompt to work interactively with tab completation support + Method to get a R prompt to work interactively with tab completion support */ void Interactive(); diff --git a/bindings/r/inc/TRObject.h b/bindings/r/inc/TRObject.h index df271959cb1b9..fc6e62794fb4f 100644 --- a/bindings/r/inc/TRObject.h +++ b/bindings/r/inc/TRObject.h @@ -24,7 +24,7 @@ namespace ROOT {

The TRObject class lets you obtain ROOT's objects from R's objects.
- It has some basic template opetarors to convert R's objects into ROOT's datatypes
+ It has some basic template operators to convert R's objects into ROOT's datatypes

A simple example

@@ -64,14 +64,13 @@ namespace ROOT {

Users Guide

http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide
- https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface @ingroup R */ class TRObject: public TObject { friend SEXP Rcpp::wrap(const TRObject &f); private: - Rcpp::RObject fObj; //insternal Rcpp::RObject + Rcpp::RObject fObj; //internal Rcpp::RObject Bool_t fStatus;//status tell if is a valid object public: /** @@ -156,7 +155,7 @@ namespace ROOT { T data =::Rcpp::as(fObj); return data; } else { - Error("Cast Operator", "Can not make the requested data, returning an unknow value"); + Error("Cast Operator", "Can not make the requested data, returning an unknown value"); return T(); } } @@ -188,7 +187,7 @@ namespace ROOT { T data =::Rcpp::as(fObj); return data; } else { - Error("Cast Operator", "Can not make the requested data, returning an unknow value"); + Error("Cast Operator", "Can not make the requested data, returning an unknown value"); return T(); } } diff --git a/graf2d/gpad/doc/index.md b/graf2d/gpad/doc/index.md index a40e1b4d132e2..654d31555a79e 100644 --- a/graf2d/gpad/doc/index.md +++ b/graf2d/gpad/doc/index.md @@ -9,11 +9,11 @@ TPad and TPad's related classes' usages are illustrated by the following examples: - - [The Graphics Pad.](http://root.cern.ch/drupal/content/graphics-pad) - - [How to Draw objects.](http://root.cern.ch/drupal/content/how-draw-objects) - - [How to Pick objects.](http://root.cern.ch/drupal/content/how-pick-objects) - - [Dividing a canvas with no margins between pads.](http://root.cern.ch/root/html/tutorials/graphs/zones.C.html) - - [Using transparent pads.](http://root.cern.ch/root/html/tutorials/hist/transpad.C.html) + - [The Graphics Pad.](https://root.cern/doc/master/classTPad.html) + - [How to Draw objects.](https://root-forum.cern.ch/t/how-to-draw-objects/28249) + - [How to Pick objects.](https://root-forum.cern.ch/t/how-to-pick-objects/28251) + - [Dividing a canvas with no margins between pads.](https://root.cern/doc/master/zones_8C.html) + - [Using transparent pads.](https://root.cern/doc/master/transpad_8C.html) \defgroup GraphicsAtt Graphics attributes \ingroup Graphics diff --git a/hist/doc/Hist.md b/hist/doc/Hist.md index 97d24efd675ba..427d974cb4358 100644 --- a/hist/doc/Hist.md +++ b/hist/doc/Hist.md @@ -26,8 +26,8 @@ ROOT supports the following histogram types: - [The Chapter about the Histogram classes in the Users Guide](ftp://root.cern.ch/root/doc/3Histograms.pdf) - [The Chapter about Fitting Histogram in the Users Guide](ftp://root.cern.ch/root/doc/5FittingHistograms.pdf) - - [How to use the Histogram classes](http://root.cern.ch/drupal/content/how-use-histograms-classes) - - [How to Merge files with histograms and Trees](http://root.cern.ch/drupal/content/how-merge-histograms-files) - - [How to Fit Histograms](http://root.cern.ch/drupal/content/how-fit-histograms-or-data-points) - - [How to Fit find peaks in histograms](http://root.cern.ch/root/html/tutorials/spectrum/peaks.C.html) - - [How to convert Hbook/PAW files to ROOT](http://root.cern.ch/drupal/content/how-convert-hbookpaw-files-root-files) + - [How to use the Histogram classes](https://root.cern/manual/histograms/) + - [How to Merge files with histograms and Trees](https://root.cern/manual/storing_root_objects/#merging-root-files-with-hadd) + - [How to Fit Histograms](https://root.cern/manual/fitting/) + - [How to Fit find peaks in histograms](https://root.cern/doc/master/peaks_8C.html) + - [How to convert Hbook/PAW files to ROOT](https://root-forum.cern.ch/t/how-to-convert-hbook-paw-files-to-root/) diff --git a/hist/hbook/doc/index.md b/hist/hbook/doc/index.md new file mode 100644 index 0000000000000..8ec5b57a09378 --- /dev/null +++ b/hist/hbook/doc/index.md @@ -0,0 +1,11 @@ +This directory contains all the hbook interface classes. + + See: + + - [How to convert Hbook/PAW files to ROOT](https://root-forum.cern.ch/t/how-to-convert-hbook-paw-files-to-root/) + - [The Chapter about the Histogram classes in the Users Guide](ftp://root.cern.ch/root/doc/3Histograms.pdf) + - [The Chapter about Fitting Histogram in the Users Guide](ftp://root.cern.ch/root/doc/5FittingHistograms.pdf) + - [How to use the Histogram classes](https://root.cern/manual/histograms/) + - [How to Merge files with histograms and Trees](https://root.cern/manual/storing_root_objects/#merging-root-files-with-hadd) + - [How to Fit Histograms](https://root.cern/manual/fitting/) + - [How to Fit find peaks in histograms](https://root.cern/doc/master/peaks_8C.html) diff --git a/hist/hbook/doc/index.txt b/hist/hbook/doc/index.txt deleted file mode 100644 index 320389c1657e8..0000000000000 --- a/hist/hbook/doc/index.txt +++ /dev/null @@ -1,12 +0,0 @@ -This directory contains all the hbook interface classes. -BEGIN_HTML - See: -