Tidy headers

.clang-tidy

@@ -9,6 +9,7 @@ Checks: |
   -performance-avoid-endl
   -performance-unnecessary-value-param
   -performance-enum-size
+  -performance-noexcept-destructor
   cppcoreguidelines-*
   -cppcoreguidelines-owning-memory
   -cppcoreguidelines-narrowing-conversions
@@ -25,6 +26,7 @@ Checks: |
   -cppcoreguidelines-noexcept-swap
   -cppcoreguidelines-noexcept-move-operations
   -cppcoreguidelines-noexcept-destructor
+  -cppcoreguidelines-virtual-class-destructor
   bugprone-*
   -bugprone-sizeof-expression
   -bugprone-narrowing-conversions
@@ -37,9 +39,11 @@ CheckOptions:
   cppcoreguidelines-avoid-do-while.IgnoreMacros: true
   cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: true
   cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove: true
+  cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor: true
   cppcoreguidelines-avoid-non-const-global-variables.AllowInternalLinkage: true
   performance-move-const-arg.CheckTriviallyCopyableMove: false
   performance-move-const-arg.CheckMoveToConstRef: false
-HeaderFilterRegex: ''
+
+HeaderFilterRegex: '(example|app|src/(accel|celeritas|corecel|orange|geocel))/.*\.hh$'
 FormatStyle: file
 ...

app/celer-g4/ActionInitialization.cc

@@ -29,7 +29,7 @@ namespace app
  * The parameters will be distributed to worker threads and all the actions.
  */
 ActionInitialization::ActionInitialization(SPParams params)
-    : params_{std::move(params)}, init_shared_{true}
+    : params_{std::move(params)}
 {
     CELER_EXPECT(params_);
 

app/celer-g4/ActionInitialization.hh

@@ -43,7 +43,7 @@ class ActionInitialization final : public G4VUserActionInitialization
     SPParams params_;
     SPDiagnostics diagnostics_;
     int num_events_{0};
-    mutable bool init_shared_;
+    mutable bool init_shared_{true};
 };
 
 //---------------------------------------------------------------------------//

app/celer-g4/RootIO.hh

@@ -51,13 +51,6 @@ class RootIO
   private:
     // Construct by initializing TFile and TTree on each worker thread
     RootIO();
-    RootIO(RootIO&&) = default;
-
-    // Assignment operator
-    RootIO& operator=(RootIO&&) = default;
-
-    // Default destructor
-    ~RootIO() = default;
 
     //// HELPER FUNCTIONS ////
 

app/celer-g4/SensitiveDetector.cc

@@ -30,7 +30,7 @@ namespace app
  * Construct with sensitive detector name.
  */
 SensitiveDetector::SensitiveDetector(std::string name)
-    : G4VSensitiveDetector(name), hcid_{-1}, collection_{nullptr}
+    : G4VSensitiveDetector(name)
 {
     this->collectionName.insert(name);
 }

app/celer-g4/SensitiveDetector.hh

@@ -41,8 +41,8 @@ class SensitiveDetector final : public G4VSensitiveDetector
     bool ProcessHits(G4Step*, G4TouchableHistory*) final;
 
   private:
-    int hcid_;
-    SensitiveHitsCollection* collection_;
+    int hcid_{-1};
+    SensitiveHitsCollection* collection_{nullptr};
 };
 
 //---------------------------------------------------------------------------//

src/accel/HepMC3PrimaryGenerator.hh

@@ -51,6 +51,7 @@ class HepMC3PrimaryGenerator final : public G4VPrimaryGenerator
     explicit HepMC3PrimaryGenerator(std::string const& filename);
 
     CELER_DELETE_COPY_MOVE(HepMC3PrimaryGenerator);
+    ~HepMC3PrimaryGenerator() override = default;
 
     //! Add primaries to Geant4 event
     void GeneratePrimaryVertex(G4Event* g4_event) final;

src/accel/RZMapMagneticField.hh

@@ -38,7 +38,8 @@ class RZMapMagneticField : public G4MagneticField
     inline explicit RZMapMagneticField(SPConstFieldParams field_params);
 
     // Calculate values of the magnetic field vector
-    inline void GetFieldValue(double const point[3], double* field) const;
+    inline void
+    GetFieldValue(double const point[3], double* field) const override;
 
   private:
     SPConstFieldParams params_;

src/accel/SetupOptionsMessenger.hh

@@ -64,7 +64,7 @@ class SetupOptionsMessenger : public G4UImessenger
     explicit SetupOptionsMessenger(SetupOptions* options);
 
     // Default destructor
