From 23b28086d68fcede9e52187e8cae90e0cced4795 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 11 Oct 2024 16:14:53 -0700 Subject: [PATCH] Distributions: non-private members (#737) Distributions that are simple struct members, do not hide the properties. This makes access and manipulation from Python bindings easier and is needed to quickly read the properties for covariance matrix calculations. --- src/particles/distribution/Gaussian.H | 1 - src/particles/distribution/KVdist.H | 1 - src/particles/distribution/Kurth4D.H | 1 - src/particles/distribution/Kurth6D.H | 1 - src/particles/distribution/Semigaussian.H | 1 - src/particles/distribution/Thermal.H | 2 +- src/particles/distribution/Triangle.H | 2 +- src/particles/distribution/Waterbag.H | 7 +++---- 8 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/particles/distribution/Gaussian.H b/src/particles/distribution/Gaussian.H index 24397c0b0..4eca4394c 100644 --- a/src/particles/distribution/Gaussian.H +++ b/src/particles/distribution/Gaussian.H @@ -134,7 +134,6 @@ namespace impactx::distribution pt = a2; } - private: amrex::ParticleReal m_lambdaX, m_lambdaY, m_lambdaT; //! related position axis intercepts (length) of the phase space ellipse amrex::ParticleReal m_lambdaPx, m_lambdaPy, m_lambdaPt; //! related momentum axis intercepts of the phase space ellipse amrex::ParticleReal m_muxpx, m_muypy, m_mutpt; //! correlation length-momentum diff --git a/src/particles/distribution/KVdist.H b/src/particles/distribution/KVdist.H index 3554013eb..f40316ba5 100644 --- a/src/particles/distribution/KVdist.H +++ b/src/particles/distribution/KVdist.H @@ -147,7 +147,6 @@ namespace impactx::distribution pt = a2; } - private: amrex::ParticleReal m_lambdaX, m_lambdaY, m_lambdaT; //! related position axis intercepts (length) of the phase space ellipse amrex::ParticleReal m_lambdaPx, m_lambdaPy, m_lambdaPt; //! related momentum axis intercepts of the phase space ellipse amrex::ParticleReal m_muxpx, m_muypy, m_mutpt; //! correlation length-momentum diff --git a/src/particles/distribution/Kurth4D.H b/src/particles/distribution/Kurth4D.H index d5b40e2d7..2a9cd411e 100644 --- a/src/particles/distribution/Kurth4D.H +++ b/src/particles/distribution/Kurth4D.H @@ -157,7 +157,6 @@ namespace impactx::distribution pt = a2; } - private: amrex::ParticleReal m_lambdaX, m_lambdaY, m_lambdaT; //! related position axis intercepts (length) of the phase space ellipse amrex::ParticleReal m_lambdaPx, m_lambdaPy, m_lambdaPt; //! related momentum axis intercepts of the phase space ellipse amrex::ParticleReal m_muxpx, m_muypy, m_mutpt; //! correlation length-momentum diff --git a/src/particles/distribution/Kurth6D.H b/src/particles/distribution/Kurth6D.H index b0a1da425..2d51c3703 100644 --- a/src/particles/distribution/Kurth6D.H +++ b/src/particles/distribution/Kurth6D.H @@ -163,7 +163,6 @@ namespace impactx::distribution pt = a2; } - private: amrex::ParticleReal m_lambdaX, m_lambdaY, m_lambdaT; //! related position axis intercepts (length) of the phase space ellipse amrex::ParticleReal m_lambdaPx, m_lambdaPy, m_lambdaPt; //! related momentum axis intercepts of the phase space ellipse amrex::ParticleReal m_muxpx, m_muypy, m_mutpt; //! correlation length-momentum diff --git a/src/particles/distribution/Semigaussian.H b/src/particles/distribution/Semigaussian.H index f6c3deaa1..252c7a624 100644 --- a/src/particles/distribution/Semigaussian.H +++ b/src/particles/distribution/Semigaussian.H @@ -146,7 +146,6 @@ namespace impactx::distribution pt = a2; } - private: amrex::ParticleReal m_lambdaX, m_lambdaY, m_lambdaT; //! related position axis intercepts (length) of the phase space ellipse amrex::ParticleReal m_lambdaPx, m_lambdaPy, m_lambdaPt; //! related momentum axis intercepts of the phase space ellipse amrex::ParticleReal m_muxpx, m_muypy, m_mutpt; //! correlation length-momentum diff --git a/src/particles/distribution/Thermal.H b/src/particles/distribution/Thermal.H index 898f86a4a..c8cb1b631 100644 --- a/src/particles/distribution/Thermal.H +++ b/src/particles/distribution/Thermal.H @@ -420,7 +420,6 @@ namespace distribution pt = -pz * m_bg; } - private: amrex::ParticleReal m_k; //! linear focusing strength (1/meters) amrex::ParticleReal m_T1, m_T2; //! temperature of each particle population amrex::ParticleReal m_normalize, m_normalize_halo; //! normalization constant of first/second population @@ -431,6 +430,7 @@ namespace distribution amrex::ParticleReal m_bg; ///< reference value of relativistic beta*gamma amrex::ParticleReal m_w; ///< weight of the secondary (halo) population + private: // radial profile data amrex::ParticleReal const * m_cdf1 = nullptr; //! non-owning pointer to device core CDF amrex::ParticleReal const * m_cdf2 = nullptr; //! non-owning pointer to device halo CDF diff --git a/src/particles/distribution/Triangle.H b/src/particles/distribution/Triangle.H index 631dd5338..2f2368779 100644 --- a/src/particles/distribution/Triangle.H +++ b/src/particles/distribution/Triangle.H @@ -153,7 +153,7 @@ namespace impactx::distribution t = a1; pt = a2; } - private: + amrex::ParticleReal m_lambdaX, m_lambdaY, m_lambdaT; //! related position axis intercepts (length) of the phase space ellipse amrex::ParticleReal m_lambdaPx, m_lambdaPy, m_lambdaPt; //! related momentum axis intercepts of the phase space ellipse amrex::ParticleReal m_muxpx, m_muypy, m_mutpt; //! correlation length-momentum diff --git a/src/particles/distribution/Waterbag.H b/src/particles/distribution/Waterbag.H index 4f32fdd57..deed1e363 100644 --- a/src/particles/distribution/Waterbag.H +++ b/src/particles/distribution/Waterbag.H @@ -151,10 +151,9 @@ namespace impactx::distribution pt = a2; } - private: - amrex::ParticleReal m_lambdaX,m_lambdaY,m_lambdaT; //! related position axis intercepts (length) of the phase space ellipse - amrex::ParticleReal m_lambdaPx,m_lambdaPy,m_lambdaPt; //! related momentum axis intercepts of the phase space ellipse - amrex::ParticleReal m_muxpx,m_muypy,m_mutpt; //! correlation length-momentum + amrex::ParticleReal m_lambdaX, m_lambdaY, m_lambdaT; //! related position axis intercepts (length) of the phase space ellipse + amrex::ParticleReal m_lambdaPx, m_lambdaPy, m_lambdaPt; //! related momentum axis intercepts of the phase space ellipse + amrex::ParticleReal m_muxpx, m_muypy, m_mutpt; //! correlation length-momentum }; } // namespace impactx::distribution