for impossible cases, prefer ASSERT over throw

Core/Scan/UnitConverter1D.cpp

@@ -65,7 +65,7 @@ size_t UnitConverter1D::dimension() const
 
 double UnitConverter1D::calculateMin(size_t i_axis, Axes::Units units_type) const
 {
-    checkIndex(i_axis);
+    ASSERT(i_axis==0);
     units_type = substituteDefaultUnits(units_type);
     if (units_type == Axes::Units::NBINS)
         return 0.0;
@@ -75,7 +75,7 @@ double UnitConverter1D::calculateMin(size_t i_axis, Axes::Units units_type) cons
 
 double UnitConverter1D::calculateMax(size_t i_axis, Axes::Units units_type) const
 {
-    checkIndex(i_axis);
+    ASSERT(i_axis==0);
     units_type = substituteDefaultUnits(units_type);
     auto coordinate_axis = coordinateAxis();
     if (units_type == Axes::Units::NBINS)
@@ -86,7 +86,7 @@ double UnitConverter1D::calculateMax(size_t i_axis, Axes::Units units_type) cons
 
 std::unique_ptr<IAxis> UnitConverter1D::createConvertedAxis(size_t i_axis, Axes::Units units) const
 {
-    checkIndex(i_axis);
+    ASSERT(i_axis==0);
     units = substituteDefaultUnits(units);
     if (units == Axes::Units::NBINS)
         return std::make_unique<FixedBinAxis>(axisName(0, units), coordinateAxis()->size(),
@@ -136,7 +136,7 @@ UnitConverterConvSpec* UnitConverterConvSpec::clone() const
 
 size_t UnitConverterConvSpec::axisSize(size_t i_axis) const
 {
-    checkIndex(i_axis);
+    ASSERT(i_axis==0);
     return m_axis->size();
 }
 
@@ -207,7 +207,7 @@ UnitConverterQSpec* UnitConverterQSpec::clone() const
 //! Returns the size of underlying axis.
 size_t UnitConverterQSpec::axisSize(size_t i_axis) const
 {
-    checkIndex(i_axis);
+    ASSERT(i_axis==0);
     return m_axis->size();
 }
 

Device/Detector/SimpleUnitConverters.cpp

@@ -56,7 +56,7 @@ void UnitConverterSimple::addAxisData(std::string name, double min, double max,
 
 double UnitConverterSimple::calculateMin(size_t i_axis, Axes::Units units_type) const
 {
-    checkIndex(i_axis);
+    ASSERT(i_axis < dimension());
     units_type = substituteDefaultUnits(units_type);
     const auto& axis_data = m_axis_data_table[i_axis];
     if (units_type == Axes::Units::NBINS)
@@ -66,7 +66,7 @@ double UnitConverterSimple::calculateMin(size_t i_axis, Axes::Units units_type)
 
 double UnitConverterSimple::calculateMax(size_t i_axis, Axes::Units units_type) const
 {
-    checkIndex(i_axis);
+    ASSERT(i_axis < dimension());
     units_type = substituteDefaultUnits(units_type);
     const auto& axis_data = m_axis_data_table[i_axis];
     if (units_type == Axes::Units::NBINS)
@@ -76,7 +76,7 @@ double UnitConverterSimple::calculateMax(size_t i_axis, Axes::Units units_type)
 
 size_t UnitConverterSimple::axisSize(size_t i_axis) const
 {
-    checkIndex(i_axis);
+    ASSERT(i_axis < dimension());
     return m_axis_data_table[i_axis].nbins;
 }
 

Device/Unit/IUnitConverter.cpp

@@ -42,14 +42,6 @@ IUnitConverter::createConvertedData(const OutputData<double>& data, Axes::Units
     return result;
 }
 
-void IUnitConverter::checkIndex(size_t i_axis) const
-{
-    if (i_axis < dimension())
-        return;
-    throw std::runtime_error("Error in IUnitConverter::checkIndex: passed axis index too big: "
-                             + std::to_string(static_cast<int>(i_axis)));
-}
-
 void IUnitConverter::throwUnitsError(std::string method, std::vector<Axes::Units> available) const
 {
     std::stringstream ss;

Device/Unit/IUnitConverter.h

@@ -66,7 +66,6 @@ public:
 #endif // SWIG
 
 protected:
-    void checkIndex(size_t i_axis) const;
 #ifndef SWIG
     [[noreturn]] void throwUnitsError(std::string method, std::vector<Axes::Units> available) const;
 #endif // SWIG