refs #10904. Hook new factory into loader.

Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp

@@ -32,6 +32,7 @@
 #include "MantidKernel/MultiThreaded.h"
 #include "MantidDataObjects/PeakNoShapeFactory.h"
 #include "MantidDataObjects/PeakShapeSphericalFactory.h"
+#include "MantidDataObjects/PeakShapeEllipsoidFactory.h"
 #include "MantidDataObjects/PeakShape.h"
 
 namespace Mantid {
@@ -1122,26 +1123,30 @@ API::Workspace_sptr LoadNexusProcessed::loadPeaksEntry(NXEntry &entry) {
       // Read shape information
       using namespace Mantid::DataObjects;
 
-      PeakShapeFactory_sptr peakFactory = boost::make_shared<PeakShapeSphericalFactory>();
-      peakFactory->setSuccessor(boost::make_shared<PeakNoShapeFactory>());
+      PeakShapeFactory_sptr peakFactoryEllipsoid = boost::make_shared<PeakShapeEllipsoidFactory>();
+      PeakShapeFactory_sptr peakFactorySphere = boost::make_shared<PeakShapeSphericalFactory>();
+      PeakShapeFactory_sptr peakFactoryNone = boost::make_shared<PeakNoShapeFactory>();
+
+      peakFactoryEllipsoid->setSuccessor(peakFactorySphere);
+      peakFactorySphere->setSuccessor(peakFactoryNone);
 
       NXInfo info = nx_tw.getDataSetInfo(str.c_str());
       NXChar data = nx_tw.openNXChar(str.c_str());
 
       const int maxShapeJSONLength = info.dims[1];
       data.load();
-      for (int r = 0; r < numberPeaks; r++) {
+      for (int i = 0; i < numberPeaks; ++i) {
 
         // iR = peak row number
-        auto startPoint = data() + (maxShapeJSONLength * r);
+        auto startPoint = data() + (maxShapeJSONLength * i);
         std::string shapeJSON(startPoint, startPoint + maxShapeJSONLength);
         boost::trim_right(shapeJSON);
 
         // Make the shape
-        PeakShape* peakShape = peakFactory->create(shapeJSON);
+        PeakShape* peakShape = peakFactoryEllipsoid->create(shapeJSON);
 
         // Set the shape
-        peakWS->getPeak(r).setPeakShape(peakShape);
+        peakWS->getPeak(i).setPeakShape(peakShape);
 
       }
     }

Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/PeakShapeSpherical.h

@@ -65,6 +65,8 @@ class DLLExport PeakShapeSpherical : public PeakShapeBase {
   boost::optional<double> backgroundOuterRadius() const;
   /// Peak inner background radius
   boost::optional<double> backgroundInnerRadius() const;
+  /// Non-instance shape name
+  static const std::string sphereShapeName();
 
 private:
   /// Peak radius

Code/Mantid/Framework/DataObjects/src/PeakShapeSpherical.cpp

@@ -106,7 +106,7 @@ PeakShapeSpherical *PeakShapeSpherical::clone() const {
   return new PeakShapeSpherical(*this);
 }
 
-std::string PeakShapeSpherical::shapeName() const { return "spherical"; }
+std::string PeakShapeSpherical::shapeName() const { return sphereShapeName() ; }
 
 bool PeakShapeSpherical::operator==(const PeakShapeSpherical &other) const {
   return PeakShapeBase::operator==(other) && other.radius() == this->radius() &&
@@ -135,7 +135,16 @@ boost::optional<double> PeakShapeSpherical::backgroundOuterRadius() const {
  * @return boost optional inner radius.
  */
 boost::optional<double> PeakShapeSpherical::backgroundInnerRadius() const {
-  return m_backgroundInnerRadius;
+    return m_backgroundInnerRadius;
+}
+
+/**
+ * @brief PeakShapeSpherical::sphereShapeName
+ * @return Spherical shape name for this type.
+ */
+const std::string PeakShapeSpherical::sphereShapeName()
+{
+    return "spherical";
 }
 
 } // namespace DataObjects

Code/Mantid/Framework/DataObjects/src/PeakShapeSphericalFactory.cpp

@@ -30,7 +30,7 @@ PeakShape *PeakShapeSphericalFactory::create(const std::string &source) const {
   PeakShape *product = NULL;
   if (reader.parse(source, root)) {
     const std::string shape = root["shape"].asString();
-    if (shape == "spherical") {
+    if (shape == PeakShapeSpherical::sphereShapeName()) {
 
       const std::string algorithmName(root["algorithm_name"].asString());
       const int algorithmVersion(root["algorithm_version"].asInt());