early return added and cppcheck fix

mantidproject · Dec 3, 2024 · 5aca6a1 · 5aca6a1
1 parent 86448cc
commit 5aca6a1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/Framework/DataObjects/src/PeakShapeDetectorBinFactory.cpp b/Framework/DataObjects/src/PeakShapeDetectorBinFactory.cpp
@@ -24,35 +24,35 @@ namespace Mantid::DataObjects {
 Mantid::Geometry::PeakShape *PeakShapeDetectorBinFactory::create(const std::string &source) const {
   Json::Value root;
   Mantid::Geometry::PeakShape *peakShape = nullptr;
-  if (Mantid::JsonHelpers::parse(source, &root)) {
-    const std::string shape = root["shape"].asString();
-    if (shape == PeakShapeDetectorBin::detectorBinShapeName()) {
-      const std::string algorithmName(root["algorithm_name"].asString());
-      const int algorithmVersion(root["algorithm_version"].asInt());
-      const auto frame(static_cast<SpecialCoordinateSystem>(root["frame"].asInt()));
-
-      std::vector<std::tuple<int32_t, double, double>> detectorBinList;
-      const Json::Value detectorList = root["detectors"];
-      for (uint32_t index = 0; index < detectorList.size(); index++) {
-        const Json::Value detBinVal = detectorList[index];
-        detectorBinList.emplace_back(detBinVal["detId"].asInt(), detBinVal["startX"].asDouble(),
-                                     detBinVal["endX"].asDouble());
-      }
-      peakShape = new PeakShapeDetectorBin(detectorBinList, frame, algorithmName, algorithmVersion);
-    } else {
-      if (m_successor) {
-        peakShape = m_successor->create(source);
-      } else {
-        throw std::invalid_argument("PeakShapeDetectorBinFactory:: No successor "
-                                    "factory able to process : " +
-                                    source);
-      }
-    }
-  } else {
+  if (!Mantid::JsonHelpers::parse(source, &root)) {
     throw std::invalid_argument("PeakShapeDetectorBinFactory:: Source JSON for "
                                 "the peak shape is not valid: " +
                                 source);
   }
+
+  const std::string shape = root["shape"].asString();
+  if (shape == PeakShapeDetectorBin::detectorBinShapeName()) {
+    const std::string algorithmName(root["algorithm_name"].asString());
+    const int algorithmVersion(root["algorithm_version"].asInt());
+    const auto frame(static_cast<SpecialCoordinateSystem>(root["frame"].asInt()));
+
+    std::vector<std::tuple<int32_t, double, double>> detectorBinList;
+    const Json::Value detectorList = root["detectors"];
+    for (uint32_t index = 0; index < detectorList.size(); index++) {
+      const Json::Value detBinVal = detectorList[index];
+      detectorBinList.emplace_back(detBinVal["detId"].asInt(), detBinVal["startX"].asDouble(),
+                                   detBinVal["endX"].asDouble());
+    }
+    peakShape = new PeakShapeDetectorBin(detectorBinList, frame, algorithmName, algorithmVersion);
+  } else {
+    if (m_successor) {
+      peakShape = m_successor->create(source);
+    } else {
+      throw std::invalid_argument("PeakShapeDetectorBinFactory:: No successor "
+                                  "factory able to process : " +
+                                  source);
+    }
+  }
   return peakShape;
 }
 

diff --git a/Framework/PythonInterface/mantid/dataobjects/src/Exports/PeakShapeDetectorBin.cpp b/Framework/PythonInterface/mantid/dataobjects/src/Exports/PeakShapeDetectorBin.cpp
@@ -39,5 +39,5 @@ void export_PeakShapeDetectorBin() {
       .def("__init__", make_constructor(&createPeakShapeDetectorBin, default_call_policies(),
                                         (arg("detectorBinList"), arg("frame") = SpecialCoordinateSystem::None,
                                          arg("algorithmName") = "", arg("algorithmVersion") = -1)))
-      .def("__eq__", &PeakShapeDetectorBin::operator==, arg("self"), arg("other"));
+      .def("__eq__", &PeakShapeDetectorBin::operator==);
 }