Merge branch 'dev' into comm

1 files changed, 14 insertions, 11 deletions

diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H
index 949173052..3341a8fe8 100644
--- a/Source/Particles/MultiParticleContainer.H
+++ b/Source/Particles/MultiParticleContainer.H
@@ -1,14 +1,15 @@
-
 #ifndef WARPX_ParticleContainer_H_
 #define WARPX_ParticleContainer_H_
 
-#include <AMReX_Particles.H>
+#include "ElementaryProcess.H"
+
 #include <WarpXParticleContainer.H>
 #include <PhysicalParticleContainer.H>
 #include <RigidInjectedParticleContainer.H>
 #include <PhotonParticleContainer.H>
 #include <LaserParticleContainer.H>
 
+#include <AMReX_Particles.H>
 #ifdef WARPX_QED
     #include <BreitWheelerEngineWrapper.H>
     #include <QuantumSyncEngineWrapper.H>
@@ -162,9 +163,9 @@ public:
 
     int nSpecies() const {return nspecies;}
 
-    int nSpeciesBoostedFrameDiags() const {return nspecies_boosted_frame_diags;}
-    int mapSpeciesBoostedFrameDiags(int i) const {return map_species_boosted_frame_diags[i];}
-    int doBoostedFrameDiags() const {return do_boosted_frame_diags;}
+    int nSpeciesBackTransformedDiagnostics() const {return nspecies_back_transformed_diagnostics;}
+    int mapSpeciesBackTransformedDiagnostics(int i) const {return map_species_back_transformed_diagnostics[i];}
+    int doBackTransformedDiagnostics() const {return do_back_transformed_diagnostics;}
 
     int nSpeciesDepositOnMainGrid () const {
         bool const onMainGrid = true;
@@ -196,6 +197,8 @@ public:
 
     PhysicalParticleContainer& GetPCtmp () { return *pc_tmp; }
 
+    IonizationProcess ionization_process;
+
 protected:
 
     // Particle container types
@@ -236,12 +239,12 @@ private:
     void mapSpeciesProduct ();
     int getSpeciesID (std::string product_str);
 
-    // Number of species dumped in BoostedFrameDiagnostics
-    int nspecies_boosted_frame_diags = 0;
-    // map_species_boosted_frame_diags[i] is the species ID in
-    // MultiParticleContainer for 0<i<nspecies_boosted_frame_diags
-    std::vector<int> map_species_boosted_frame_diags;
-    int do_boosted_frame_diags = 0;
+    // Number of species dumped in BackTransformedDiagnostics
+    int nspecies_back_transformed_diagnostics = 0;
+    // map_species_back_transformed_diagnostics[i] is the species ID in
+    // MultiParticleContainer for 0<i<nspecies_back_transformed_diagnostics
+    std::vector<int> map_species_back_transformed_diagnostics;
+    int do_back_transformed_diagnostics = 0;
 
     // runtime parameters
     int nlasers = 0;