deb msgs

Sample/Scattering/DecoratedFF.cpp

@@ -14,9 +14,11 @@
 
 #include "Sample/Scattering/DecoratedFF.h"
 #include "Base/Vector/RotMatrix.h"
+#include "Base/Vector/WavevectorInfo.h" // debug
 #include "Sample/Material/Material.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Scattering/Rotations.h"
+#include <iostream>
 
 DecoratedFF::DecoratedFF(IDecoratableBorn* ff, const Material& material,
                          const Material& ambient_material, const R3* position,
@@ -66,10 +68,13 @@ void DecoratedFF::setRotMatrix(const RotMatrix& rotMatrix)
 
 complex_t DecoratedFF::theFF(const WavevectorInfo& wavevectors) const
 {
+    std::cout << "DEBUG DecoratedFF::theFF, q=" << wavevectors.getQ() << std::endl;
     complex_t result = m_ff->theFF(wavevectors);
+    std::cout << "-> sub   result = " << result << std::endl;
     if (m_material && m_ambient_material)
         result = (m_material->scalarSubtrSLD(wavevectors)
                   - m_ambient_material->scalarSubtrSLD(wavevectors)) * result;
+    std::cout << "-> final result = " << result << std::endl;
     return result;
 }
 

Sample/Scattering/FormFactorDecoratorPositionFactor.cpp

@@ -36,7 +36,12 @@ double FormFactorDecoratorPositionFactor::topZ(const IRotation* rotation) const
 
 complex_t FormFactorDecoratorPositionFactor::theFF(const WavevectorInfo& wavevectors) const
 {
-    return exp_I(m_position->dot(wavevectors.getQ())) * m_ff->theFF(wavevectors);
+    std::cout << "DEBUG FFDecPos::theFF, q=" << wavevectors.getQ() << std::endl;
+    complex_t result = m_ff->theFF(wavevectors);
+    std::cout << "-> sub   result = " << result << std::endl;
+    result *= exp_I(m_position->dot(wavevectors.getQ()));
+    std::cout << "-> final result = " << result << std::endl;
+    return result;
 }
 
 Eigen::Matrix2cd

Sample/Scattering/FormFactorDecoratorRotation.cpp

@@ -47,6 +47,9 @@ double FormFactorDecoratorRotation::topZ(const IRotation* rotation) const
 
 complex_t FormFactorDecoratorRotation::theFF(const WavevectorInfo& wavevectors) const
 {
+    std::cout << "DEBUG FFDecPos::theFF, q=" << wavevectors.getQ() << std::endl;
+    std::cout << "  transformed q=" << wavevectors.transformed(m_rotMatrix->getInverse()).getQ()
+         << std::endl;
     return m_ff->theFF(wavevectors.transformed(m_rotMatrix->getInverse()));
 }