Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/9581_SphinxChanges'
Browse files Browse the repository at this point in the history
  • Loading branch information
NickDraper committed Jul 2, 2014
2 parents 880bf72 + 0904608 commit a2ea73c
Show file tree
Hide file tree
Showing 46 changed files with 2,121 additions and 852 deletions.
334 changes: 0 additions & 334 deletions .githooks/pre-commit

This file was deleted.

4 changes: 2 additions & 2 deletions Code/Mantid/Framework/API/inc/MantidAPI/ITableWorkspace.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ class MANTID_API_DLL ITableWorkspace: public API::Workspace
virtual Column_sptr addColumn(const std::string& type, const std::string& name) = 0;
/// Creates n new columns of the same type.
virtual bool addColumns(const std::string& type, const std::string& name, size_t n);
/**Get access to shared pointer containing workspace porperties */
/**Get access to shared pointer containing workspace properties */
virtual API::LogManager_sptr logs() = 0;
/**Get constant access to shared pointer containing workspace porperties */
/**Get constant access to shared pointer containing workspace properties */
virtual API::LogManager_const_sptr getLogs()const = 0;

/// Removes a column.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class DLLExport DetectorEfficiencyCor : public API::Algorithm
/// Algorithm's name for identification overriding a virtual method
virtual const std::string name() const { return "DetectorEfficiencyCor"; }
///Summary of algorithms purpose
virtual const std::string summary() const {return "This algorithm adjusts the binned data in a workspace for detector efficiency, calculated from the neutrons' kinetic energy, the gas filled detector's geometry and gas pressure. The data are then multiplied by <math>k_i/k_f</math>.";}
virtual const std::string summary() const {return "This algorithm adjusts the binned data in a workspace for detector efficiency, calculated from the neutrons' kinetic energy, the gas filled detector's geometry and gas pressure. The data are then multiplied by :math:`k_i/k_f`";}

/// Algorithm's version for identification overriding a virtual method
virtual int version() const { return 1; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace Algorithms

private:

/// Initialise the properties
/// Initialize the properties
void init();
/// Run the algorithm
void exec();
Expand Down
Loading

0 comments on commit a2ea73c

Please sign in to comment.