Skip to content

Commit

Permalink
Fix some invalid drupal links (root-project#7877)
Browse files Browse the repository at this point in the history
  • Loading branch information
couet authored Apr 15, 2021
1 parent 2948dd8 commit 32ad6f7
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 51 deletions.
7 changes: 3 additions & 4 deletions bindings/r/inc/TRDataFrame.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ namespace ROOT {
\endcode
<h2>Users Guide </h2>
<a href="http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide"> http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide</a><br>
<a href="https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface"> https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface</a>
@ingroup R
*/

Expand Down Expand Up @@ -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(); }
Expand All @@ -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()
{
Expand All @@ -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 = "")
{
Expand Down
7 changes: 3 additions & 4 deletions bindings/r/inc/TRFunctionExport.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ namespace ROOT {
</p>
<p>
The next example was based in <br>
<a href="http://root.cern.ch/root/html/tutorials/fit/NumericalMinimization.C.html">
http://root.cern.ch/root/html/tutorials/fit/NumericalMinimization.C.html
<a href="https://root.cern/doc/master/NumericalMinimization_8C.html">
https://root.cern/doc/master/NumericalMinimization_8C.html
</a><br>
<a href="http://stat.ethz.ch/R-manual/R-devel/library/stats/html/optim.html">
http://stat.ethz.ch/R-manual/R-devel/library/stats/html/optim.html</a><br>
Expand All @@ -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 definition must be a single vector.
optim, the input in your function definition must be a single vector.
The Gradient is formed by
Expand Down Expand Up @@ -131,7 +131,6 @@ namespace ROOT {
\endcode
<h2>Users Guide </h2>
<a href="http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide"> http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide</a><br>
<a href="https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface"> https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface</a>
@ingroup R
*/
Expand Down
1 change: 0 additions & 1 deletion bindings/r/inc/TRFunctionImport.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ namespace ROOT {
\endcode
<h2>Users Guide </h2>
<a href="http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide"> http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide</a><br>
<a href="https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface"> https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface</a>
@ingroup R
*/
Expand Down
25 changes: 12 additions & 13 deletions bindings/r/inc/TRInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ namespace ROOT {
<A HREF="http://cran.r-project.org/web/packages/RInside/index.html">RInside</A>
<h2>Users Guide </h2>
<a href="http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide"> http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide</a><br>
<a href="https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface"> https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface</a>
\ingroup R
*/
Expand All @@ -47,11 +46,11 @@ namespace ROOT {
<center><h2>TRInterface class</h2></center>
</p>
The TRInterface class lets you procces R code from ROOT.<br>
The TRInterface class lets you process R code from ROOT.<br>
You can call R libraries and their functions, plot results in R or ROOT,<br>
and use the power of ROOT and R at the same time.<br>
It also lets you pass scalars, vectors and matrices from ROOT to R<br>
and from R to ROOT using TRObject; but you can to use overloaded opetarors [],<< and >> <br>
and from R to ROOT using TRObject; but you can to use overloaded operators [],<< and >> <br>
to work with ROOTR like work with streams of data.<br>
TRInterface class can not be instantiated directly, but you can create objects using the static methods
Expand Down Expand Up @@ -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
Expand All @@ -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
/**
Expand All @@ -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
*/
template<typename T >void 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<T>(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();

Expand Down
9 changes: 4 additions & 5 deletions bindings/r/inc/TRObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace ROOT {
<p>
The TRObject class lets you obtain ROOT's objects from R's objects.<br>
It has some basic template opetarors to convert R's objects into ROOT's datatypes<br>
It has some basic template operators to convert R's objects into ROOT's datatypes<br>
</p>
A simple example<br>
<p>
Expand Down Expand Up @@ -64,14 +64,13 @@ namespace ROOT {
<h2>Users Guide </h2>
<a href="http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide"> http://oproject.org/tiki-index.php?page=ROOT+R+Users+Guide</a><br>
<a href="https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface"> https://root.cern.ch/drupal/content/how-use-r-root-root-r-interface</a>
@ingroup R
*/
class TRObject: public TObject {
friend SEXP Rcpp::wrap<TRObject>(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:
/**
Expand Down Expand Up @@ -156,7 +155,7 @@ namespace ROOT {
T data =::Rcpp::as<T>(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();
}
}
Expand Down Expand Up @@ -188,7 +187,7 @@ namespace ROOT {
T data =::Rcpp::as<T>(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();
}
}
Expand Down
10 changes: 5 additions & 5 deletions graf2d/gpad/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions hist/doc/Hist.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
11 changes: 11 additions & 0 deletions hist/hbook/doc/index.md
Original file line number Diff line number Diff line change
@@ -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)
12 changes: 0 additions & 12 deletions hist/hbook/doc/index.txt

This file was deleted.

4 changes: 2 additions & 2 deletions main/src/h2root.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// if tolower is missing (or = 1) ntuple column names are converted to lower case
// but the first character is converted to upper case.
// if tolower = 2 same as tolower=1 except that the first character is also
// convertex to lower case
// converted to lower case
/////////////////////////////////////////////////////////////////////////

#include <cstdlib>
Expand Down Expand Up @@ -627,7 +627,7 @@ void convert_rwn(Int_t id)
for(i=0; i<nvar;i++) {
name[kNchar-1] = 0;
first = last = 0;
// suppress traling blanks
// suppress trailing blanks
for (j=kNchar-2;j>0;j--) {
if(golower) name[j] = tolower(name[j]);
if (name[j] == ' ' && last == 0) name[j] = 0;
Expand Down

0 comments on commit 32ad6f7

Please sign in to comment.