Define "static" concrete action for those with unique name/description (

#1416)

* Define static concrete action for compile-time strings
* Improve string formatting
* Delete move and copy constructors because why not

src/celeritas/em/model/BetheHeitlerModel.cc

@@ -30,9 +30,9 @@ BetheHeitlerModel::BetheHeitlerModel(ActionId id,
                                      ParticleParams const& particles,
                                      SPConstImported data,
                                      bool enable_lpm)
-    : ConcreteAction(id,
-                     "conv-bethe-heitler",
-                     "interact by Bethe-Heitler gamma conversion")
+    : StaticConcreteAction(id,
+                           "conv-bethe-heitler",
+                           "interact by Bethe-Heitler gamma conversion")
     , imported_(data,
                 particles,
                 ImportProcessClass::conversion,

src/celeritas/em/model/BetheHeitlerModel.hh

@@ -21,7 +21,7 @@ namespace celeritas
 /*!
  * Set up and launch the Bethe-Heitler model interaction.
  */
-class BetheHeitlerModel final : public Model, public ConcreteAction
+class BetheHeitlerModel final : public Model, public StaticConcreteAction
 {
   public:
     //!@{

src/celeritas/em/model/BraggModel.cc

@@ -29,7 +29,8 @@ namespace celeritas
  * TODO: This model also applies to hadrons.
  */
 BraggModel::BraggModel(ActionId id, ParticleParams const& particles)
-    : ConcreteAction(id, "ioni-bragg", "interact by muon ionization (Bragg)")
+    : StaticConcreteAction(
+          id, "ioni-bragg", "interact by muon ionization (Bragg)")
 {
     CELER_EXPECT(id);
 

src/celeritas/em/model/BraggModel.hh

@@ -18,7 +18,7 @@ class ParticleParams;
 /*!
  * Set up and launch the Bragg ionization model interaction.
  */
-class BraggModel final : public Model, public ConcreteAction
+class BraggModel final : public Model, public StaticConcreteAction
 {
   public:
     // Construct from model ID and other necessary data

src/celeritas/em/model/CombinedBremModel.cc

@@ -38,10 +38,10 @@ CombinedBremModel::CombinedBremModel(ActionId id,
                                      SPConstImported data,
                                      ReadData sb_table,
                                      bool enable_lpm)
-    : ConcreteAction(id,
-                     "brems-combined",
-                     "interact by bremsstrahlung (combined SB/relativistic, "
-                     "e+/-)")
+    : StaticConcreteAction(
+          id,
+          "brems-combined",
+          R"(interact by bremsstrahlung (combined SB/relativistic, e+/-))")
 {
     CELER_EXPECT(id);
     CELER_EXPECT(sb_table);

src/celeritas/em/model/CombinedBremModel.hh

@@ -31,7 +31,7 @@ class ParticleParams;
  * Set up and launch a combined model of SeltzerBergerModel at the low energy
  * and RelativisticBremModel at the high energy for e+/e- Bremsstrahlung.
  */
-class CombinedBremModel final : public Model, public ConcreteAction
+class CombinedBremModel final : public Model, public StaticConcreteAction
 {
   public:
     //@{

src/celeritas/em/model/CoulombScatteringModel.cc

@@ -37,7 +37,7 @@ CoulombScatteringModel::CoulombScatteringModel(ActionId id,
                                                ParticleParams const& particles,
                                                MaterialParams const& materials,
                                                SPConstImported data)
-    : ConcreteAction(
+    : StaticConcreteAction(
           id, "coulomb-wentzel", "interact by Coulomb scattering (Wentzel)")
     , imported_(data,
                 particles,
@@ -50,10 +50,10 @@ CoulombScatteringModel::CoulombScatteringModel(ActionId id,
     data_.ids.electron = particles.find(pdg::electron());
     data_.ids.positron = particles.find(pdg::positron());
 
-    CELER_VALIDATE(data_.ids,
-                   << "missing electron and/or positron particles (required "
-                      "for "
-                   << this->description() << ")");
+    CELER_VALIDATE(
+        data_.ids,
+        << R"(missing electron and/or positron particles (required for )"
+        << this->description() << ")");
 
     // Get high/low energy limits
     energy_limit_

src/celeritas/em/model/CoulombScatteringModel.hh

@@ -24,7 +24,7 @@ class IsotopeView;
 /*!
  * Set up and launch the Wentzel Coulomb scattering model interaction.
  */
-class CoulombScatteringModel final : public Model, public ConcreteAction
+class CoulombScatteringModel final : public Model, public StaticConcreteAction
 {
   public:
     //!@{

src/celeritas/em/model/EPlusGGModel.cc

@@ -25,9 +25,10 @@ namespace celeritas
  * Construct from model ID and other necessary data.
  */
 EPlusGGModel::EPlusGGModel(ActionId id, ParticleParams const& particles)
-    : ConcreteAction(id,
-                     "annihil-2-gamma",
-                     "interact by positron annihilation yielding two gammas")
+    : StaticConcreteAction(
+          id,
+          "annihil-2-gamma",
+          R"(interact by positron annihilation yielding two gammas)")
 {
     CELER_EXPECT(id);
     data_.positron = particles.find(pdg::positron());

src/celeritas/em/model/EPlusGGModel.hh

@@ -19,7 +19,7 @@ namespace celeritas
 /*!
  * Set up and launch two-gamma positron annihiliation.
  */
-class EPlusGGModel final : public Model, public ConcreteAction
+class EPlusGGModel final : public Model, public StaticConcreteAction
 {
   public:
     // Construct from model ID and other necessary data

src/celeritas/em/model/ICRU73QOModel.cc

@@ -29,8 +29,8 @@ namespace celeritas
  * TODO: This model also applies to hadrons.
  */
 ICRU73QOModel::ICRU73QOModel(ActionId id, ParticleParams const& particles)
-    : ConcreteAction(
-        id, "ioni-icru73qo", "interact by muon ionization (ICRU73QO)")
+    : StaticConcreteAction(
+          id, "ioni-icru73qo", "interact by muon ionization (ICRU73QO)")
 {
     CELER_EXPECT(id);
 

src/celeritas/em/model/ICRU73QOModel.hh

@@ -18,7 +18,7 @@ class ParticleParams;
 /*!
  * Set up and launch the ICRU73QO ionization model interaction.
  */
-class ICRU73QOModel final : public Model, public ConcreteAction
+class ICRU73QOModel final : public Model, public StaticConcreteAction
 {
   public:
     // Construct from model ID and other necessary data

src/celeritas/em/model/KleinNishinaModel.cc

@@ -25,17 +25,17 @@ namespace celeritas
  */
 KleinNishinaModel::KleinNishinaModel(ActionId id,
                                      ParticleParams const& particles)
-    : ConcreteAction(id,
-                     "scat-klein-nishina",
-                     "interact by Compton scattering (simple Klein-Nishina)")
+    : StaticConcreteAction(
+          id,
+          "scat-klein-nishina",
+          R"(interact by Compton scattering (simple Klein-Nishina))")
 {
     CELER_EXPECT(id);
     data_.ids.electron = particles.find(pdg::electron());
     data_.ids.gamma = particles.find(pdg::gamma());
 
     CELER_VALIDATE(data_.ids.electron && data_.ids.gamma,
-                   << "missing electron, positron and/or gamma particles "
-                      "(required for "
+                   << R"(missing electron and/or gamma particles (required for )"
                    << this->description() << ")");
     data_.inv_electron_mass = 1
                               / value_as<KleinNishinaData::Mass>(

src/celeritas/em/model/KleinNishinaModel.hh

@@ -17,7 +17,7 @@ namespace celeritas
 /*!
  * Set up and launch the Klein-Nishina model interaction.
  */
-class KleinNishinaModel final : public Model, public ConcreteAction
+class KleinNishinaModel final : public Model, public StaticConcreteAction
 {
   public:
     // Construct from model ID and other necessary data

src/celeritas/em/model/LivermorePEModel.cc

@@ -41,7 +41,7 @@ LivermorePEModel::LivermorePEModel(ActionId id,
                                    ParticleParams const& particles,
                                    MaterialParams const& materials,
                                    ReadData load_data)
-    : ConcreteAction(
+    : StaticConcreteAction(
           id, "photoel-livermore", "interact by Livermore photoelectric effect")
 {
     CELER_EXPECT(id);
@@ -53,8 +53,7 @@ LivermorePEModel::LivermorePEModel(ActionId id,
     host_data.ids.electron = particles.find(pdg::electron());
     host_data.ids.gamma = particles.find(pdg::gamma());
     CELER_VALIDATE(host_data.ids,
-                   << "missing electron and/or gamma particles "
-                      "(required for "
+                   << R"(missing electron and/or gamma particles (required for )"
                    << this->description() << ")");
 
     // Save particle properties

src/celeritas/em/model/LivermorePEModel.hh

@@ -25,7 +25,7 @@ class ParticleParams;
 /*!
  * Set up and launch the Livermore photoelectric model interaction.
  */
-class LivermorePEModel final : public Model, public ConcreteAction
+class LivermorePEModel final : public Model, public StaticConcreteAction
 {
   public:
     //!@{

src/celeritas/em/model/MollerBhabhaModel.cc

@@ -27,17 +27,17 @@ namespace celeritas
  */
 MollerBhabhaModel::MollerBhabhaModel(ActionId id,
                                      ParticleParams const& particles)
-    : ConcreteAction(
+    : StaticConcreteAction(
           id, "ioni-moller-bhabha", "interact by Moller+Bhabha ionization")
 {
     CELER_EXPECT(id);
     data_.ids.electron = particles.find(pdg::electron());
     data_.ids.positron = particles.find(pdg::positron());
 
-    CELER_VALIDATE(data_.ids.electron && data_.ids.positron,
-                   << "missing electron and/or positron particles "
-                      "(required for "
-                   << this->description() << ")");
+    CELER_VALIDATE(
+        data_.ids.electron && data_.ids.positron,
+        << R"(missing electron and/or positron particles (required for )"
+        << this->description() << ")");
 
     data_.electron_mass = particles.get(data_.ids.electron).mass();
 

src/celeritas/em/model/MollerBhabhaModel.hh

@@ -18,7 +18,7 @@ class ParticleParams;
 /*!
  * Set up and launch the Moller-Bhabha model interaction.
  */
-class MollerBhabhaModel final : public Model, public ConcreteAction
+class MollerBhabhaModel final : public Model, public StaticConcreteAction
 {
   public:
     // Construct from model ID and other necessary data

src/celeritas/em/model/MuBetheBlochModel.cc

@@ -28,9 +28,9 @@ namespace celeritas
  */
 MuBetheBlochModel::MuBetheBlochModel(ActionId id,
                                      ParticleParams const& particles)
-    : ConcreteAction(id,
-                     "ioni-mu-bethe-bloch",
-                     "interact by muon ionization (Bethe-Bloch)")
+    : StaticConcreteAction(id,
+                           "ioni-mu-bethe-bloch",
+                           "interact by muon ionization (Bethe-Bloch)")
 {
     CELER_EXPECT(id);
     data_.electron = particles.find(pdg::electron());

src/celeritas/em/model/MuBetheBlochModel.hh

@@ -18,7 +18,7 @@ class ParticleParams;
 /*!
  * Set up and launch the Bethe-Bloch muon ionization model interaction.
  */
-class MuBetheBlochModel final : public Model, public ConcreteAction
+class MuBetheBlochModel final : public Model, public StaticConcreteAction
 {
   public:
     // Construct from model ID and other necessary data

src/celeritas/em/model/MuBremsstrahlungModel.cc

@@ -29,7 +29,8 @@ namespace celeritas
 MuBremsstrahlungModel::MuBremsstrahlungModel(ActionId id,
                                              ParticleParams const& particles,
                                              SPConstImported data)
-    : ConcreteAction(id, "brems-muon", "interact by bremsstrahlung (muon)")
+    : StaticConcreteAction(
+          id, "brems-muon", "interact by bremsstrahlung (muon)")
     , imported_(data,
                 particles,
                 ImportProcessClass::mu_brems,

src/celeritas/em/model/MuBremsstrahlungModel.hh

@@ -21,7 +21,7 @@ namespace celeritas
 /*!
  * Set up and launch the Muon Bremsstrahlung model interaction.
  */
-class MuBremsstrahlungModel final : public Model, public ConcreteAction
+class MuBremsstrahlungModel final : public Model, public StaticConcreteAction
 {
   public:
     //!@{

src/celeritas/em/model/RayleighModel.cc

@@ -34,7 +34,8 @@ RayleighModel::RayleighModel(ActionId id,
                              ParticleParams const& particles,
                              MaterialParams const& materials,
                              SPConstImported data)
-    : ConcreteAction(id, "scat-rayleigh", "interact by Rayleigh scattering")
+    : StaticConcreteAction(
+          id, "scat-rayleigh", "interact by Rayleigh scattering")
     , imported_(data,
                 particles,
                 ImportProcessClass::rayleigh,

src/celeritas/em/model/RayleighModel.hh

@@ -25,7 +25,7 @@ class ParticleParams;
 /*!
  * Set up and launch Rayleigh scattering.
  */
-class RayleighModel final : public Model, public ConcreteAction
+class RayleighModel final : public Model, public StaticConcreteAction
 {
   public:
     //@{

src/celeritas/em/model/RelativisticBremModel.cc

@@ -39,7 +39,8 @@ RelativisticBremModel::RelativisticBremModel(ActionId id,
                                              MaterialParams const& materials,
                                              SPConstImported data,
                                              bool enable_lpm)
-    : ConcreteAction(id, "brems-rel", "interact by relativistic bremsstrahlung")
+    : StaticConcreteAction(
+          id, "brems-rel", "interact by relativistic bremsstrahlung")
     , imported_(data,
                 particles,
                 ImportProcessClass::e_brems,
@@ -55,7 +56,7 @@ RelativisticBremModel::RelativisticBremModel(ActionId id,
     host_ref.ids.gamma = particles.find(pdg::gamma());
 
     CELER_VALIDATE(host_ref.ids,
-                   << "missing IDs (required for " << this->description()
+                   << "missing particles (required for " << this->description()
                    << ")");
 
     // Save particle properties

src/celeritas/em/model/RelativisticBremModel.hh

@@ -27,7 +27,7 @@ class ParticleParams;
  * Set up and launch the relativistic Bremsstrahlung model for high-energy
  * electrons and positrons with the Landau-Pomeranchuk-Migdal (LPM) effect
  */
-class RelativisticBremModel final : public Model, public ConcreteAction
+class RelativisticBremModel final : public Model, public StaticConcreteAction
 {
   public:
     //@{

src/celeritas/em/model/SeltzerBergerModel.cc

@@ -44,7 +44,7 @@ SeltzerBergerModel::SeltzerBergerModel(ActionId id,
                                        MaterialParams const& materials,
                                        SPConstImported data,
                                        ReadData load_sb_table)
-    : ConcreteAction(
+    : StaticConcreteAction(
           id, "brems-sb", "interact by Seltzer-Berger bremsstrahlung")
     , imported_(data,
                 particles,
@@ -64,9 +64,8 @@ SeltzerBergerModel::SeltzerBergerModel(ActionId id,
     host_data.ids.positron = particles.find(pdg::positron());
     host_data.ids.gamma = particles.find(pdg::gamma());
     CELER_VALIDATE(host_data.ids,
-                   << "missing electron, positron, and/or gamma particles "
-                      "(required for "
-                   << this->description() << ")");
+                   << "missing particles (required for " << this->description()
+                   << ")");
 
     // Save particle properties
     host_data.electron_mass = particles.get(host_data.ids.electron).mass();

src/celeritas/em/model/SeltzerBergerModel.hh

@@ -46,7 +46,7 @@ class ParticleParams;
  * screened nuclei and orbital electrons of neutral atoms with Z = 1–100", At.
  * Data Nucl. Data Tables 35, 345–418.
  */
-class SeltzerBergerModel final : public Model, public ConcreteAction
+class SeltzerBergerModel final : public Model, public StaticConcreteAction
 {
   public:
     //!@{

src/celeritas/geo/detail/BoundaryAction.cc

@@ -27,7 +27,7 @@ namespace detail
  * Construct with action ID.
  */
 BoundaryAction::BoundaryAction(ActionId aid)
-    : ConcreteAction(aid, "geo-boundary", "cross a geometry boundary")
+    : StaticConcreteAction(aid, "geo-boundary", "cross a geometry boundary")
 {
 }
 

src/celeritas/geo/detail/BoundaryAction.hh

@@ -18,7 +18,7 @@ namespace detail
  * Move a track across a boundary.
  */
 class BoundaryAction final : public CoreStepActionInterface,
-                             public ConcreteAction
+                             public StaticConcreteAction
 {
   public:
     // Construct with ID

src/celeritas/global/CoreParams.cc

@@ -119,14 +119,14 @@ ActionId find_along_step_id(ActionRegistry const& reg)
 }
 
 //---------------------------------------------------------------------------//
-class PropagationLimitAction final : public ConcreteAction
+class PropagationLimitAction final : public StaticConcreteAction
 {
   public:
     //! Construct with ID
     explicit PropagationLimitAction(ActionId id)
-        : ConcreteAction(id,
-                         "geo-propagation-limit",
-                         "pause due to propagation misbehavior")
+        : StaticConcreteAction(id,
+                               "geo-propagation-limit",
+                               "pause due to propagation misbehavior")
     {
     }
 };