From db2ba4d58d565a8a4c9ab9ac245fc3426a2d13df Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Fri, 23 Aug 2013 11:48:08 +0200
Subject: [PATCH] Necessary fixes in indices and algorithms
---
App/src/IsGISAXSTools.cpp | 4 ++--
App/src/StandardSamples.cpp | 2 +-
Core/FormFactors/src/FormFactorDWBAPol.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/App/src/IsGISAXSTools.cpp b/App/src/IsGISAXSTools.cpp
index e53d6d7de1a..c4dd9e52c40 100644
--- a/App/src/IsGISAXSTools.cpp
+++ b/App/src/IsGISAXSTools.cpp
@@ -84,14 +84,14 @@ void IsGISAXSTools::drawLogOutputDataPol(
c1->cd(2); gPad->SetLogz();
gPad->SetRightMargin(0.12);
setMinimum(1.);
- copyElementsWithPosition(output, data, 1, 0);
+ copyElementsWithPosition(output, data, 0, 1);
drawOutputDataInPad(data, draw_options, histogram_title + ": + -");
// min - plus
c1->cd(3); gPad->SetLogz();
gPad->SetRightMargin(0.12);
setMinimum(1.);
- copyElementsWithPosition(output, data, 0, 1);
+ copyElementsWithPosition(output, data, 1, 0);
drawOutputDataInPad(data, draw_options, histogram_title + ": - +");
// min - min
diff --git a/App/src/StandardSamples.cpp b/App/src/StandardSamples.cpp
index a8217c34541..1a0f195b9be 100644
--- a/App/src/StandardSamples.cpp
+++ b/App/src/StandardSamples.cpp
@@ -1140,7 +1140,7 @@ ISample *StandardSamples::MultilayerSpecularMagneticTestCase()
return mySample;
}
-//! Multilayer specular magnetic testcase
+//! Polarized DWBA test case
ISample *StandardSamples::PolarizedDWBATestCase()
{
diff --git a/Core/FormFactors/src/FormFactorDWBAPol.cpp b/Core/FormFactors/src/FormFactorDWBAPol.cpp
index 0be00ad40be..b4e2883af5f 100644
--- a/Core/FormFactors/src/FormFactorDWBAPol.cpp
+++ b/Core/FormFactors/src/FormFactorDWBAPol.cpp
@@ -80,9 +80,9 @@ void FormFactorDWBAPol::calculateTerms(const cvector_t& k_i,
kf_1R.m_q_upper.setZ(-kf_1R.m_q_upper.z());
Bin1DCVector kf_1T = k_f1_bin;
Bin1DCVector kf_2R = k_f2_bin;
+ kf_2R.m_q_lower.setZ(-kf_2R.m_q_lower.z());
+ kf_2R.m_q_upper.setZ(-kf_2R.m_q_upper.z());
Bin1DCVector kf_2T = k_f2_bin;
- kf_2T.m_q_lower.setZ(-kf_2T.m_q_lower.z());
- kf_2T.m_q_upper.setZ(-kf_2T.m_q_upper.z());
// now each of the 16 matrix terms of the polarized DWBA is calculated:
// eigenmode 1 -> eigenmode 1: direct scattering
m_M11_S(0,0) = - out_coeff.T1min().adjoint() * V_eff * in_coeff.T1plus();
--
GitLab