-    ~SetupOptionsMessenger();
+    ~SetupOptionsMessenger() override;
 
   protected:
     void SetNewValue(G4UIcommand* command, G4String newValue) override;

src/accel/detail/HitProcessor.hh

@@ -12,6 +12,7 @@
 #include <vector>
 #include <G4TouchableHandle.hh>
 
+#include "corecel/Macros.hh"
 #include "celeritas/Types.hh"
 #include "celeritas/geo/GeoFwd.hh"
 #include "celeritas/user/DetectorSteps.hh"
@@ -81,6 +82,7 @@ class HitProcessor
 
     // Log on destruction
     ~HitProcessor();
+    CELER_DEFAULT_MOVE_DELETE_COPY(HitProcessor);
 
     // Process CPU-generated hits
     void operator()(StepStateHostRef const&);

src/accel/detail/LevelTouchableUpdater.hh

@@ -47,7 +47,7 @@ class LevelTouchableUpdater final : public TouchableUpdaterInterface
     explicit LevelTouchableUpdater(SPConstGeo);
 
     // Destroy pointers
-    ~LevelTouchableUpdater();
+    ~LevelTouchableUpdater() final;
 
     // Update from a particular detector step
     bool operator()(DetectorStepOutput const& out,

src/accel/detail/NaviTouchableUpdater.hh

@@ -56,7 +56,7 @@ class NaviTouchableUpdater final : public TouchableUpdaterInterface
                          G4VPhysicalVolume const* world);
 
     // Default external deleter
-    ~NaviTouchableUpdater();
+    ~NaviTouchableUpdater() final;
 
     // Update from a particular detector step
     bool operator()(DetectorStepOutput const& out,

src/celeritas/Types.hh

@@ -43,7 +43,7 @@ using IsotopeId = OpaqueId<struct IsotopeRecord>;
 using MaterialId = OpaqueId<class Material_>;
 
 //! Opaque index of model in the list of physics processes
-using ModelId = OpaqueId<class Model>;
+using ModelId = OpaqueId<class Model_>;
 
 //! Opaque index to a material with optical properties
 using OpticalMaterialId = OpaqueId<struct OpticalMaterial_>;

src/celeritas/alongstep/AlongStepGeneralLinearAction.hh

@@ -56,7 +56,7 @@ class AlongStepGeneralLinearAction final : public CoreStepActionInterface
                                  SPConstMsc msc);
 
     // Default destructor
-    ~AlongStepGeneralLinearAction();
+    ~AlongStepGeneralLinearAction() final;
 
     // Launch kernel with host data
     void step(CoreParams const&, CoreStateHost&) const final;

src/celeritas/alongstep/AlongStepUniformMscAction.hh

@@ -55,7 +55,7 @@ class AlongStepUniformMscAction final : public CoreStepActionInterface
                               SPConstMsc msc);
 
     // Default destructor
-    ~AlongStepUniformMscAction();
+    ~AlongStepUniformMscAction() final;
 
     // Launch kernel with host data
     void step(CoreParams const&, CoreStateHost&) const final;

src/celeritas/em/data/AtomicRelaxationData.hh

@@ -133,6 +133,7 @@ struct AtomicRelaxStateData
 
     //! Assign from another set of states
     template<Ownership W2, MemSpace M2>
