From 12b9c2d8d44115c22866ba0cfa0a19868309f571 Mon Sep 17 00:00:00 2001
From: Marina Ganeva <m.ganeva@fz-juelich.de>
Date: Fri, 7 Feb 2014 16:23:43 +0100
Subject: [PATCH] Prefactor for 1D distributions was corrected.
---
Core/Algorithms/src/FTDistributions.cpp | 2 +-
Core/Samples/src/InterferenceFunction1DLattice.cpp | 2 +-
Tests/UnitTests/TestCore/FTDistributionsTest.h | 4 ++--
Tests/UnitTests/TestCore/FormFactorTest.h | 1 -
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Core/Algorithms/src/FTDistributions.cpp b/Core/Algorithms/src/FTDistributions.cpp
index 51706bf9587..9e9eb36dbed 100644
--- a/Core/Algorithms/src/FTDistributions.cpp
+++ b/Core/Algorithms/src/FTDistributions.cpp
@@ -62,7 +62,7 @@ FTDistribution1DGauss* FTDistribution1DGauss::clone() const
double FTDistribution1DGauss::evaluate(double q) const
{
double sum_sq = q*q*m_omega*m_omega;
- return std::exp(-sum_sq/4.0);
+ return 0.5*std::exp(-sum_sq/4.0);
}
FTDistribution1DVoigt::FTDistribution1DVoigt(double omega, double eta)
diff --git a/Core/Samples/src/InterferenceFunction1DLattice.cpp b/Core/Samples/src/InterferenceFunction1DLattice.cpp
index 5d45a96af0c..fe6ed00382a 100644
--- a/Core/Samples/src/InterferenceFunction1DLattice.cpp
+++ b/Core/Samples/src/InterferenceFunction1DLattice.cpp
@@ -47,7 +47,7 @@ void InterferenceFunction1DLattice::setProbabilityDistribution(
mp_pdf = pdf.clone();
double omega = mp_pdf->getOmega();
// initialize_calc_factors(omega):
- m_prefactor = 2.0*M_PI*omega;
+ m_prefactor = M_PI*omega;
double qa_max = (m_lattice_params.m_length/(2*M_PI))*nmax/omega;
m_na = (int) (std::abs(qa_max) + 0.5);
}
diff --git a/Tests/UnitTests/TestCore/FTDistributionsTest.h b/Tests/UnitTests/TestCore/FTDistributionsTest.h
index 49537b58289..f97be1013e3 100644
--- a/Tests/UnitTests/TestCore/FTDistributionsTest.h
+++ b/Tests/UnitTests/TestCore/FTDistributionsTest.h
@@ -46,7 +46,7 @@ TEST_F(FTDistributionsTest, FTDistribution1DGaussConstructor)
IFTDistribution1D * iftd1D = new FTDistribution1DGauss(1.0);
EXPECT_EQ(1.0, iftd1D->getOmega());
EXPECT_EQ("1DDistributionGauss", iftd1D->getName());
- EXPECT_NEAR(2*0.4950249, iftd1D->evaluate(0.2),0.000001);
+ EXPECT_NEAR(0.4950249, iftd1D->evaluate(0.2),0.000001);
iftd1D->setOmega(3.0);
EXPECT_EQ(3.0, iftd1D->getOmega());
@@ -61,7 +61,7 @@ TEST_F(FTDistributionsTest, FTDistribution1DGaussClone)
EXPECT_EQ(-5.0, iftd1DClone->getOmega());
EXPECT_EQ("1DDistributionGauss", iftd1DClone->getName());
- EXPECT_NEAR(2*0.389400, iftd1DClone->evaluate(0.2),0.000001);
+ EXPECT_NEAR(0.389400, iftd1DClone->evaluate(0.2),0.000001);
delete iftd1D;
delete iftd1DClone;
diff --git a/Tests/UnitTests/TestCore/FormFactorTest.h b/Tests/UnitTests/TestCore/FormFactorTest.h
index caf2acd1bd9..6bfbe25a85f 100644
--- a/Tests/UnitTests/TestCore/FormFactorTest.h
+++ b/Tests/UnitTests/TestCore/FormFactorTest.h
@@ -553,7 +553,6 @@ TEST_F(FormFactorTest, InfLongBox)
{
double height = 15.;
double width = 100.0/M_PI;
- double volume = 2*M_PI*height*width;
FormFactorInfLongBox ilbox(width, height);
--
GitLab