From 2480af5cc0a79b4356a1698b11a09d13d41304d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Widera?= <r.widera@hzdr.de>
Date: Fri, 27 Sep 2024 11:11:18 +0200
Subject: [PATCH] fix MaxwellJuettner functor

The PR #5133 and #5142 got merged together with #4826.
Removed files and renamings for the unit systems collide therefore.
---
 .../particles/manipulators/unary/MaxwellJuettner.def      | 3 +--
 .../particles/manipulators/unary/MaxwellJuettner.hpp      | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/picongpu/particles/manipulators/unary/MaxwellJuettner.def b/include/picongpu/particles/manipulators/unary/MaxwellJuettner.def
index a404ba4ade..36a62aa502 100644
--- a/include/picongpu/particles/manipulators/unary/MaxwellJuettner.def
+++ b/include/picongpu/particles/manipulators/unary/MaxwellJuettner.def
@@ -20,8 +20,7 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
-
+#include "picongpu/defines.hpp"
 #include "picongpu/particles/manipulators/generic/FreeRng.def"
 #include "picongpu/particles/manipulators/unary/FreeTotalCellOffsetRng.def"
 
diff --git a/include/picongpu/particles/manipulators/unary/MaxwellJuettner.hpp b/include/picongpu/particles/manipulators/unary/MaxwellJuettner.hpp
index 5913907d5f..8d24f1106f 100644
--- a/include/picongpu/particles/manipulators/unary/MaxwellJuettner.hpp
+++ b/include/picongpu/particles/manipulators/unary/MaxwellJuettner.hpp
@@ -20,9 +20,9 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
-
+#include "picongpu/defines.hpp"
 #include "picongpu/particles/functor/User.hpp"
+#include "picongpu/traits/attribute/GetMass.hpp"
 
 namespace picongpu::particles::manipulators::unary::acc
 {
@@ -58,10 +58,10 @@ namespace picongpu::particles::manipulators::unary::acc
                 T_Particle& particle,
                 T_MaxwellJuettner temperatureKeV) const
             {
-                float_X const energy = (temperatureKeV * sim.si.conv.ev2Joule(1.0e3)) / sim.unit.energy();
+                float_X const energy = (temperatureKeV * sim.si.conv().eV2Joule(1.0e3)) / sim.unit.energy();
 
                 float_X const macroWeighting = particle[weighting_];
-                float_X const macroMass = attribute::getMass(macroWeighting, particle);
+                float_X const macroMass = picongpu::traits::attribute::getMass(macroWeighting, particle);
                 float_X const mass = macroMass / macroWeighting;
                 float_X const theta = energy / (mass * sim.pic.getSpeedOfLight() * sim.pic.getSpeedOfLight());