+    // NOLINTNEXTLINE(cppcoreguidelines-c-copy-assignment-signature)
     AtomicRelaxStateData& operator=(AtomicRelaxStateData<W2, M2>& other)
     {
         scratch = other.scratch;

src/celeritas/em/xs/RBDiffXsCalculator.hh

@@ -123,6 +123,7 @@ RBDiffXsCalculator::RBDiffXsCalculator(RelativisticBremRef const& shared,
     , material_(material)
     , element_(material.make_element_view(elcomp_id))
     , total_energy_(value_as<Energy>(particle.total_energy()))
+    , dielectric_suppression_(shared.dielectric_suppression())
 {
     real_type density_factor = material.electron_density()
                                * detail::migdal_constant();
@@ -133,7 +134,6 @@ RBDiffXsCalculator::RBDiffXsCalculator(RelativisticBremRef const& shared,
           * value_as<detail::MevPerLen>(detail::lpm_constant());
     real_type lpm_threshold = lpm_energy * std::sqrt(density_factor);
     enable_lpm_ = (shared.enable_lpm && (total_energy_ > lpm_threshold));
-    dielectric_suppression_ = shared.dielectric_suppression();
 }
 
 //---------------------------------------------------------------------------//

src/celeritas/ext/GeantImporter.hh

@@ -90,7 +90,7 @@ class GeantImporter final : public ImporterInterface
     ImportData operator()(DataSelection const& selection);
 
     //! Fill all available data from Geant4
-    ImportData operator()() { return (*this)(DataSelection{}); }
+    ImportData operator()() final { return (*this)(DataSelection{}); }
 
   private:
     // Optional setup if celeritas handles initialization

src/celeritas/ext/RootImporter.hh

@@ -58,7 +58,7 @@ class RootImporter final : public ImporterInterface
     }
 
     // Load data from the ROOT files
-    ImportData operator()();
+    ImportData operator()() final;
 
   private:
     // ROOT file

src/celeritas/ext/detail/AllElementReader.hh

@@ -42,6 +42,7 @@ class AllElementReader
 
     //! Load a map of data for all stored elements
     template<class ReadOneElement>
+    // NOLINTNEXTLINE(cppcoreguidelines-missing-std-forward)
     auto operator()(ReadOneElement&& read_el) const -> decltype(auto)
     {
         using result_type = typename ReadOneElement::result_type;

src/celeritas/ext/detail/GeantBremsstrahlungProcess.cc

@@ -39,9 +39,7 @@ namespace detail
  * Construct with model selection.
  */
 GeantBremsstrahlungProcess::GeantBremsstrahlungProcess(ModelSelection selection)
-    : G4VEnergyLossProcess("eBrem")
-    , is_initialized_(false)
-    , model_selection_(selection)
+    : G4VEnergyLossProcess("eBrem"), model_selection_(selection)
 {
     CELER_VALIDATE(selection != ModelSelection::none,
                    << "Cannot initialize GeantBremsstrahlungProcess with "

src/celeritas/ext/detail/GeantBremsstrahlungProcess.hh

@@ -51,7 +51,7 @@ class GeantBremsstrahlungProcess : public G4VEnergyLossProcess
     void StreamProcessInfo(std::ostream& output) const override;
 
   private:
-    bool is_initialized_;
+    bool is_initialized_{false};
     ModelSelection model_selection_;
 };
 

src/celeritas/field/MakeMagFieldPropagator.hh

@@ -34,6 +34,7 @@ namespace celeritas
  */
 template<template<class EquationT> class StepperT, class FieldT>
 CELER_FUNCTION decltype(auto)
+// NOLINTNEXTLINE(cppcoreguidelines-missing-std-forward)
 make_mag_field_stepper(FieldT&& field, units::ElementaryCharge charge)
 {
     using Equation_t = MagFieldEquation<FieldT>;
@@ -58,10 +59,12 @@ make_mag_field_stepper(FieldT&& field, units::ElementaryCharge charge)
  */
 template<class StepperT, class GTV>
 CELER_FUNCTION decltype(auto)
+// NOLINTBEGIN(cppcoreguidelines-missing-std-forward)
 make_field_propagator(StepperT&& stepper,
                       FieldDriverOptions const& options,
                       ParticleTrackView const& particle,
                       GTV&& geometry)
+// NOLINTEND(cppcoreguidelines-missing-std-forward)
 {
     return FieldPropagator{
         FieldDriver{options, ::celeritas::forward<StepperT>(stepper)},
@@ -84,12 +87,14 @@ make_field_propagator(StepperT&& stepper,
  * propagate(0.123);
  * \endcode
  */
+// NOLINTBEGIN(cppcoreguidelines-missing-std-forward)
 template<template<class EquationT> class StepperT, class FieldT, class GTV>
 CELER_FUNCTION decltype(auto)
 make_mag_field_propagator(FieldT&& field,
                           FieldDriverOptions const& options,
                           ParticleTrackView const& particle,
                           GTV&& geometry)
+// NOLINTEND(cppcoreguidelines-missing-std-forward)
 {
     return make_field_propagator(
         make_mag_field_stepper<StepperT>(::celeritas::forward<FieldT>(field),

src/celeritas/global/ActionLauncher.hh

@@ -37,10 +37,11 @@ namespace celeritas
  * \endcode
  */
 template<class F>
-void launch_core(std::string_view label,
-                 celeritas::CoreParams const& params,
-                 celeritas::CoreState<MemSpace::host>& state,
-                 F&& execute_thread)
+void launch_core(
+    std::string_view label,
+    celeritas::CoreParams const& params,
+    celeritas::CoreState<MemSpace::host>& state,
+    F&& execute_thread)  // NOLINT(cppcoreguidelines-missing-std-forward)
 {
     MultiExceptionHandler capture_exception;
     size_type const size = state.size();

src/celeritas/global/CoreState.hh

@@ -90,7 +90,7 @@ class CoreState final : public CoreStateInterface
               size_type num_track_slots);
 
     // Default destructor
-    ~CoreState();
+    ~CoreState() final;
 
     // Prevent move/copy
     CELER_DELETE_COPY_MOVE(CoreState);

src/celeritas/global/CoreTrackData.hh

@@ -143,6 +143,7 @@ struct CoreStateData
 
     //! Assign from another set of data
     template<Ownership W2, MemSpace M2>
+    // NOLINTNEXTLINE(cppcoreguidelines-c-copy-assignment-signature)
     CoreStateData& operator=(CoreStateData<W2, M2>& other)
     {
         CELER_EXPECT(other);

src/celeritas/global/Stepper.hh

@@ -157,7 +157,7 @@ class Stepper final : public StepperInterface
     explicit Stepper(Input input);
 
     // Default destructor
-    ~Stepper();
+    ~Stepper() final;
 
     // Warm up before stepping
     void warm_up() final;

src/celeritas/global/TrackExecutor.hh

@@ -159,10 +159,10 @@ CELER_FUNCTION ConditionalTrackExecutor(CoreParamsPtr<MemSpace::native>,
  * Return a track executor that only applies to active, non-errored tracks.
  */
 template<class T>
-inline CELER_FUNCTION decltype(auto)
-make_active_track_executor(CoreParamsPtr<MemSpace::native> params,
-                           CoreStatePtr<MemSpace::native> const& state,
-                           T&& apply_track)
+inline CELER_FUNCTION decltype(auto) make_active_track_executor(
+    CoreParamsPtr<MemSpace::native> params,
+    CoreStatePtr<MemSpace::native> const& state,
+    T&& apply_track)  // NOLINT(cppcoreguidelines-missing-std-forward)
 {
     return ConditionalTrackExecutor{
         params, state, AppliesValid{}, celeritas::forward<T>(apply_track)};
@@ -177,11 +177,11 @@ make_active_track_executor(CoreParamsPtr<MemSpace::native> params,
  * threads, active or not.
  */
 template<class T>
-inline CELER_FUNCTION decltype(auto)
-make_action_track_executor(CoreParamsPtr<MemSpace::native> params,
-                           CoreStatePtr<MemSpace::native> state,
-                           ActionId action,
-                           T&& apply_track)
+inline CELER_FUNCTION decltype(auto) make_action_track_executor(
+    CoreParamsPtr<MemSpace::native> params,
+    CoreStatePtr<MemSpace::native> state,
+    ActionId action,
+    T&& apply_track)  // NOLINT(cppcoreguidelines-missing-std-forward)
 {
     CELER_EXPECT(action);
     return ConditionalTrackExecutor{params,
@@ -195,11 +195,11 @@ make_action_track_executor(CoreParamsPtr<MemSpace::native> params,
  * Return a track executor that only applies for the given along-step action.
  */
 template<class T>
-inline CELER_FUNCTION decltype(auto)
-make_along_step_track_executor(CoreParamsPtr<MemSpace::native> params,
-                               CoreStatePtr<MemSpace::native> state,
-                               ActionId action,
-                               T&& apply_track)
+inline CELER_FUNCTION decltype(auto) make_along_step_track_executor(
+    CoreParamsPtr<MemSpace::native> params,
+    CoreStatePtr<MemSpace::native> state,
+    ActionId action,
+    T&& apply_track)  // NOLINT(cppcoreguidelines-missing-std-forward)
 {
     CELER_EXPECT(action);
     return ConditionalTrackExecutor{params,

src/celeritas/grid/GridIdFinder.hh

@@ -86,14 +86,10 @@ GridIdFinder<K, V>::operator()(argument_type quant) const -> result_type
 {
     auto iter
         = celeritas::lower_bound(grid_.begin(), grid_.end(), quant.value());
-    if (iter == grid_.end())
+    if (iter == grid_.end()  // Higher than end point
+                             // Below first point
+        || (iter == grid_.begin() && quant.value() != *iter))
     {
-        // Higher than end point
-        return {};
-    }
-    else if (iter == grid_.begin() && quant.value() != *iter)
-    {
-        // Below first point
         return {};
     }
     else if (iter + 1 == grid_.end() || quant.value() != *iter)

src/celeritas/io/EventReader.hh

@@ -56,6 +56,8 @@ class EventReader : public EventReaderInterface
     //! Prevent copying and moving
     CELER_DELETE_COPY_MOVE(EventReader);
 
+    ~EventReader() override = default;
+
     // Read a single event from the event record
     result_type operator()() final;