From 6e92da33562ddd1178cf318a8f1b837aee4917f9 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Tue, 31 Jan 2023 15:31:26 +0100 Subject: [PATCH] uniformly 'ASSERT(false)' --- Base/Axis/Frame.cpp | 4 ++-- Base/Py/PyFmt.cpp | 2 +- Device/Coord/CoordSystem1D.cpp | 4 ++-- Device/Coord/CoordSystem2D.cpp | 20 +++++++++---------- Device/Detector/IDetector.cpp | 2 +- Device/Detector/RectangularDetector.cpp | 2 +- GUI/Model/Device/MaskUnitsConverter.cpp | 2 +- GUI/Model/FromCore/ItemizeSample.cpp | 2 +- GUI/Model/FromCore/ItemizeSimulation.cpp | 12 +++++------ GUI/Model/Job/FitParameterItem.cpp | 2 +- GUI/Model/Job/JobItem.cpp | 2 +- GUI/Model/Job/MinimizerItem.cpp | 2 +- GUI/Model/ToCore/SampleToCore.cpp | 2 +- GUI/Support/Data/SessionItemTags.cpp | 4 ++-- GUI/View/PlotUtil/DataPropertyWidget.cpp | 2 +- GUI/View/Realspace/RealspaceBuilder.cpp | 6 +++--- GUI/View/SampleView/RealspaceWidget.cpp | 2 +- Img3D/Build/BuilderUtils.cpp | 4 ++-- Param/Distrib/ParameterDistribution.cpp | 2 +- Resample/Processed/Slicer.cpp | 2 +- .../Aggregate/Interference2DSuperLattice.cpp | 2 +- Sample/Correlations/Profiles1D.cpp | 4 ++-- Sample/Correlations/Profiles2D.cpp | 4 ++-- Sample/Material/MaterialUtils.cpp | 4 ++-- Sim/Export/MaterialKeyHandler.cpp | 2 +- Sim/Export/PyFmt2.cpp | 2 +- Sim/Export/SampleToPython.cpp | 2 +- Sim/Export/SimulationToPython.cpp | 6 +++--- Sim/Simulation/DepthprobeSimulation.cpp | 2 +- Sim/Simulation/OffspecSimulation.cpp | 2 +- Sim/Simulation/ScatteringSimulation.cpp | 2 +- 31 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Base/Axis/Frame.cpp b/Base/Axis/Frame.cpp index 6bfff0e0740..38f86555934 100644 --- a/Base/Axis/Frame.cpp +++ b/Base/Axis/Frame.cpp @@ -62,9 +62,9 @@ size_t Frame::projectedIndex(size_t i_flat, size_t k_axis) const return (i_flat / m_axes[1]->size()) % m_axes[0]->size(); if (k_axis == 1) return i_flat % m_axes[1]->size(); - ASSERT(0); + ASSERT(false); } - ASSERT(0); + ASSERT(false); } size_t Frame::toGlobalIndex(const std::vector<unsigned>& axes_indices) const diff --git a/Base/Py/PyFmt.cpp b/Base/Py/PyFmt.cpp index 5c9f9749c39..0e99b823e32 100644 --- a/Base/Py/PyFmt.cpp +++ b/Base/Py/PyFmt.cpp @@ -128,7 +128,7 @@ std::string printValue(double value, const std::string& units) return printNm(value); if (units.empty()) return printDouble(value); - ASSERT(0); + ASSERT(false); } std::string printValue(std::variant<double, int> value, const std::string& units /*= ""*/) diff --git a/Device/Coord/CoordSystem1D.cpp b/Device/Coord/CoordSystem1D.cpp index 3a9dcbd5a51..ff9748d70d7 100644 --- a/Device/Coord/CoordSystem1D.cpp +++ b/Device/Coord/CoordSystem1D.cpp @@ -202,7 +202,7 @@ std::function<double(double)> AngularReflectometryCoords::getTraslatorTo(Coords case Coords::RQ4: return [wl = m_wavelength](double value) { return getQ(wl, value); }; default: - ASSERT(0); + ASSERT(false); } } @@ -258,6 +258,6 @@ std::function<double(double)> WavenumberReflectometryCoords::getTraslatorTo(Coor case Coords::RQ4: return [](double value) { return value; }; default: - ASSERT(0); + ASSERT(false); } } diff --git a/Device/Coord/CoordSystem2D.cpp b/Device/Coord/CoordSystem2D.cpp index c0d2f56e8ad..2a41daf78a9 100644 --- a/Device/Coord/CoordSystem2D.cpp +++ b/Device/Coord/CoordSystem2D.cpp @@ -32,7 +32,7 @@ double axisAngle(size_t i_axis, R3 kf) return -std::atan2(kf.y(), kf.x()); if (i_axis == 1) return M_PI_2 - atan2(kf.magxy(), kf.z()); - ASSERT(0); + ASSERT(false); } } // namespace @@ -149,11 +149,11 @@ double SphericalCoords::calculateValue(size_t i_axis, Coords units, double value static const R3 unit_v = (m_ki.cross(R3(0, 1, 0))).unit(); return (kf - m_ki).dot(unit_v); } - ASSERT(0); + ASSERT(false); return 0; } default: - ASSERT(0); + ASSERT(false); } } @@ -185,7 +185,7 @@ std::string SphericalCoords::nameOfAxis(size_t i_axis, const Coords units) const return "alpha_f [deg]"; } } - ASSERT(0); + ASSERT(false); } // ************************************************************************************************ @@ -251,7 +251,7 @@ double ImageCoords::calculateValue(size_t i_axis, Coords units, double value) co default: break; } - ASSERT(0); + ASSERT(false); } std::string ImageCoords::nameOfAxis(size_t i_axis, const Coords units) const @@ -286,7 +286,7 @@ std::string ImageCoords::nameOfAxis(size_t i_axis, const Coords units) const return "Qz [1/nm]"; } } - ASSERT(0); + ASSERT(false); } // ************************************************************************************************ @@ -316,7 +316,7 @@ double OffspecCoords::calculateValue(size_t, Coords units, double value) const case Coords::DEGREES: return Units::rad2deg(value); default: - ASSERT(0); + ASSERT(false); } } @@ -344,7 +344,7 @@ std::string OffspecCoords::nameOfAxis(size_t i_axis, const Coords units) const return "alpha_f [deg]"; } } - ASSERT(0); + ASSERT(false); } // ************************************************************************************************ @@ -381,7 +381,7 @@ double DepthprobeCoords::calculateValue(size_t i_axis, Coords units, double valu { const auto& available_units = availableUnits(); if (std::find(available_units.begin(), available_units.end(), units) == available_units.cend()) - ASSERT(0); + ASSERT(false); if (i_axis == 1) return value; // unit conversions are not applied to sample position axis @@ -419,5 +419,5 @@ std::string DepthprobeCoords::nameOfAxis(size_t i_axis, const Coords units) cons return "Position [nm]"; } } - ASSERT(0); + ASSERT(false); } diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp index 3f10829fb33..9e72a61ea84 100644 --- a/Device/Detector/IDetector.cpp +++ b/Device/Detector/IDetector.cpp @@ -95,7 +95,7 @@ size_t IDetector::axisBinIndex(size_t index, size_t selected_axis) const return remainder % m_axes[i_axis]->size(); remainder /= m_axes[i_axis]->size(); } - ASSERT(0); + ASSERT(false); } size_t IDetector::sizeOfExplicitRegionOfInterest() const diff --git a/Device/Detector/RectangularDetector.cpp b/Device/Detector/RectangularDetector.cpp index 3751663d5fe..08c9a015846 100644 --- a/Device/Detector/RectangularDetector.cpp +++ b/Device/Detector/RectangularDetector.cpp @@ -182,7 +182,7 @@ std::string RectangularDetector::nameOfAxis(size_t index) const case 1: return "v"; default: - ASSERT(0); + ASSERT(false); } } diff --git a/GUI/Model/Device/MaskUnitsConverter.cpp b/GUI/Model/Device/MaskUnitsConverter.cpp index 61a5ac20908..e9a3a0ac871 100644 --- a/GUI/Model/Device/MaskUnitsConverter.cpp +++ b/GUI/Model/Device/MaskUnitsConverter.cpp @@ -130,5 +130,5 @@ double MaskUnitsConverter::convert(double value, Axis axis) return FramUtil::coordinateToBinf(value, m_data->axis(axis_index)); if (m_direction == FROM_NBINS) return FramUtil::coordinateFromBinf(value, m_data->axis(axis_index)); - ASSERT(0); + ASSERT(false); } diff --git a/GUI/Model/FromCore/ItemizeSample.cpp b/GUI/Model/FromCore/ItemizeSample.cpp index 1ed9bd18f0c..c9cb63d14e5 100644 --- a/GUI/Model/FromCore/ItemizeSample.cpp +++ b/GUI/Model/FromCore/ItemizeSample.cpp @@ -549,7 +549,7 @@ MaterialItem* findMaterialItem(MaterialModel& matItems, const ISampleNode* node) result = matItems.addSLDMaterialItem(materialName, material_data.real(), material_data.imag()); } else - ASSERT(0); + ASSERT(false); result->setMagnetization(material->magnetization()); diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp index f3df395364d..720f0b2ec98 100644 --- a/GUI/Model/FromCore/ItemizeSimulation.cpp +++ b/GUI/Model/FromCore/ItemizeSimulation.cpp @@ -185,7 +185,7 @@ void setDistributionTypeAndPars(BeamDistributionItem* pdi, const IDistribution1D item->setMiddleWidth(factor * dd->getMiddleWidth()); item->setRightWidth(factor * dd->getRightWidth()); } else - ASSERT(0); + ASSERT(false); } void setDistribution(BeamDistributionItem* pdi, ParameterDistribution par_distr) @@ -245,7 +245,7 @@ void setGISASBeamItem(BeamItem* beam_item, const ScatteringSimulation& simulatio else if (pd.whichParameter() == ParameterDistribution::BeamAzimuthalAngle) setItemFromSample(beam_item->azimuthalAngleItem(), pd); else - ASSERT(0); + ASSERT(false); } } @@ -325,7 +325,7 @@ void setRectangularDetector(RectangularDetectorItem* detectorItem, detectorItem->setU0(detector.getU0()); detectorItem->setV0(detector.getV0()); } else - ASSERT(0); + ASSERT(false); } void setDetectorGeometry(Instrument2DItem* instrument_item, const IDetector& detector) @@ -337,7 +337,7 @@ void setDetectorGeometry(Instrument2DItem* instrument_item, const IDetector& det auto* item = instrument_item->setDetectorItemType<RectangularDetectorItem>(); setRectangularDetector(item, *det); } else - ASSERT(0); + ASSERT(false); } void setDetectorResolution(DetectorItem* detector_item, const IDetector& detector) @@ -360,7 +360,7 @@ void setDetectorResolution(DetectorItem* detector_item, const IDetector& detecto "Unknown detector resolution function"); } } else - ASSERT(0); + ASSERT(false); } void setPolarizer2(Instrument2DItem* instrument_item, const IDetector& detector) @@ -464,7 +464,7 @@ InstrumentModel* GUI::FromCore::itemizeInstruments(const ISimulation& simulation else if (const auto* spec_simulation = dynamic_cast<const SpecularSimulation*>(&simulation)) item = createSpecularInstrumentItem(*spec_simulation); else - ASSERT(0); + ASSERT(false); setBackground(item, simulation); diff --git a/GUI/Model/Job/FitParameterItem.cpp b/GUI/Model/Job/FitParameterItem.cpp index ea49ea45254..b462da46ed5 100644 --- a/GUI/Model/Job/FitParameterItem.cpp +++ b/GUI/Model/Job/FitParameterItem.cpp @@ -241,7 +241,7 @@ AttLimits FitParameterItem::attLimits() const return AttLimits::upperLimited(maximum()); if (isFree()) return AttLimits::limitless(); - ASSERT(0); + ASSERT(false); } bool FitParameterItem::isValid() const diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp index 7b5c77e3a4a..69ec987e1ed 100644 --- a/GUI/Model/Job/JobItem.cpp +++ b/GUI/Model/Job/JobItem.cpp @@ -302,7 +302,7 @@ DataItem* JobItem::createNewDataItem() else if (isIntensityJob()) dataItem = new IntensityDataItem(); else - ASSERT(0); + ASSERT(false); dataItem->setParentAndModel(this, model()); return dataItem; diff --git a/GUI/Model/Job/MinimizerItem.cpp b/GUI/Model/Job/MinimizerItem.cpp index 36b1975a761..e9b63d91686 100644 --- a/GUI/Model/Job/MinimizerItem.cpp +++ b/GUI/Model/Job/MinimizerItem.cpp @@ -203,7 +203,7 @@ MinimizerItem* MinimizerContainerItem::currentMinimizerItem() const return minimizerItemGSLLMA(); else - ASSERT(0); + ASSERT(false); return nullptr; } diff --git a/GUI/Model/ToCore/SampleToCore.cpp b/GUI/Model/ToCore/SampleToCore.cpp index 73657b7edbd..d98391b21a2 100644 --- a/GUI/Model/ToCore/SampleToCore.cpp +++ b/GUI/Model/ToCore/SampleToCore.cpp @@ -87,7 +87,7 @@ std::unique_ptr<ParticleLayout> buildParticleLayout(const ParticleLayoutItem& it layout->addParticle(*particle); continue; } - ASSERT(0); // case not implemented yet? + ASSERT(false); // case not implemented yet? } if (InterferenceItem* interferenceItem = item.interferenceSelection().currentItem()) diff --git a/GUI/Support/Data/SessionItemTags.cpp b/GUI/Support/Data/SessionItemTags.cpp index 3081b3bdf99..e34ee1ae05b 100644 --- a/GUI/Support/Data/SessionItemTags.cpp +++ b/GUI/Support/Data/SessionItemTags.cpp @@ -62,7 +62,7 @@ int SessionItemTags::tagStartIndex(const QString& tagName) const return index; index += tag.childCount; } - ASSERT(0); + ASSERT(false); } //! Returns index in SessionItem's m_children corresponding to given row in tagName. @@ -141,7 +141,7 @@ const SessionItemTags::TagInfo& SessionItemTags::tagInfo(const QString& tagName) for (const auto& tag : m_tags) if (tag.name == tagName) return tag; - ASSERT(0); + ASSERT(false); } bool SessionItemTags::maximumReached(const QString& tagName) const diff --git a/GUI/View/PlotUtil/DataPropertyWidget.cpp b/GUI/View/PlotUtil/DataPropertyWidget.cpp index 792929fae83..319118a8cd7 100644 --- a/GUI/View/PlotUtil/DataPropertyWidget.cpp +++ b/GUI/View/PlotUtil/DataPropertyWidget.cpp @@ -48,7 +48,7 @@ void DataPropertyWidget::updateItemCoords(DataItem* item) instrument = gProjectDocument.value()->instrumentModel()->findInstrumentItemById( realItem()->instrumentId()); } else - ASSERT(0); + ASSERT(false); if (instrument) { item->blockSignals(true); diff --git a/GUI/View/Realspace/RealspaceBuilder.cpp b/GUI/View/Realspace/RealspaceBuilder.cpp index e625db47750..690a40ea06c 100644 --- a/GUI/View/Realspace/RealspaceBuilder.cpp +++ b/GUI/View/Realspace/RealspaceBuilder.cpp @@ -61,7 +61,7 @@ std::vector<std::vector<double>> generatePositions(IInterference* const iff, dou if (auto* p = dynamic_cast<InterferenceRadialParacrystal*>(iff)) return RadialParacrystalPositionBuilder(p).generatePositions(layerSize, density); - ASSERT(0); + ASSERT(false); } double visualLayerThickness(const LayerItem& layerItem, const SceneGeometry& sceneGeometry) @@ -125,7 +125,7 @@ void RealspaceBuilder::populate(Model* model, Item3D* item, translateContainer(model, particlesFromItem(*p)); else - ASSERT(0); + ASSERT(false); } void RealspaceBuilder::populateSample(Model* model, const SampleItem& mlayerItem, @@ -226,7 +226,7 @@ RealspaceBuilder::particlesFromItem(const ItemWithParticles& particleItem, doubl total_abundance, origin); } else - ASSERT(0); + ASSERT(false); } void RealspaceBuilder::translateContainer(Model* model, diff --git a/GUI/View/SampleView/RealspaceWidget.cpp b/GUI/View/SampleView/RealspaceWidget.cpp index b14d1499bd1..1af4ca4fa1b 100644 --- a/GUI/View/SampleView/RealspaceWidget.cpp +++ b/GUI/View/SampleView/RealspaceWidget.cpp @@ -136,7 +136,7 @@ void RealspaceWidget::updateScene() } catch (const std::exception& ex) { m_cautionSign->setCautionMessage(ex.what()); } catch (...) { - ASSERT(0); // don't tolerate other exceptions + ASSERT(false); // don't tolerate other exceptions } m_canvas->setModel(m_realspaceModel.get()); diff --git a/Img3D/Build/BuilderUtils.cpp b/Img3D/Build/BuilderUtils.cpp index 2aad70e8339..516e555acf4 100644 --- a/Img3D/Build/BuilderUtils.cpp +++ b/Img3D/Build/BuilderUtils.cpp @@ -207,7 +207,7 @@ Img3D::BuilderUtils::particleComposition3DContainer(const Compound& particleComp } else if (const auto* p = dynamic_cast<const Particle*>(pc_particle)) particle3DContainer = singleParticle3DContainer(*p, 1.0, origin); else - ASSERT(0); + ASSERT(false); // keep result flat for (size_t i = 0; i < particle3DContainer.containerSize(); ++i) { @@ -256,7 +256,7 @@ Particle3DContainer Img3D::BuilderUtils::mesocrystal3DContainer(Mesocrystal* con outBasis = singleParticle3DContainer(*p, 1.0, origin); } else - ASSERT(0); + ASSERT(false); Particle3DContainer result; diff --git a/Param/Distrib/ParameterDistribution.cpp b/Param/Distrib/ParameterDistribution.cpp index 8b5e3521fa9..1ecdb68544a 100644 --- a/Param/Distrib/ParameterDistribution.cpp +++ b/Param/Distrib/ParameterDistribution.cpp @@ -121,6 +121,6 @@ std::string ParameterDistribution::unitOfParameter() const case BeamInclinationAngle: return "rad"; default: - ASSERT(0); + ASSERT(false); } } diff --git a/Resample/Processed/Slicer.cpp b/Resample/Processed/Slicer.cpp index 2ce4993b160..2a685a652c7 100644 --- a/Resample/Processed/Slicer.cpp +++ b/Resample/Processed/Slicer.cpp @@ -302,5 +302,5 @@ OwningVector<IReParticle> Compute::Slicing::particlesInSlice(const IParticle* pa return result; } else - ASSERT(0); + ASSERT(false); } diff --git a/Sample/Aggregate/Interference2DSuperLattice.cpp b/Sample/Aggregate/Interference2DSuperLattice.cpp index e3ca3d9d65e..5398da29c6e 100644 --- a/Sample/Aggregate/Interference2DSuperLattice.cpp +++ b/Sample/Aggregate/Interference2DSuperLattice.cpp @@ -99,7 +99,7 @@ std::vector<const INode*> Interference2DSuperLattice::nodeChildren() const double Interference2DSuperLattice::iff_without_dw(const R3) const { - ASSERT(0); + ASSERT(false); } double Interference2DSuperLattice::iff_without_dw(const R3 q, double xi) const diff --git a/Sample/Correlations/Profiles1D.cpp b/Sample/Correlations/Profiles1D.cpp index 192db810c52..65d1f45eccc 100644 --- a/Sample/Correlations/Profiles1D.cpp +++ b/Sample/Correlations/Profiles1D.cpp @@ -163,7 +163,7 @@ double Profile1DGate::standardizedFT(double q) const double Profile1DGate::decayFT(double) const { - ASSERT(0); // not yet needed, not yet implemented + ASSERT(false); // not yet needed, not yet implemented } double Profile1DGate::qSecondDerivative() const @@ -248,7 +248,7 @@ double Profile1DCosine::standardizedFT(double q) const double Profile1DCosine::decayFT(double) const { - ASSERT(0); // not yet needed, not yet implemented + ASSERT(false); // not yet needed, not yet implemented } double Profile1DCosine::qSecondDerivative() const diff --git a/Sample/Correlations/Profiles2D.cpp b/Sample/Correlations/Profiles2D.cpp index e6696a10db4..abceee81f12 100644 --- a/Sample/Correlations/Profiles2D.cpp +++ b/Sample/Correlations/Profiles2D.cpp @@ -160,7 +160,7 @@ double Profile2DGate::standardizedFT2D(double qx, double qy) const double Profile2DGate::decayFT2D(double, double) const { - ASSERT(0); // not yet needed, not yet implemented + ASSERT(false); // not yet needed, not yet implemented } std::unique_ptr<IDistribution2DSampler> Profile2DGate::createSampler() const @@ -202,7 +202,7 @@ double Profile2DCone::standardizedFT2D(double qx, double qy) const double Profile2DCone::decayFT2D(double, double) const { - ASSERT(0); // not yet needed, not yet implemented + ASSERT(false); // not yet needed, not yet implemented } std::unique_ptr<IDistribution2DSampler> Profile2DCone::createSampler() const diff --git a/Sample/Material/MaterialUtils.cpp b/Sample/Material/MaterialUtils.cpp index 2096d698dbc..d17b820ef63 100644 --- a/Sample/Material/MaterialUtils.cpp +++ b/Sample/Material/MaterialUtils.cpp @@ -114,7 +114,7 @@ Material MaterialUtils::averagedMaterial(const std::string& name, } else if (type == MATERIAL_TYPES::MaterialBySLD) { avgeData += w * mat.materialData(); } else - ASSERT(0); + ASSERT(false); } if (type == MATERIAL_TYPES::RefractiveMaterial) { @@ -123,7 +123,7 @@ Material MaterialUtils::averagedMaterial(const std::string& name, } else if (type == MATERIAL_TYPES::MaterialBySLD) { return MaterialBySLD(name, avgeData.real(), avgeData.imag(), avgeMagn); } else - ASSERT(0); + ASSERT(false); } // Tested by Tests/Unit/Sim/Sample/MaterialTest.cpp diff --git a/Sim/Export/MaterialKeyHandler.cpp b/Sim/Export/MaterialKeyHandler.cpp index 798a5040586..f9b58330645 100644 --- a/Sim/Export/MaterialKeyHandler.cpp +++ b/Sim/Export/MaterialKeyHandler.cpp @@ -40,7 +40,7 @@ const std::string& MaterialKeyHandler::mat2key(const Material* mat) const for (const auto& it : m_Key2Mat) if (it.second == unique_mat) return it.first; - ASSERT(0); + ASSERT(false); } const std::map<const std::string, const Material*>& MaterialKeyHandler::materialMap() const diff --git a/Sim/Export/PyFmt2.cpp b/Sim/Export/PyFmt2.cpp index f8c5bab0475..1bf66a3dbc5 100644 --- a/Sim/Export/PyFmt2.cpp +++ b/Sim/Export/PyFmt2.cpp @@ -84,7 +84,7 @@ std::string representShape2D(const std::string& indent, const IShape2D* ishape, result << "ba.HorizontalLine(" << printValueFunc(shape->getYpos()) << "), " << Py::Fmt::printBool(mask_value) << ")\n"; } else - ASSERT(0); + ASSERT(false); return result.str(); } diff --git a/Sim/Export/SampleToPython.cpp b/Sim/Export/SampleToPython.cpp index afd204a1ab8..9a8a7cfaf16 100644 --- a/Sim/Export/SampleToPython.cpp +++ b/Sim/Export/SampleToPython.cpp @@ -272,7 +272,7 @@ std::string defineInterferences(const ComponentKeyHandler& objHandler) << Py::Fmt::printNm(lattice_hd->radius()) << ", " << Py::Fmt::printDouble(lattice_hd->density()) << ")\n"; } else - ASSERT(0); + ASSERT(false); if (s->positionVariance() > 0.0) { result << indent() << key << ".setPositionVariance(" diff --git a/Sim/Export/SimulationToPython.cpp b/Sim/Export/SimulationToPython.cpp index aa5b837c8e4..cbf82e30ef0 100644 --- a/Sim/Export/SimulationToPython.cpp +++ b/Sim/Export/SimulationToPython.cpp @@ -120,7 +120,7 @@ std::string defineQzScan(const QzScan& scan) result << indent() << "scan.setAbsoluteQResolution(distribution, " << scan.resolution_widths().at(0) << ")\n"; else - ASSERT(0); // vector resolution export not yet implemented + ASSERT(false); // vector resolution export not yet implemented } return result.str(); } @@ -151,7 +151,7 @@ std::string defineScan(const ISpecularScan* scan) return defineAlphaScan(*s); if (const auto* s = dynamic_cast<const QzScan*>(scan); s) return defineQzScan(*s); - ASSERT(0); + ASSERT(false); } std::string defineDetector(const IDetector& detector) @@ -443,7 +443,7 @@ std::string defineSimulate(const ISimulation* simulation) else if (const auto* spec = dynamic_cast<const SpecularSimulation*>(simulation)) result << defineSpecularSimulation(spec); else - ASSERT(0); + ASSERT(false); result << " return simulation\n\n\n"; return result.str(); diff --git a/Sim/Simulation/DepthprobeSimulation.cpp b/Sim/Simulation/DepthprobeSimulation.cpp index 4cafe8457c4..65f1427db08 100644 --- a/Sim/Simulation/DepthprobeSimulation.cpp +++ b/Sim/Simulation/DepthprobeSimulation.cpp @@ -116,7 +116,7 @@ void DepthprobeSimulation::initDistributionHandler() &distribution, [&](double d) { m_beam->setWavelength(d); }); break; default: - ASSERT(0); + ASSERT(false); } } } diff --git a/Sim/Simulation/OffspecSimulation.cpp b/Sim/Simulation/OffspecSimulation.cpp index a780cddcdaf..815b0834e10 100644 --- a/Sim/Simulation/OffspecSimulation.cpp +++ b/Sim/Simulation/OffspecSimulation.cpp @@ -140,7 +140,7 @@ void OffspecSimulation::initDistributionHandler() &distribution, [&](double d) { m_beam->setWavelength(d); }); break; default: - ASSERT(0); + ASSERT(false); } } } diff --git a/Sim/Simulation/ScatteringSimulation.cpp b/Sim/Simulation/ScatteringSimulation.cpp index cca1d010711..3d1195a65ae 100644 --- a/Sim/Simulation/ScatteringSimulation.cpp +++ b/Sim/Simulation/ScatteringSimulation.cpp @@ -100,7 +100,7 @@ void ScatteringSimulation::initDistributionHandler() &distribution, [&](double d) { m_beam->setWavelength(d); }); break; default: - ASSERT(0); + ASSERT(false); } } } -- GitLab