diff --git a/Core/FormFactors/inc/FormFactorDecoratorMaterial.h b/Core/FormFactors/inc/FormFactorDecoratorMaterial.h
index c4fac8a5b1c61f051e87ac0a7423f73fc16e1dd4..db3cd3e3e85e9ab31a2307d18385cd9084cc0b77 100644
--- a/Core/FormFactors/inc/FormFactorDecoratorMaterial.h
+++ b/Core/FormFactors/inc/FormFactorDecoratorMaterial.h
@@ -35,6 +35,9 @@ public:
//! Sets the material of the scatterer
virtual void setMaterial(const IMaterial *p_material);
+ //! Sets the ambient material
+ virtual void setAmbientMaterial(const IMaterial *p_material);
+
//! Retrieves the refractive index of the ambient material
virtual complex_t getAmbientRefractiveIndex() const;
@@ -45,14 +48,12 @@ public:
Bin1D phi_f_bin) const;
#endif
- //! Sets the ambient material
- virtual void setAmbientMaterial(const IMaterial *p_material);
private:
complex_t getRefractiveIndexFactor() const;
complex_t m_wavevector_scattering_factor;
std::auto_ptr<IMaterial> mP_material;
- const IMaterial *mp_ambient_material;
+ std::auto_ptr<IMaterial> mP_ambient_material;
};
#endif /* FORMFACTORDECORATORMATERIAL_H_ */
diff --git a/Core/FormFactors/src/FormFactorDecoratorMaterial.cpp b/Core/FormFactors/src/FormFactorDecoratorMaterial.cpp
index 57d46807a7016ceb4074206209d5dcd8a42aa5e1..502d0e8fef327593076e9b5aa2ed7feb4914133e 100644
--- a/Core/FormFactors/src/FormFactorDecoratorMaterial.cpp
+++ b/Core/FormFactors/src/FormFactorDecoratorMaterial.cpp
@@ -20,7 +20,7 @@ FormFactorDecoratorMaterial::FormFactorDecoratorMaterial(
: FormFactorDecoratorFactor(p_form_factor, 1.0)
, m_wavevector_scattering_factor(wavevector_scattering_factor)
, mP_material(0)
-, mp_ambient_material(0)
+, mP_ambient_material(0)
{
setName("FormFactorDecoratorMaterial");
}
@@ -35,7 +35,7 @@ FormFactorDecoratorMaterial *FormFactorDecoratorMaterial::clone() const
new FormFactorDecoratorMaterial(mp_form_factor->clone(),
m_wavevector_scattering_factor);
result->setMaterial(mP_material.get());
- result->setAmbientMaterial(mp_ambient_material);
+ result->setAmbientMaterial(mP_ambient_material.get());
result->setName(getName());
return result;
}
@@ -48,10 +48,19 @@ void FormFactorDecoratorMaterial::setMaterial(const IMaterial* p_material)
m_factor = getRefractiveIndexFactor();
}
+void FormFactorDecoratorMaterial::setAmbientMaterial(
+ const IMaterial *p_material)
+{
+ if (p_material) {
+ mP_ambient_material.reset(p_material->clone());
+ }
+ m_factor = getRefractiveIndexFactor();
+}
+
complex_t FormFactorDecoratorMaterial::getAmbientRefractiveIndex() const
{
- if (mp_ambient_material) {
- return mp_ambient_material->getRefractiveIndex();
+ if (mP_ambient_material.get()) {
+ return mP_ambient_material->getRefractiveIndex();
}
return 1.0;
}
@@ -69,24 +78,15 @@ Eigen::Matrix2cd FormFactorDecoratorMaterial::evaluatePol(const cvector_t& k_i,
double k_mag2 = 4.0 * M_PI * m_wavevector_scattering_factor.real();
Eigen::Matrix2cd V_eff = m_wavevector_scattering_factor * time_reverse_conj
* (mP_material->getScatteringMatrix(k_mag2) -
- mp_ambient_material->getScatteringMatrix(k_mag2));
+ mP_ambient_material->getScatteringMatrix(k_mag2));
return mp_form_factor->evaluate(k_i, k_f_bin, alpha_f_bin) * V_eff;
}
-void FormFactorDecoratorMaterial::setAmbientMaterial(
- const IMaterial *p_material)
-{
- if (p_material) {
- mp_ambient_material = p_material;
- }
- m_factor = getRefractiveIndexFactor();
-}
-
complex_t FormFactorDecoratorMaterial::getRefractiveIndexFactor() const
{
- if (mP_material.get() && mp_ambient_material) {
+ if (mP_material.get() && mP_ambient_material.get()) {
complex_t particle_index = mP_material->getRefractiveIndex();
- complex_t ambient_index = mp_ambient_material->getRefractiveIndex();
+ complex_t ambient_index = mP_ambient_material->getRefractiveIndex();
return m_wavevector_scattering_factor *
(particle_index*particle_index - ambient_index*ambient_index);
}
diff --git a/Core/Samples/src/ParticleCoreShell.cpp b/Core/Samples/src/ParticleCoreShell.cpp
index f493d8bff6ef3303f7108e733b4115624c85c116..b15e0bd6e1c46af16d609280c3cc4b0de54f94ef 100644
--- a/Core/Samples/src/ParticleCoreShell.cpp
+++ b/Core/Samples/src/ParticleCoreShell.cpp
@@ -82,7 +82,7 @@ IFormFactor *ParticleCoreShell::createFormFactor(
getMaterial()->createTransformedMaterial(*mP_transform));
ff_core.setMaterial(transformed_material_core.get());
} else {
- ff_core.setMaterial(mp_shell->getMaterial());
+ ff_core.setMaterial(mp_core->getMaterial());
}
ff_core.setAmbientMaterial(mp_shell->getMaterial());
p_result->addFormFactor(ff_core, 1.0);
diff --git a/XCode_BornAgain.xcodeproj/project.pbxproj b/XCode_BornAgain.xcodeproj/project.pbxproj
index 65a608a622526fb85b0b601b4cad77218eccabc6..09653c3f1076e559e896b2a63476622424289542 100644
--- a/XCode_BornAgain.xcodeproj/project.pbxproj
+++ b/XCode_BornAgain.xcodeproj/project.pbxproj
@@ -136,6 +136,7 @@
625A174216BAAE77004943DB /* FormFactorFullSpheroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 625A173F16BAAE77004943DB /* FormFactorFullSpheroid.cpp */; };
625A174316BAAE77004943DB /* FormFactorHemiSpheroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 625A174016BAAE77004943DB /* FormFactorHemiSpheroid.cpp */; };
627200AF1848AA47001D55F3 /* PolarizedDWBAZeroMagBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 627200AD1848AA47001D55F3 /* PolarizedDWBAZeroMagBuilder.cpp */; };
+ 627200BE1848E1B7001D55F3 /* FormFactorCone6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 627200BD1848E1B7001D55F3 /* FormFactorCone6.cpp */; };
627C3032160B69D7004C1B11 /* libfftw3.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 627C3031160B69D7004C1B11 /* libfftw3.3.dylib */; };
627F5FFD1793EB26009E166F /* SamplePrintVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 627F5FFC1793EB26009E166F /* SamplePrintVisitor.cpp */; };
627F60001793EB68009E166F /* SpecularMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 627F5FFF1793EB68009E166F /* SpecularMatrix.cpp */; };
@@ -1716,6 +1717,8 @@
625A174016BAAE77004943DB /* FormFactorHemiSpheroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormFactorHemiSpheroid.cpp; sourceTree = "<group>"; };
627200AD1848AA47001D55F3 /* PolarizedDWBAZeroMagBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PolarizedDWBAZeroMagBuilder.cpp; sourceTree = "<group>"; };
627200AE1848AA47001D55F3 /* PolarizedDWBAZeroMagBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolarizedDWBAZeroMagBuilder.h; sourceTree = "<group>"; };
+ 627200BD1848E1B7001D55F3 /* FormFactorCone6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormFactorCone6.cpp; sourceTree = "<group>"; };
+ 627200BF1848E1C6001D55F3 /* FormFactorCone6.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormFactorCone6.h; sourceTree = "<group>"; };
627C3031160B69D7004C1B11 /* libfftw3.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfftw3.3.dylib; path = ../../../../../../opt/local/lib/libfftw3.3.dylib; sourceTree = "<group>"; };
627F5FFA1793EB17009E166F /* SamplePrintVisitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SamplePrintVisitor.h; sourceTree = "<group>"; };
627F5FFB1793EB17009E166F /* WinDllMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WinDllMacros.h; sourceTree = "<group>"; };
@@ -3231,40 +3234,41 @@
62222271160CB745008205AC /* inc */ = {
isa = PBXGroup;
children = (
- 62FF6A40183134EF00E62E45 /* FormFactorTetrahedron.h */,
- 62FD5BEB17F057D9007C0397 /* FormFactorTools.h */,
- 622F80CC17DE1EC50017FC52 /* FormFactorDecoratorMaterial.h */,
- 6223326017C640BC004CCDAE /* FormFactorDWBAPol.h */,
- 6223326117C640BC004CCDAE /* FormFactorDWBAPolConstZ.h */,
- 625A173B16BAAE69004943DB /* FormFactorCone.h */,
- 625A173C16BAAE69004943DB /* FormFactorFullSpheroid.h */,
- 625A173D16BAAE69004943DB /* FormFactorHemiSpheroid.h */,
621D0BEA16A9882900134391 /* FormFactorBox.h */,
- 621D0BEB16A9882900134391 /* FormFactorEllipsoid.h */,
- 621D0BEC16A9882900134391 /* FormFactorPrism6.h */,
- 621D0BED16A9882900134391 /* FormFactorSphere.h */,
- 6254C2601666651F0098EE7E /* IFormFactorBorn.h */,
- 6254C2611666651F0098EE7E /* IFormFactorBornSeparable.h */,
- 6254C2621666651F0098EE7E /* IFormFactorDecorator.h */,
- 6218B463161B2562007FFA5C /* FormFactorParallelepiped.h */,
+ 625A173B16BAAE69004943DB /* FormFactorCone.h */,
+ 627200BF1848E1C6001D55F3 /* FormFactorCone6.h */,
62222272160CB745008205AC /* FormFactorCrystal.h */,
62222273160CB745008205AC /* FormFactorCylinder.h */,
- 62222274160CB745008205AC /* FormFactorDWBA.h */,
- 62222275160CB745008205AC /* FormFactorDWBAConstZ.h */,
62222276160CB745008205AC /* FormFactorDecoratorDebyeWaller.h */,
62222277160CB745008205AC /* FormFactorDecoratorFactor.h */,
+ 622F80CC17DE1EC50017FC52 /* FormFactorDecoratorMaterial.h */,
62222278160CB745008205AC /* FormFactorDecoratorMultiPositionFactor.h */,
62222279160CB745008205AC /* FormFactorDecoratorPositionFactor.h */,
6222227B160CB745008205AC /* FormFactorDecoratorTransformation.h */,
+ 62222274160CB745008205AC /* FormFactorDWBA.h */,
+ 62222275160CB745008205AC /* FormFactorDWBAConstZ.h */,
+ 6223326017C640BC004CCDAE /* FormFactorDWBAPol.h */,
+ 6223326117C640BC004CCDAE /* FormFactorDWBAPolConstZ.h */,
+ 621D0BEB16A9882900134391 /* FormFactorEllipsoid.h */,
6222227C160CB745008205AC /* FormFactorFullSphere.h */,
+ 625A173C16BAAE69004943DB /* FormFactorFullSpheroid.h */,
6222227D160CB745008205AC /* FormFactorGauss.h */,
+ 625A173D16BAAE69004943DB /* FormFactorHemiSpheroid.h */,
6222227E160CB745008205AC /* FormFactorLorentz.h */,
+ 6218B463161B2562007FFA5C /* FormFactorParallelepiped.h */,
6222227F160CB745008205AC /* FormFactorPrism3.h */,
+ 621D0BEC16A9882900134391 /* FormFactorPrism6.h */,
62222280160CB745008205AC /* FormFactorPyramid.h */,
+ 62222283160CB745008205AC /* FormFactors.h */,
+ 621D0BED16A9882900134391 /* FormFactorSphere.h */,
62222281160CB745008205AC /* FormFactorSphereGaussianRadius.h */,
+ 62FF6A40183134EF00E62E45 /* FormFactorTetrahedron.h */,
+ 62FD5BEB17F057D9007C0397 /* FormFactorTools.h */,
62222282160CB745008205AC /* FormFactorWeighted.h */,
- 62222283160CB745008205AC /* FormFactors.h */,
62222284160CB745008205AC /* IFormFactor.h */,
+ 6254C2601666651F0098EE7E /* IFormFactorBorn.h */,
+ 6254C2611666651F0098EE7E /* IFormFactorBornSeparable.h */,
+ 6254C2621666651F0098EE7E /* IFormFactorDecorator.h */,
);
path = inc;
sourceTree = "<group>";
@@ -3272,33 +3276,34 @@
62222285160CB745008205AC /* src */ = {
isa = PBXGroup;
children = (
- 62FF6A4E1831351300E62E45 /* FormFactorTetrahedron.cpp */,
- 62FD5BF917F057E1007C0397 /* FormFactorTools.cpp */,
- 628D3C1017E0936400299D2E /* FormFactorDecoratorDebyeWaller.cpp */,
- 628D3C1117E0936400299D2E /* FormFactorDecoratorMultiPositionFactor.cpp */,
- 622F80DA17DE1ED20017FC52 /* FormFactorDecoratorMaterial.cpp */,
- 6223326317C640C7004CCDAE /* FormFactorDWBAPol.cpp */,
- 6223326417C640C7004CCDAE /* FormFactorDWBAPolConstZ.cpp */,
- 625A173E16BAAE77004943DB /* FormFactorCone.cpp */,
- 625A173F16BAAE77004943DB /* FormFactorFullSpheroid.cpp */,
- 625A174016BAAE77004943DB /* FormFactorHemiSpheroid.cpp */,
621D0BEE16A9883500134391 /* FormFactorBox.cpp */,
- 621D0BEF16A9883500134391 /* FormFactorEllipsoid.cpp */,
- 621D0BF016A9883500134391 /* FormFactorPrism6.cpp */,
- 621D0BF116A9883500134391 /* FormFactorSphere.cpp */,
- 6254C2641666652E0098EE7E /* IFormFactorBorn.cpp */,
- 6218B465161B2577007FFA5C /* FormFactorParallelepiped.cpp */,
+ 625A173E16BAAE77004943DB /* FormFactorCone.cpp */,
+ 627200BD1848E1B7001D55F3 /* FormFactorCone6.cpp */,
62222286160CB745008205AC /* FormFactorCrystal.cpp */,
62222287160CB745008205AC /* FormFactorCylinder.cpp */,
+ 628D3C1017E0936400299D2E /* FormFactorDecoratorDebyeWaller.cpp */,
+ 622F80DA17DE1ED20017FC52 /* FormFactorDecoratorMaterial.cpp */,
+ 628D3C1117E0936400299D2E /* FormFactorDecoratorMultiPositionFactor.cpp */,
+ 6222228A160CB745008205AC /* FormFactorDecoratorTransformation.cpp */,
62222288160CB745008205AC /* FormFactorDWBA.cpp */,
62222289160CB745008205AC /* FormFactorDWBAConstZ.cpp */,
- 6222228A160CB745008205AC /* FormFactorDecoratorTransformation.cpp */,
+ 6223326317C640C7004CCDAE /* FormFactorDWBAPol.cpp */,
+ 6223326417C640C7004CCDAE /* FormFactorDWBAPolConstZ.cpp */,
+ 621D0BEF16A9883500134391 /* FormFactorEllipsoid.cpp */,
6222228B160CB745008205AC /* FormFactorFullSphere.cpp */,
+ 625A173F16BAAE77004943DB /* FormFactorFullSpheroid.cpp */,
6222228C160CB745008205AC /* FormFactorGauss.cpp */,
+ 625A174016BAAE77004943DB /* FormFactorHemiSpheroid.cpp */,
6222228D160CB745008205AC /* FormFactorLorentz.cpp */,
+ 6218B465161B2577007FFA5C /* FormFactorParallelepiped.cpp */,
6222228E160CB745008205AC /* FormFactorPrism3.cpp */,
+ 621D0BF016A9883500134391 /* FormFactorPrism6.cpp */,
6222228F160CB745008205AC /* FormFactorPyramid.cpp */,
+ 621D0BF116A9883500134391 /* FormFactorSphere.cpp */,
+ 62FF6A4E1831351300E62E45 /* FormFactorTetrahedron.cpp */,
+ 62FD5BF917F057E1007C0397 /* FormFactorTools.cpp */,
62222290160CB745008205AC /* FormFactorWeighted.cpp */,
+ 6254C2641666652E0098EE7E /* IFormFactorBorn.cpp */,
);
path = src;
sourceTree = "<group>";
@@ -72311,6 +72316,7 @@
627F60FB1793FB22009E166F /* ParticleDecoration.pypp.cpp in Sources */,
627F60FC1793FB22009E166F /* ParticleInfo.pypp.cpp in Sources */,
627F60FD1793FB22009E166F /* PositionParticleInfo.pypp.cpp in Sources */,
+ 627200BE1848E1B7001D55F3 /* FormFactorCone6.cpp in Sources */,
627F60FF1793FB22009E166F /* PythonInterface_free_functions.pypp.cpp in Sources */,
627F61001793FB22009E166F /* PythonInterface_global_variables.pypp.cpp in Sources */,
627F61011793FB22009E166F /* PythonListConverter.cpp in Sources */,