diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CarpenterSampleCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/CarpenterSampleCorrection.h index 5cd32d316f3d6c7fb05abbc0825208e83bacb6e9..64504e0fc1f9681e0d7fe83a60bab5986c5acac6 100644 --- a/Framework/Algorithms/inc/MantidAlgorithms/CarpenterSampleCorrection.h +++ b/Framework/Algorithms/inc/MantidAlgorithms/CarpenterSampleCorrection.h @@ -69,7 +69,7 @@ public: } // Algorithm's alias for identification overriding a virtual method - const std::string alias() const { + const std::string alias() const override { return "MultipleScatteringCylinderAbsorption"; } diff --git a/docs/source/algorithms/CalculateCarpenterSampleCorrection-v1.rst b/docs/source/algorithms/CalculateCarpenterSampleCorrection-v1.rst index a707dbb7d39fe3233157ba6e45a89d15247b3354..5a69ef609cb58ea0c46f82c6b99cffcda8156324 100644 --- a/docs/source/algorithms/CalculateCarpenterSampleCorrection-v1.rst +++ b/docs/source/algorithms/CalculateCarpenterSampleCorrection-v1.rst @@ -42,7 +42,7 @@ This algorithm calculates and outputs the absorption and/or multiple scattering 2. The multiple scattering correction workspace will be OutputWorkspaceBaseName + `_ms` and will be in `.getItem(1)`. -This is the child algorithm that :ref:`algm-CarpenterSampleCorrection` (also known as :ref:`algm-MultipleScatteringCylinderAbsorption`) uses to calculate and apply the correction to a sample workspace. +This is the child algorithm that :ref:`algm-CarpenterSampleCorrection` (previously known as *MultipleScatteringCylinderAbsorption*) uses to calculate and apply the correction to a sample workspace. Usage ----- diff --git a/docs/source/algorithms/MayersSampleCorrection-v1.rst b/docs/source/algorithms/MayersSampleCorrection-v1.rst index a2163c2834e517e45edbe5ff8950af581f1be8ab..8afc8aab57a726369412f9d1379e67c9274074b9 100644 --- a/docs/source/algorithms/MayersSampleCorrection-v1.rst +++ b/docs/source/algorithms/MayersSampleCorrection-v1.rst @@ -97,7 +97,7 @@ References .. [1] Lindley, E.J., & Mayers, J. Cywinski, R. (Ed.). (1988). Experimental method and corrections to data. United Kingdom: Adam Hilger. - https://inis.iaea.org/search/search.aspx?orig_q=RN:20000574 -.. seealso :: Algorithm :ref:`algm-MultipleScatteringCylinderAbsorption` +.. seealso :: Algorithm :ref:`algm-CarpenterSampleCorrection` .. categories:: diff --git a/docs/source/concepts/MultipleScattering.rst b/docs/source/concepts/MultipleScattering.rst index 6f882289df43910b738d973500f1f0e9eb4905c0..f2457d79523158a0dacb5b6186742b638ef2dc43 100644 --- a/docs/source/concepts/MultipleScattering.rst +++ b/docs/source/concepts/MultipleScattering.rst @@ -70,9 +70,9 @@ Mayers Sample Correction ------------------------ Documentation for this algorithm can found :ref:`here <algm-MayersSampleCorrection>`. -Multiple Scattering Cylinder Absorption +Carpenter Sample Correction --------------------------------------- -This is a Carpenter style correction. For more details see :ref:`here <algm-MultipleScatteringCylinderAbsorption>`. +This is a Carpenter style correction. For more details see :ref:`here <algm-CarpenterSampleCorrection>`. References ~~~~~~~~~~ diff --git a/docs/source/release/v3.13.0/framework.rst b/docs/source/release/v3.13.0/framework.rst index 21b3709002339645669ebaeac0fe8fe0acc0d735..4c068ffa485d101b7b604a8da276de24b8073079 100644 --- a/docs/source/release/v3.13.0/framework.rst +++ b/docs/source/release/v3.13.0/framework.rst @@ -28,9 +28,9 @@ New Algorithms - :ref:`LoadSampleShape <algm-LoadSampleShape>` loads a shape into the sample in a workspace from an STL file, which contains a list of triangles. -- :ref:`CalculateCarpenterSampleCorrection` outputs a group workspace with the separate absorption and multiple scattering corrections for flexibility to the User to apply them to the sample workspace +- :ref:`CalculateCarpenterSampleCorrection <algm-CalculateCarpenterSampleCorrection` outputs a group workspace with the separate absorption and multiple scattering corrections for flexibility to the User to apply them to the sample workspace -- :ref:`CarpenterSampleCorrection` replaces :ref:`MultipleScatteringCylinderAbsorption` and uses :ref:`CalculateCarpenterSampleCorrection` for calculating its corrections. +- :ref:`CarpenterSampleCorrection <algm-CarpenterSamlpeCorrection` replaces *MultipleScatteringCylinderAbsorption* and uses :ref:`CalculateCarpenterSampleCorrection <algm-CalculateCarpenterSampleCorrection` for calculating its corrections. Improved ########