diff --git a/Device/Beam/Beam.cpp b/Device/Beam/Beam.cpp index 40847f5a8204672d3b83206f0f880ab5ef0b6bbc..c36cf6f3f52e0e76b5b7cbfbf39ffaf435778cf2 100644 --- a/Device/Beam/Beam.cpp +++ b/Device/Beam/Beam.cpp @@ -53,7 +53,7 @@ Beam Beam::horizontalBeam() Beam::Beam(const Beam& other) : Beam(other.m_intensity, other.m_wavelength, other.direction()) { - m_bloch_vector = other.m_bloch_vector; + m_beamPolarization = other.m_beamPolarization; if (other.m_shape_factor) m_shape_factor.reset(other.m_shape_factor->clone()); } @@ -67,7 +67,7 @@ Beam& Beam::operator=(const Beam& other) // m_direction = other.m_direction; m_alpha = other.m_alpha; m_phi = other.m_phi; - m_bloch_vector = other.m_bloch_vector; + m_beamPolarization = other.m_beamPolarization; if (other.m_shape_factor) m_shape_factor.reset(other.m_shape_factor->clone()); else @@ -144,19 +144,19 @@ void Beam::setPolarization(const R3 bloch_vector) "Beam::setPolarization: " "The given Bloch vector cannot represent a real physical ensemble"); } - m_bloch_vector = bloch_vector; + m_beamPolarization = bloch_vector; } R3 Beam::getBlochVector() const { - return m_bloch_vector; + return m_beamPolarization; } SpinMatrix Beam::getPolarization() const { - double x = m_bloch_vector.x(); - double y = m_bloch_vector.y(); - double z = m_bloch_vector.z(); + double x = m_beamPolarization.x(); + double y = m_beamPolarization.y(); + double z = m_beamPolarization.z(); return {(1.0 + z) / 2.0, complex_t(x, -y) / 2.0, complex_t(x, y) / 2.0, (1.0 - z) / 2.0}; } diff --git a/Device/Beam/Beam.h b/Device/Beam/Beam.h index 5d7031a4e3040f5ab835fb4e6278e358507036da..9b4e72d197df2f5bd44a4cd75d20981a4d86fa03 100644 --- a/Device/Beam/Beam.h +++ b/Device/Beam/Beam.h @@ -83,7 +83,7 @@ private: double m_alpha; double m_phi; std::unique_ptr<IFootprintFactor> m_shape_factor; //!< footprint correction handler - R3 m_bloch_vector; //!< Bloch vector encoding the beam's polarization + R3 m_beamPolarization; //!< Bloch vector encoding the beam's polarization RealLimits m_alphaLimits;