From 7ccd0cf0c8eebf21b0e1a1d2d82cc8df19aa72b0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 7 Jul 2021 07:47:43 +0200
Subject: [PATCH] New directory Resample/Coherence
---
.../FormFactorCoherentSum.cpp => Coherence/FFSum.cpp} | 4 ++--
.../FormFactorCoherentSum.h => Coherence/FFSum.h} | 10 +++++-----
.../FFTerm.cpp} | 4 ++--
.../FormFactorCoherentPart.h => Coherence/FFTerm.h} | 8 ++++----
.../Interference/DecouplingApproximationStrategy.cpp | 2 +-
.../Interference/IInterferenceFunctionStrategy.cpp | 2 +-
Resample/Interference/SSCApproximationStrategy.cpp | 2 +-
Resample/Processed/ProcessedLayout.cpp | 2 +-
.../Core/Sample/FormFactorCoherentSumTest.cpp | 2 +-
9 files changed, 18 insertions(+), 18 deletions(-)
rename Resample/{Fresnel/FormFactorCoherentSum.cpp => Coherence/FFSum.cpp} (93%)
rename Resample/{Fresnel/FormFactorCoherentSum.h => Coherence/FFSum.h} (82%)
rename Resample/{Fresnel/FormFactorCoherentPart.cpp => Coherence/FFTerm.cpp} (95%)
rename Resample/{Fresnel/FormFactorCoherentPart.h => Coherence/FFTerm.h} (86%)
diff --git a/Resample/Fresnel/FormFactorCoherentSum.cpp b/Resample/Coherence/FFSum.cpp
similarity index 93%
rename from Resample/Fresnel/FormFactorCoherentSum.cpp
rename to Resample/Coherence/FFSum.cpp
index c7aec64163e..6b1b25fb9d0 100644
--- a/Resample/Fresnel/FormFactorCoherentSum.cpp
+++ b/Resample/Coherence/FFSum.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/Fresnel/FormFactorCoherentSum.cpp
+//! @file Resample/Coherence/FFSum.cpp
//! @brief Implements class FormFactorCoherentSum.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Resample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Coherence/FFSum.h"
FormFactorCoherentSum::FormFactorCoherentSum(double abundance,
const std::vector<FormFactorCoherentPart>& parts)
diff --git a/Resample/Fresnel/FormFactorCoherentSum.h b/Resample/Coherence/FFSum.h
similarity index 82%
rename from Resample/Fresnel/FormFactorCoherentSum.h
rename to Resample/Coherence/FFSum.h
index 1bafa19151e..9ed4cfa364a 100644
--- a/Resample/Fresnel/FormFactorCoherentSum.h
+++ b/Resample/Coherence/FFSum.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/Fresnel/FormFactorCoherentSum.h
+//! @file Resample/Coherence/FFSum.h
//! @brief Defines class FormFactorCoherentSum.
//!
//! @homepage http://www.bornagainproject.org
@@ -17,10 +17,10 @@
#endif
#ifndef USER_API
-#ifndef BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
-#define BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
+#ifndef BORNAGAIN_RESAMPLE_COHERENCE_FFSUM_H
+#define BORNAGAIN_RESAMPLE_COHERENCE_FFSUM_H
-#include "Resample/Fresnel/FormFactorCoherentPart.h"
+#include "Resample/Coherence/FFTerm.h"
#include <vector>
class SimulationElement;
@@ -47,5 +47,5 @@ private:
const std::vector<FormFactorCoherentPart> m_parts;
};
-#endif // BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
+#endif // BORNAGAIN_RESAMPLE_COHERENCE_FFSUM_H
#endif // USER_API
diff --git a/Resample/Fresnel/FormFactorCoherentPart.cpp b/Resample/Coherence/FFTerm.cpp
similarity index 95%
rename from Resample/Fresnel/FormFactorCoherentPart.cpp
rename to Resample/Coherence/FFTerm.cpp
index ace7a24d62f..23f8109b5c3 100644
--- a/Resample/Fresnel/FormFactorCoherentPart.cpp
+++ b/Resample/Coherence/FFTerm.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/Fresnel/FormFactorCoherentPart.cpp
+//! @file Resample/Coherence/FFTerm.cpp
//! @brief Implements class FormFactorCoherentPart.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Resample/Fresnel/FormFactorCoherentPart.h"
+#include "Resample/Coherence/FFTerm.h"
#include "Base/Pixel/SimulationElement.h"
#include "Base/Utils/Assert.h"
#include "Resample/FFCompute/IComputeFF.h"
diff --git a/Resample/Fresnel/FormFactorCoherentPart.h b/Resample/Coherence/FFTerm.h
similarity index 86%
rename from Resample/Fresnel/FormFactorCoherentPart.h
rename to Resample/Coherence/FFTerm.h
index 05b04ef7e02..eb1a23036df 100644
--- a/Resample/Fresnel/FormFactorCoherentPart.h
+++ b/Resample/Coherence/FFTerm.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/Fresnel/FormFactorCoherentPart.h
+//! @file Resample/Coherence/FFTerm.h
//! @brief Defines class FormFactorCoherentPart.
//!
//! @homepage http://www.bornagainproject.org
@@ -17,8 +17,8 @@
#endif
#ifndef USER_API
-#ifndef BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
-#define BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
+#ifndef BORNAGAIN_RESAMPLE_COHERENCE_FFTERM_H
+#define BORNAGAIN_RESAMPLE_COHERENCE_FFTERM_H
#include "Base/Types/Complex.h"
#include "Base/Vector/EigenCore.h"
@@ -50,5 +50,5 @@ private:
const size_t m_layer_index;
};
-#endif // BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
+#endif // BORNAGAIN_RESAMPLE_COHERENCE_FFTERM_H
#endif // USER_API
diff --git a/Resample/Interference/DecouplingApproximationStrategy.cpp b/Resample/Interference/DecouplingApproximationStrategy.cpp
index 84e88e97ac6..9c607fa1429 100644
--- a/Resample/Interference/DecouplingApproximationStrategy.cpp
+++ b/Resample/Interference/DecouplingApproximationStrategy.cpp
@@ -15,7 +15,7 @@
#include "Resample/Interference/DecouplingApproximationStrategy.h"
#include "Base/Math/Functions.h"
#include "Base/Pixel/SimulationElement.h"
-#include "Resample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Coherence/FFSum.h"
#include "Sample/Aggregate/InterferenceFunctionNone.h"
DecouplingApproximationStrategy::DecouplingApproximationStrategy(
diff --git a/Resample/Interference/IInterferenceFunctionStrategy.cpp b/Resample/Interference/IInterferenceFunctionStrategy.cpp
index 70d7ccf9366..be3136b7e26 100644
--- a/Resample/Interference/IInterferenceFunctionStrategy.cpp
+++ b/Resample/Interference/IInterferenceFunctionStrategy.cpp
@@ -16,7 +16,7 @@
#include "Base/Math/IntegratorMCMiser.h"
#include "Base/Pixel/SimulationElement.h"
#include "Base/Utils/Assert.h"
-#include "Resample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Coherence/FFSum.h"
IInterferenceFunctionStrategy::IInterferenceFunctionStrategy(
const std::vector<FormFactorCoherentSum>& weighted_formfactors,
diff --git a/Resample/Interference/SSCApproximationStrategy.cpp b/Resample/Interference/SSCApproximationStrategy.cpp
index 867fad2d4c9..3c6bbb49e46 100644
--- a/Resample/Interference/SSCApproximationStrategy.cpp
+++ b/Resample/Interference/SSCApproximationStrategy.cpp
@@ -14,7 +14,7 @@
#include "Resample/Interference/SSCApproximationStrategy.h"
#include "Base/Pixel/SimulationElement.h"
-#include "Resample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Coherence/FFSum.h"
#include "Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h"
SSCApproximationStrategy::SSCApproximationStrategy(
diff --git a/Resample/Processed/ProcessedLayout.cpp b/Resample/Processed/ProcessedLayout.cpp
index 84f6138a009..4e2a27cb9bf 100644
--- a/Resample/Processed/ProcessedLayout.cpp
+++ b/Resample/Processed/ProcessedLayout.cpp
@@ -17,7 +17,7 @@
#include "Resample/FFCompute/ComputeBAPol.h"
#include "Resample/FFCompute/ComputeDWBA.h"
#include "Resample/FFCompute/ComputeDWBAPol.h"
-#include "Resample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Coherence/FFSum.h"
#include "Resample/Slice/Slice.h"
#include "Resample/Slice/SliceStack.h"
#include "Resample/Slice/SlicedFormFactorList.h"
diff --git a/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp b/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
index 244ef027470..bd3c0d68bab 100644
--- a/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
+++ b/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
@@ -1,4 +1,4 @@
-#include "Resample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Coherence/FFSum.h"
#include "Resample/FFCompute/ComputeBA.h"
#include "Sample/HardParticle/FormFactorFullSphere.h"
#include "Tests/GTestWrapper/google_test.h"
--
GitLab