From 026aa3142e2d57fad14c21de1a7d2bcbaf78d791 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Thu, 24 Nov 2016 15:37:28 +0100
Subject: [PATCH] completely rm "using namespace BornAgain" from Core.
---
.../InterferenceFunction2DLattice.cpp | 18 +++++++++---------
.../InterferenceFunction2DParaCrystal.cpp | 18 ++++++++----------
.../InterferenceFunctionRadialParaCrystal.cpp | 12 +++++-------
.../HardParticle/FormFactorTruncatedSphere.cpp | 8 +++-----
Core/Instrument/RectangularDetector.h | 2 +-
Core/SoftParticle/FormFactorLorentz.cpp | 2 --
.../FormFactorSphereGaussianRadius.cpp | 4 +---
.../ParticleDistributionsBuilder.cpp | 8 +++-----
.../SizeDistributionModelsBuilder.cpp | 8 ++++----
9 files changed, 34 insertions(+), 46 deletions(-)
diff --git a/Core/Aggregate/InterferenceFunction2DLattice.cpp b/Core/Aggregate/InterferenceFunction2DLattice.cpp
index 90cc0153b20..89d55d367bd 100644
--- a/Core/Aggregate/InterferenceFunction2DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction2DLattice.cpp
@@ -25,8 +25,6 @@ GCC_DIAG_OFF(unused-parameter)
#include <boost/math/special_functions/round.hpp>
GCC_DIAG_ON(unused-parameter)
-using namespace BornAgain;
-
//! @param length_1 Lattice length 1
//! @param length_2 Lattice length 2
//! @param angle angle between lattice vectors
@@ -39,7 +37,7 @@ InterferenceFunction2DLattice::InterferenceFunction2DLattice(
m_lattice_params.m_length_2 = length_2;
m_lattice_params.m_angle = angle;
m_lattice_params.m_xi = xi;
- setName(InterferenceFunction2DLatticeType);
+ setName(BornAgain::InterferenceFunction2DLatticeType);
init_parameters();
initialize_rec_vectors();
}
@@ -170,20 +168,22 @@ void InterferenceFunction2DLattice::calculateReciprocalVectorFraction(
}
InterferenceFunction2DLattice::InterferenceFunction2DLattice(
- const Lattice2DParameters &lattice_params)
+ const Lattice2DParameters& lattice_params)
: m_lattice_params(lattice_params), mp_pdf(0), m_na(0), m_nb(0)
{
- setName(InterferenceFunction2DLatticeType);
+ setName(BornAgain::InterferenceFunction2DLatticeType);
init_parameters();
initialize_rec_vectors();
}
void InterferenceFunction2DLattice::init_parameters()
{
- registerParameter(LatticeLength1, &m_lattice_params.m_length_1).setUnit("nm").setPositive();
- registerParameter(LatticeLength2, &m_lattice_params.m_length_2).setUnit("nm").setPositive();
- registerParameter(Alpha, &m_lattice_params.m_angle).setUnit("rad");
- registerParameter(Xi, &m_lattice_params.m_xi ).setUnit("rad");
+ registerParameter(BornAgain::LatticeLength1,
+ &m_lattice_params.m_length_1).setUnit("nm").setPositive();
+ registerParameter(BornAgain::LatticeLength2,
+ &m_lattice_params.m_length_2).setUnit("nm").setPositive();
+ registerParameter(BornAgain::Alpha, &m_lattice_params.m_angle).setUnit("rad");
+ registerParameter(BornAgain::Xi, &m_lattice_params.m_xi ).setUnit("rad");
}
void InterferenceFunction2DLattice::initialize_rec_vectors()
diff --git a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
index 371df2bf830..6dccb1554e8 100644
--- a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
+++ b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
@@ -23,8 +23,6 @@
#include "RealParameter.h"
#include <limits>
-using namespace BornAgain;
-
//! @param length_1 Length of first lattice basis vector.
//! @param length_2 Length of second lattice basis vector.
//! @param alpha_lattice Angle between the lattice basis vectors.
@@ -44,7 +42,7 @@ InterferenceFunction2DParaCrystal::InterferenceFunction2DParaCrystal(
m_pdfs[1] = 0;
m_domain_sizes[0] = 0.0;
m_domain_sizes[1] = 0.0;
- setName(InterferenceFunction2DParaCrystalType);
+ setName(BornAgain::InterferenceFunction2DParaCrystalType);
if (m_damping_length==0.0)
m_use_damping_length = false;
init_parameters();
@@ -164,13 +162,13 @@ void InterferenceFunction2DParaCrystal::transformToPrincipalAxes(
void InterferenceFunction2DParaCrystal::init_parameters()
{
- registerParameter(LatticeLength1, &m_lattice_params.m_length_1).setUnit("nm");
- registerParameter(LatticeLength2, &m_lattice_params.m_length_2).setUnit("nm");
- registerParameter(LatticeAngle, &m_lattice_params.m_angle).setUnit("rad");
- registerParameter(Xi, &m_lattice_params.m_xi).setUnit("rad");
- registerParameter(DampingLength, &m_damping_length).setUnit("nm").setNonnegative();
- registerParameter(DomainSize1, &m_domain_sizes[0]).setUnit("nm").setNonnegative();
- registerParameter(DomainSize2, &m_domain_sizes[1]).setUnit("nm").setNonnegative();
+ registerParameter(BornAgain::LatticeLength1, &m_lattice_params.m_length_1).setUnit("nm");
+ registerParameter(BornAgain::LatticeLength2, &m_lattice_params.m_length_2).setUnit("nm");
+ registerParameter(BornAgain::LatticeAngle, &m_lattice_params.m_angle).setUnit("rad");
+ registerParameter(BornAgain::Xi, &m_lattice_params.m_xi).setUnit("rad");
+ registerParameter(BornAgain::DampingLength, &m_damping_length).setUnit("nm").setNonnegative();
+ registerParameter(BornAgain::DomainSize1, &m_domain_sizes[0]).setUnit("nm").setNonnegative();
+ registerParameter(BornAgain::DomainSize2, &m_domain_sizes[1]).setUnit("nm").setNonnegative();
}
//! Returns interference function for fixed angle xi.
diff --git a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
index aeaae8e8d91..961abcb6603 100644
--- a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
+++ b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
@@ -21,8 +21,6 @@
#include "RealParameter.h"
#include <limits>
-using namespace BornAgain;
-
InterferenceFunctionRadialParaCrystal::InterferenceFunctionRadialParaCrystal(
double peak_distance, double damping_length)
: m_peak_distance(peak_distance)
@@ -31,7 +29,7 @@ InterferenceFunctionRadialParaCrystal::InterferenceFunctionRadialParaCrystal(
, m_kappa(0.0)
, m_domain_size(0.0)
{
- setName(InterferenceFunctionRadialParaCrystalType);
+ setName(BornAgain::InterferenceFunctionRadialParaCrystalType);
if (m_damping_length==0.0)
m_use_damping_length = false;
init_parameters();
@@ -39,10 +37,10 @@ InterferenceFunctionRadialParaCrystal::InterferenceFunctionRadialParaCrystal(
void InterferenceFunctionRadialParaCrystal::init_parameters()
{
- registerParameter(PeakDistance, &m_peak_distance).setUnit("nm").setNonnegative();
- registerParameter(DampingLength, &m_damping_length).setUnit("nm").setNonnegative();
- registerParameter(SizeSpaceCoupling, &m_kappa).setNonnegative();
- registerParameter(DomainSize, &m_domain_size).setUnit("nm").setNonnegative();
+ registerParameter(BornAgain::PeakDistance, &m_peak_distance).setUnit("nm").setNonnegative();
+ registerParameter(BornAgain::DampingLength, &m_damping_length).setUnit("nm").setNonnegative();
+ registerParameter(BornAgain::SizeSpaceCoupling, &m_kappa).setNonnegative();
+ registerParameter(BornAgain::DomainSize, &m_domain_size).setUnit("nm").setNonnegative();
}
InterferenceFunctionRadialParaCrystal* InterferenceFunctionRadialParaCrystal::clone() const {
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.cpp b/Core/HardParticle/FormFactorTruncatedSphere.cpp
index 9937f791467..a82f17e3d80 100644
--- a/Core/HardParticle/FormFactorTruncatedSphere.cpp
+++ b/Core/HardParticle/FormFactorTruncatedSphere.cpp
@@ -22,15 +22,13 @@
#include "RealParameter.h"
#include <limits>
-using namespace BornAgain;
-
FormFactorTruncatedSphere::FormFactorTruncatedSphere(double radius, double height)
: m_radius(radius), m_height(height)
{
- setName(FFTruncatedSphereType);
+ setName(BornAgain::FFTruncatedSphereType);
check_initialization();
- registerParameter(Radius, &m_radius).setUnit("nm").setNonnegative();
- registerParameter(Height, &m_height).setUnit("nm").setNonnegative();
+ registerParameter(BornAgain::Radius, &m_radius).setUnit("nm").setNonnegative();
+ registerParameter(BornAgain::Height, &m_height).setUnit("nm").setNonnegative();
mP_integrator = make_integrator_complex(this, &FormFactorTruncatedSphere::Integrand);
}
diff --git a/Core/Instrument/RectangularDetector.h b/Core/Instrument/RectangularDetector.h
index 30f5180b44b..a64b75ea6c4 100644
--- a/Core/Instrument/RectangularDetector.h
+++ b/Core/Instrument/RectangularDetector.h
@@ -3,7 +3,7 @@
// BornAgain: simulate and fit scattering at grazing incidence
//
//! @file Core/Instrument/RectangularDetector.h
-//! @brief Defines class RectangularDetector.
+//! Defines class RectangularDetector.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/SoftParticle/FormFactorLorentz.cpp b/Core/SoftParticle/FormFactorLorentz.cpp
index 7eb3cbbd203..f41e2d5cff7 100644
--- a/Core/SoftParticle/FormFactorLorentz.cpp
+++ b/Core/SoftParticle/FormFactorLorentz.cpp
@@ -19,8 +19,6 @@
#include "MathConstants.h"
#include "RealParameter.h"
-using namespace BornAgain;
-
FormFactorLorentz::FormFactorLorentz(double width, double height)
{
m_width = width;
diff --git a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
index 3b54d77d243..c1767d0592c 100644
--- a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
+++ b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
@@ -18,14 +18,12 @@
#include "RealLimits.h"
#include "RealParameter.h"
-using namespace BornAgain;
-
FormFactorSphereGaussianRadius::FormFactorSphereGaussianRadius(double mean, double sigma)
: m_mean(mean)
, m_sigma(sigma)
, m_mean_r3(0.0)
{
- setName(FormFactorSphereGaussianRadiusType);
+ setName(BornAgain::FormFactorSphereGaussianRadiusType);
m_mean_r3 = calculateMeanR3();
P_ff_sphere.reset(new FormFactorFullSphere(m_mean_r3));
registerParameter(BornAgain::MeanRadius, &m_mean).setUnit("nm").setNonnegative();
diff --git a/Core/StandardSamples/ParticleDistributionsBuilder.cpp b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
index 21d1e428781..d77e9eb6800 100644
--- a/Core/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
@@ -27,8 +27,6 @@
#include "RealParameter.h"
#include "Units.h"
-using namespace BornAgain;
-
CylindersWithSizeDistributionBuilder::CylindersWithSizeDistributionBuilder()
: m_height(5*Units::nanometer)
, m_radius(5*Units::nanometer)
@@ -64,7 +62,7 @@ MultiLayer* CylindersWithSizeDistributionBuilder::buildSample() const
double n_sigma = 2.0*2.0*std::sqrt(2.0*std::log(2.0));
DistributionGaussian gauss(m_radius, sigma);
ParameterPattern pattern;
- pattern.add(ParticleType).add(FFCylinderType).add(Radius);
+ pattern.add(BornAgain::ParticleType).add(BornAgain::FFCylinderType).add(BornAgain::Radius);
ParameterDistribution par_distr(pattern.toStdString(), gauss, n_samples, n_sigma);
ParticleDistribution particle_collection(nano_particle, par_distr);
particle_layout.addParticle(particle_collection);
@@ -132,12 +130,12 @@ MultiLayer* TwoTypesCylindersDistributionBuilder::buildSample() const
// building distribution of nano particles
ParameterPattern pattern1;
- pattern1.add(ParticleType).add(FFCylinderType).add(Radius);
+ pattern1.add(BornAgain::ParticleType).add(BornAgain::FFCylinderType).add(BornAgain::Radius);
ParameterDistribution par_distr1(pattern1.toStdString(), gauss1, nbins, n_sigma);
ParticleDistribution particle_collection1(cylinder1, par_distr1);
particle_layout.addParticle(particle_collection1, 0.95);
ParameterPattern pattern2;
- pattern2.add(ParticleType).add(FFCylinderType).add(Radius);
+ pattern2.add(BornAgain::ParticleType).add(BornAgain::FFCylinderType).add(BornAgain::Radius);
ParameterDistribution par_distr2(pattern2.toStdString(), gauss2, nbins, n_sigma);
ParticleDistribution particle_collection2(cylinder2, par_distr2);
particle_layout.addParticle(particle_collection2, 0.05);
diff --git a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
index 3a6bd1ebf58..156f21e5297 100644
--- a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
+++ b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
@@ -28,8 +28,6 @@
#include "RealParameter.h"
#include "Units.h"
-using namespace BornAgain;
-
MultiLayer* SizeDistributionDAModelBuilder::buildSample() const
{
MultiLayer* multi_layer = new MultiLayer();
@@ -193,10 +191,12 @@ MultiLayer* CylindersInSSCABuilder::buildSample() const
DistributionGaussian gauss(5.0*Units::nanometer, 1.25*Units::nanometer);
ParameterPattern pattern_radius;
- pattern_radius.add(ParticleType).add(FFCylinderType).add(Radius);
+ pattern_radius.
+ add(BornAgain::ParticleType).add(BornAgain::FFCylinderType).add(BornAgain::Radius);
ParameterDistribution par_distr(pattern_radius.toStdString(), gauss, 30, 3.0);
ParameterPattern pattern_height;
- pattern_height.add(ParticleType).add(FFCylinderType).add(Height);
+ pattern_height.
+ add(BornAgain::ParticleType).add(BornAgain::FFCylinderType).add(BornAgain::Height);
par_distr.linkParameter(pattern_height.toStdString());
ParticleDistribution particle_collection(particle_prototype, par_distr);
particle_layout.addParticle(particle_collection);
--
GitLab