diff --git a/Base/Const/Units.h b/Base/Const/Units.h
index d3eaabc5b22caafc2b952b2a9add51acc7291e7d..e2e6f06779daf58e9c5ba6479db4ff827c1e9194 100644
--- a/Base/Const/Units.h
+++ b/Base/Const/Units.h
@@ -32,8 +32,8 @@ namespace Units {
// Length
static constexpr double nanometer = 1.; //!< Internal unit for lengths
static constexpr double angstrom = 1.e-1 * nanometer;
-static constexpr double micrometer = 1.e3 * nanometer;
-static constexpr double millimeter = 1.e6 * nanometer;
+static constexpr double micrometer = 1e3 * nanometer;
+static constexpr double millimeter = 1e6 * nanometer;
// Symbols for length
static constexpr double nm = nanometer;
diff --git a/Base/Py/PyFmt.cpp b/Base/Py/PyFmt.cpp
index 49f1abe5ae0e5d394661c74a75d31bc3e7901546..62ece028aae3fe5aaa1581683b685f77dae96137 100644
--- a/Base/Py/PyFmt.cpp
+++ b/Base/Py/PyFmt.cpp
@@ -92,7 +92,7 @@ std::string printNm2(double input)
return inter.str();
}
-// 1.000000e07 -> 1.0e07
+// 1.000000e7 -> 1.0e7
std::string printScientificDouble(double input)
{
std::ostringstream inter;
diff --git a/Examples/fit/specular/RealLifeReflectometryFitting.py b/Examples/fit/specular/RealLifeReflectometryFitting.py
index 429bfd467a5dc79d331a357aab50ca8182e03144..9f34368f3d18bab51a54f7cb88cf11a2ef4cefe5 100755
--- a/Examples/fit/specular/RealLifeReflectometryFitting.py
+++ b/Examples/fit/specular/RealLifeReflectometryFitting.py
@@ -288,7 +288,7 @@ if __name__ == '__main__':
get_real_data(data_fname)
fit_data = run_fitting()
ref_data = create_par_dict(
- 3.78271438e06, # beam intensity
+ 3.78271438e6, # beam intensity
9.58009763e-04, # beam-to-sample width ratio
2.30471294e-04, # beam angular divergence
0.58721753, # oxide concentration
diff --git a/Examples/scatter2d/ConstantBackground.py b/Examples/scatter2d/ConstantBackground.py
index 0850fb3d0aa0073174790e1bf930af13d374ab7f..c4dee8e64262827db5819f4a6c18456470a3091e 100755
--- a/Examples/scatter2d/ConstantBackground.py
+++ b/Examples/scatter2d/ConstantBackground.py
@@ -15,7 +15,7 @@ def get_simulation(sample):
beam = ba.InBeam(1e6, 0.1*nm, 0.2*deg)
detector = ba.SphericalDetector(bp.simargs['n'], 2*deg, 1*deg, 1*deg)
simulation = ba.ScatteringSimulation(beam, sample, detector)
- background = ba.ConstantBackground(1.0e03)
+ background = ba.ConstantBackground(1.0e3)
simulation.setBackground(background)
return simulation
diff --git a/GUI/Model/Device/BeamItems.cpp b/GUI/Model/Device/BeamItems.cpp
index 64b17a7bcceeaef1e5af9c7b34b17764ee320819..e2393d5e8ae38d5a10964469a8ce850e5a367c13 100644
--- a/GUI/Model/Device/BeamItems.cpp
+++ b/GUI/Model/Device/BeamItems.cpp
@@ -46,7 +46,7 @@ const QString ExpandFootprintGroupbox("ExpandFootprintGroupbox");
BeamItem::BeamItem()
{
- m_intensity.init("Intensity", "Beam intensity in neutrons (or gammas) per sec.", 1e08,
+ m_intensity.init("Intensity", "Beam intensity in neutrons (or gammas) per sec.", 1e8,
Unit::unitless, 3 /* decimals */, RealLimits::limited(0.0, 1e32),
"intensity");
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.cpp b/Sample/StandardSamples/FeNiBilayerBuilder.cpp
index d952923565f26e04f6713942ac737a39f991802a..548a52026cebfae26cea82d3c07f99036c367576 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.cpp
+++ b/Sample/StandardSamples/FeNiBilayerBuilder.cpp
@@ -36,7 +36,7 @@ class Options {
public:
int m_NBilayers = 4;
double m_angle = 0.;
- double m_magnetizationMagnitude = 1.e7;
+ double m_magnetizationMagnitude = 1e7;
double m_thicknessFe = 100. * Units::angstrom;
double m_thicknessNi = 40. * Units::angstrom;
double m_sigmaRoughness = 0.;
diff --git a/Tests/Unit/GUI/TestScientificSpinBox.cpp b/Tests/Unit/GUI/TestScientificSpinBox.cpp
index 13b10f1d26e3ddbec415158240caf47a612cb700..946c530de3c8759d380cf4b9222cffe478ecda3e 100644
--- a/Tests/Unit/GUI/TestScientificSpinBox.cpp
+++ b/Tests/Unit/GUI/TestScientificSpinBox.cpp
@@ -80,7 +80,7 @@ TEST(TestScientificSpinBox, testTextFromValue)
EXPECT_EQ("99.999", to_string(99.9994).toStdString());
EXPECT_EQ("100", to_string(99.9999).toStdString());
EXPECT_EQ("1.235e2", to_string(123.45).toStdString());
- EXPECT_EQ("1e4", to_string(1.e4).toStdString());
+ EXPECT_EQ("1e4", to_string(1e4).toStdString());
EXPECT_EQ("1.265e12", to_string(1.265e12).toStdString());
EXPECT_EQ("1.266e12", to_string(1.26555e12).toStdString());
diff --git a/Tests/Unit/Sample/MultiLayerTest.cpp b/Tests/Unit/Sample/MultiLayerTest.cpp
index cdf3b799478539dbcb34c356fd9670c1157e4fa9..f7a947ec7569793d4d801ab593f7935744e83276 100644
--- a/Tests/Unit/Sample/MultiLayerTest.cpp
+++ b/Tests/Unit/Sample/MultiLayerTest.cpp
@@ -158,7 +158,7 @@ TEST_F(MultiLayerTest, CloneWithRoughness)
LayerRoughness lr0(2.1, .3, 12.1);
LayerRoughness lr1(1.1, .3, 0.1);
- auto magnetization = R3{0., 1.e8, 0.};
+ auto magnetization = R3{0., 1e8, 0.};
auto magneticLayer =
Layer(RefractiveMaterial("iron", 2e-5, 8e-5, magnetization), 20 * Units::nm);
diff --git a/Tests/Unit/Sim/ObjectiveMetricTest.cpp b/Tests/Unit/Sim/ObjectiveMetricTest.cpp
index b062ce346110124a0018258fe7b0d61eb3a80781..7bc7ae1f08f7dcebbb459028434fb14e0071b496 100644
--- a/Tests/Unit/Sim/ObjectiveMetricTest.cpp
+++ b/Tests/Unit/Sim/ObjectiveMetricTest.cpp
@@ -128,8 +128,8 @@ TEST(ObjectiveMetricTest, PoissionLikeIllFormed)
TEST(ObjectiveMetricTest, LogWellFormed)
{
- std::vector<double> sim_data{1.0, 10.0, 1.e2, 1.e4};
- std::vector<double> exp_data{10.0, 1.0, 1.e3, 1.e5};
+ std::vector<double> sim_data{1.0, 10.0, 1e2, 1e4};
+ std::vector<double> exp_data{10.0, 1.0, 1e3, 1e5};
std::vector<double> uncertainties{0.1, 0.1, 0.5, 0.5};
std::vector<double> weight_factors{1.0, 1.0, 1.0, 2.0};
@@ -167,8 +167,8 @@ TEST(ObjectiveMetricTest, LogWellFormed)
TEST(ObjectiveMetricTest, LogIllFormed)
{
- std::vector<double> sim_data{1.0, 10.0, 1.e2, 1.e4};
- std::vector<double> exp_data{10.0, 1.0, 1.e3, 1.e5};
+ std::vector<double> sim_data{1.0, 10.0, 1e2, 1e4};
+ std::vector<double> exp_data{10.0, 1.0, 1e3, 1e5};
std::vector<double> uncertainties{0.1, 0.1, 0.5, 0.5};
std::vector<double> weight_factors{1.0, 1.0, 1.0, 2.0};