From 52fc0e1d07bd4bfb8187ead482bc39b843d9f066 Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Wed, 27 Nov 2024 12:23:50 -0800
Subject: [PATCH 01/13] fix lints

---
 app/celer-dump-data.cc                              |  8 ++++----
 app/celer-g4/DetectorConstruction.cc                |  1 +
 app/celer-geo/celer-geo.cc                          |  1 +
 src/accel/ExceptionConverter.cc                     |  2 +-
 src/accel/detail/HitProcessor.cc                    |  2 +-
 src/celeritas/ext/detail/CelerOpticalPhysics.cc     |  6 +++++-
 src/celeritas/geo/GeoMaterialParams.cc              |  8 +++++---
 src/celeritas/global/CoreState.cc                   |  2 +-
 src/celeritas/optical/OpticalCollector.cc           |  1 +
 src/celeritas/optical/detail/OpticalLaunchAction.cc |  9 +++++----
 src/celeritas/user/SlotDiagnostic.cc                | 11 ++++++++++-
 src/corecel/data/CollectionMirror.hh                |  2 +-
 src/corecel/io/ColorUtils.cc                        |  1 +
 src/corecel/io/ExceptionOutput.cc                   |  1 +
 src/corecel/io/LoggerTypes.cc                       |  2 +-
 src/corecel/io/detail/ReprImpl.cc                   |  1 +
 src/corecel/sys/MultiExceptionHandler.cc            |  2 ++
 src/corecel/sys/ScopedMem.cc                        |  4 +++-
 src/corecel/sys/ScopedSignalHandler.cc              |  1 +
 src/corecel/sys/TracingSession.cc                   |  2 +-
 src/corecel/sys/TypeDemangler.cc                    |  1 +
 src/geocel/GeoParamsInterface.hh                    |  2 +-
 src/geocel/GeoVolumeFinder.cc                       |  1 +
 src/geocel/ScopedGeantLogger.cc                     |  4 ++++
 src/geocel/g4/GeantGeoParams.cc                     |  7 +++----
 src/geocel/g4vg/Converter.cc                        | 11 ++++++-----
 src/geocel/g4vg/SolidConverter.cc                   |  6 +++---
 src/geocel/rasterize/ImageWriter.libpng.cc          |  2 +-
 src/geocel/vg/detail/VecgeomNavCollection.cc        |  5 +++--
 src/orange/OrangeParams.cc                          |  2 ++
 src/orange/OrangeParams.hh                          |  2 +-
 src/orange/OrangeTypes.cc                           |  1 +
 src/orange/detail/OrangeInputIOImpl.json.cc         |  1 +
 src/orange/detail/UnitInserter.cc                   |  1 +
 src/orange/detail/UniverseInserter.cc               |  1 +
 src/orange/g4org/SolidConverter.cc                  | 11 ++++++-----
 src/orange/orangeinp/InputBuilder.cc                |  1 +
 src/orange/orangeinp/PolySolid.cc                   |  7 ++++---
 src/orange/surf/GeneralQuadric.cc                   |  1 +
 src/orange/surf/SimpleQuadric.cc                    |  2 ++
 40 files changed, 91 insertions(+), 45 deletions(-)

diff --git a/app/celer-dump-data.cc b/app/celer-dump-data.cc
index 8496cae004..07fc6fb3ba 100644
--- a/app/celer-dump-data.cc
+++ b/app/celer-dump-data.cc
@@ -810,8 +810,8 @@ class OpticalMfpHelper
     };
 
     //! Construct helper for given model class out of the models
-    OpticalMfpHelper(std::vector<ImportOpticalModel> const& models, optical::ImportModelClass imc)
-        : mfps_(nullptr)
+    OpticalMfpHelper(std::vector<ImportOpticalModel> const& models,
+                     optical::ImportModelClass imc)
     {
         auto iter = std::find_if(models.begin(), models.end(), [imc] (auto const& m) { return m.model_class == imc; });
         if (iter != models.end())
@@ -831,7 +831,7 @@ class OpticalMfpHelper
     }
 
   private:
-    std::vector<ImportPhysicsVector> const* mfps_;
+    std::vector<ImportPhysicsVector> const* mfps_{nullptr};
 };
 
 /*!
@@ -968,7 +968,7 @@ void print_optical_materials(std::vector<ImportOpticalModel> const& io_models,
 /*!
  * Execute and run.
  */
-int main(int argc, char* argv[])
+int main(int argc, char* argv[])  // NOLINT(bugprone-exception-escape)
 {
     using namespace celeritas;
     using namespace celeritas::app;
diff --git a/app/celer-g4/DetectorConstruction.cc b/app/celer-g4/DetectorConstruction.cc
index be5ea6bce5..7abe6c7af1 100644
--- a/app/celer-g4/DetectorConstruction.cc
+++ b/app/celer-g4/DetectorConstruction.cc
@@ -312,6 +312,7 @@ void DetectorConstruction::ConstructSDandField()
  * Apply a function to the range of volumes for each detector.
  */
 template<class F>
+// NOLINTNEXTLINE(cppcoreguidelines-missing-std-forward)
 void DetectorConstruction::foreach_detector(F&& apply_to_range) const
 {
     auto start = detectors_.begin();
diff --git a/app/celer-geo/celer-geo.cc b/app/celer-geo/celer-geo.cc
index 5d9c0b792d..5aa5837762 100644
--- a/app/celer-geo/celer-geo.cc
+++ b/app/celer-geo/celer-geo.cc
@@ -132,6 +132,7 @@ void run_trace(Runner& run_trace,
         std::ofstream image_file(trace_setup.bin_file, std::ios::binary);
         std::vector<int> image_data(img_params.num_pixels());
         image->copy_to_host(make_span(image_data));
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
         image_file.write(reinterpret_cast<char const*>(image_data.data()),
                          image_data.size() * sizeof(int));
     }
diff --git a/src/accel/ExceptionConverter.cc b/src/accel/ExceptionConverter.cc
index e307b24a5d..d6c897064a 100644
--- a/src/accel/ExceptionConverter.cc
+++ b/src/accel/ExceptionConverter.cc
@@ -166,7 +166,7 @@ void ExceptionConverter::operator()(std::exception_ptr eptr) const
                     msg << "\n[error while exporting state: " << e.what()
                         << "]";
                 }
-                catch (...)
+                catch (...)  // NOLINT(bugprone-empty-catch)
                 {
                     /* Do nothing */
                 }
diff --git a/src/accel/detail/HitProcessor.cc b/src/accel/detail/HitProcessor.cc
index cc60513bc3..9974376f23 100644
--- a/src/accel/detail/HitProcessor.cc
+++ b/src/accel/detail/HitProcessor.cc
@@ -141,7 +141,7 @@ HitProcessor::~HitProcessor()
     {
         CELER_LOG_LOCAL(debug) << "Deallocating hit processor";
     }
-    catch (...)
+    catch (...)  // NOLINT(bugprone-empty-catch)
     {
         // Ignore anything bad that happens while logging
     }
diff --git a/src/celeritas/ext/detail/CelerOpticalPhysics.cc b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
index 0119a89917..2fe35f8300 100644
--- a/src/celeritas/ext/detail/CelerOpticalPhysics.cc
+++ b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
@@ -335,10 +335,14 @@ void CelerOpticalPhysics::ConstructProcess()
                                                       idxPostStep);
         }
     }
+    // NOLINTBEGIN(bugprone-unused-return-value,
+    // clang-analyzer-cplusplus.NewDeleteLeaks)
     boundary.release();
     cerenkov.release();
     scint.release();
-}
+    // NOLINTEND(bugprone-unused-return-value,
+    // clang-analyzer-cplusplus.NewDeleteLeaks)
+}  // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
 
 }  // namespace detail
 }  // namespace celeritas
diff --git a/src/celeritas/geo/GeoMaterialParams.cc b/src/celeritas/geo/GeoMaterialParams.cc
index 0296c3eaf7..001982a8ef 100644
--- a/src/celeritas/geo/GeoMaterialParams.cc
+++ b/src/celeritas/geo/GeoMaterialParams.cc
@@ -40,9 +40,11 @@ using MapLabelMatId = std::unordered_map<Label, MaterialId>;
  * The input is effectively an "unzipped" unordered list of (volume label,
  * material id) pairs.
  */
-MapLabelMatId build_label_map(MaterialParams const& mat_params,
-                              std::vector<Label>&& labels,
-                              std::vector<MaterialId> const& materials)
+MapLabelMatId build_label_map(
+    MaterialParams const& mat_params,
+    std::vector<Label>&&
+        labels,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
+    std::vector<MaterialId> const& materials)
 {
     CELER_EXPECT(materials.size() == labels.size());
     CELER_EXPECT(std::all_of(
diff --git a/src/celeritas/global/CoreState.cc b/src/celeritas/global/CoreState.cc
index 1bfc2e9cc2..6e4a6d3644 100644
--- a/src/celeritas/global/CoreState.cc
+++ b/src/celeritas/global/CoreState.cc
@@ -83,7 +83,7 @@ CoreState<M>::~CoreState()
             << "Deallocating " << to_cstring(M) << " core state (stream "
             << this->stream_id().unchecked_get() << ')';
     }
-    catch (...)
+    catch (...)  // NOLINT(bugprone-empty-catch)
     {
         // Ignore anything bad that happens while logging
     }
diff --git a/src/celeritas/optical/OpticalCollector.cc b/src/celeritas/optical/OpticalCollector.cc
index 81f0ed930f..d432a85b8a 100644
--- a/src/celeritas/optical/OpticalCollector.cc
+++ b/src/celeritas/optical/OpticalCollector.cc
@@ -34,6 +34,7 @@ namespace celeritas
  *
  * This adds several actions and auxiliary data to the registry.
  */
+// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 OpticalCollector::OpticalCollector(CoreParams const& core, Input&& inp)
 {
     CELER_EXPECT(inp);
diff --git a/src/celeritas/optical/detail/OpticalLaunchAction.cc b/src/celeritas/optical/detail/OpticalLaunchAction.cc
index 5aa2ac6f5c..b2c7aaa9e4 100644
--- a/src/celeritas/optical/detail/OpticalLaunchAction.cc
+++ b/src/celeritas/optical/detail/OpticalLaunchAction.cc
@@ -48,10 +48,11 @@ OpticalLaunchAction::make_and_insert(CoreParams const& core, Input&& input)
 /*!
  * Construct with action ID, generator storage.
  */
-OpticalLaunchAction::OpticalLaunchAction(ActionId action_id,
-                                         AuxId data_id,
-                                         CoreParams const& core,
-                                         Input&& input)
+OpticalLaunchAction::OpticalLaunchAction(
+    ActionId action_id,
+    AuxId data_id,
+    CoreParams const& core,
+    Input&& input)  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
     : action_id_{action_id}
     , aux_id_{data_id}
     , offload_params_{std::move(input.offload)}
diff --git a/src/celeritas/user/SlotDiagnostic.cc b/src/celeritas/user/SlotDiagnostic.cc
index 18781919df..e9984a15e5 100644
--- a/src/celeritas/user/SlotDiagnostic.cc
+++ b/src/celeritas/user/SlotDiagnostic.cc
@@ -32,7 +32,16 @@ struct SlotDiagnostic::State final : AuxStateInterface
     std::ofstream outfile;
     std::vector<int> buffer;
 
-    ~State() { CELER_LOG_LOCAL(debug) << "Closing slot diagnostic file"; }
+    State() = default;
+    State(State const&) = delete;
+    State& operator=(State const&) = delete;
+    State(State&&) noexcept = default;
+    State& operator=(State&&) noexcept = default;
+
+    ~State() final
+    {
+        CELER_LOG_LOCAL(debug) << "Closing slot diagnostic file";
+    }
 };
 
 //---------------------------------------------------------------------------//
diff --git a/src/corecel/data/CollectionMirror.hh b/src/corecel/data/CollectionMirror.hh
index ac1b0881d0..ffd81dc6dd 100644
--- a/src/corecel/data/CollectionMirror.hh
+++ b/src/corecel/data/CollectionMirror.hh
@@ -48,7 +48,7 @@ namespace celeritas
  * \endcode
  */
 template<template<Ownership, MemSpace> class P>
-class CollectionMirror : public ParamsDataInterface<P>
+class CollectionMirror final : public ParamsDataInterface<P>
 {
   public:
     //!@{
diff --git a/src/corecel/io/ColorUtils.cc b/src/corecel/io/ColorUtils.cc
index 0642393e99..d1c73f90b1 100644
--- a/src/corecel/io/ColorUtils.cc
+++ b/src/corecel/io/ColorUtils.cc
@@ -86,6 +86,7 @@ char const* color_code(char abbrev)
     if (!use_color())
         return "";
 
+    // NOLINTNEXTLINE(bugprone-switch-missing-default-case)
     switch (abbrev)
     {
         case 'g':
diff --git a/src/corecel/io/ExceptionOutput.cc b/src/corecel/io/ExceptionOutput.cc
index b015918276..139ca0f841 100644
--- a/src/corecel/io/ExceptionOutput.cc
+++ b/src/corecel/io/ExceptionOutput.cc
@@ -84,6 +84,7 @@ void eptr_to_json(nlohmann::json& j, std::exception_ptr const& eptr)
     {
         try_nested_to_json(j, e);
     }
+    // NOLINTNEXTLINE(bugprone-empty-catch)
     catch (...)
     {
     }
diff --git a/src/corecel/io/LoggerTypes.cc b/src/corecel/io/LoggerTypes.cc
index 4d5dc7174f..65443b5fbb 100644
--- a/src/corecel/io/LoggerTypes.cc
+++ b/src/corecel/io/LoggerTypes.cc
@@ -40,7 +40,7 @@ char const* to_color_code(LogLevel lev)
     char c = ' ';
     switch (lev)
     {
-        case LogLevel::debug:      c = 'x'; break;
+        case LogLevel::debug:
         case LogLevel::diagnostic: c = 'x'; break;
         case LogLevel::status:     c = 'b'; break;
         case LogLevel::info:       c = 'g'; break;
diff --git a/src/corecel/io/detail/ReprImpl.cc b/src/corecel/io/detail/ReprImpl.cc
index ad6e2ec065..365b81cc65 100644
--- a/src/corecel/io/detail/ReprImpl.cc
+++ b/src/corecel/io/detail/ReprImpl.cc
@@ -68,6 +68,7 @@ void repr_char(std::ostream& os, char value)
 std::string char_to_hex_string(unsigned char value)
 {
     char buffer[3];
+    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
     int size = std::snprintf(buffer, sizeof(buffer), "%02hhx", value);
     CELER_ENSURE(size == 2);
     return {buffer, buffer + 2};
diff --git a/src/corecel/sys/MultiExceptionHandler.cc b/src/corecel/sys/MultiExceptionHandler.cc
index c547a86428..6afcadee05 100644
--- a/src/corecel/sys/MultiExceptionHandler.cc
+++ b/src/corecel/sys/MultiExceptionHandler.cc
@@ -27,6 +27,7 @@ void log_exception(std::exception const& e, Logger::Message* msg)
         log_exception(next, msg);
         *msg << "\n... from: ";
     }
+    // NOLINTNEXTLINE(bugprone-empty-catch)
     catch (...)
     {
         // Ignore unknown exception
@@ -43,6 +44,7 @@ namespace detail
 /*!
  * Throw the first exception and log all the rest.
  */
+// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 [[noreturn]] void log_and_rethrow_impl(MultiExceptionHandler&& exceptions)
 {
     CELER_EXPECT(!exceptions.empty());
diff --git a/src/corecel/sys/ScopedMem.cc b/src/corecel/sys/ScopedMem.cc
index bc850ccbc4..cd6c728961 100644
--- a/src/corecel/sys/ScopedMem.cc
+++ b/src/corecel/sys/ScopedMem.cc
@@ -60,6 +60,7 @@ MemResult get_cpu_mem()
         result.resident = tinfo.resident_size;
     }
 #elif defined(__linux__)
+    // NOLINTBEGIN(cppcoreguidelines-pro-type-union-access)
     struct rusage usage;
     usage.ru_maxrss = 0;
     if (!getrusage(RUSAGE_SELF, &usage))
@@ -67,6 +68,7 @@ MemResult get_cpu_mem()
         // Units are kiB!
         result.hwm = usage.ru_maxrss * 1024u;
     }
+    // NOLINTEND(cppcoreguidelines-pro-type-union-access)
 #elif defined(_WIN32)
     // Units are B
     PROCESS_MEMORY_COUNTERS info;
@@ -116,7 +118,7 @@ ScopedMem::ScopedMem(std::string_view label, MemRegistry* registry)
 /*!
  * Register data on destruction.
  */
-ScopedMem::~ScopedMem()
+ScopedMem::~ScopedMem()  // NOLINT(bugprone-exception-escape)
 {
     if (registry_.value() != nullptr)
     {
diff --git a/src/corecel/sys/ScopedSignalHandler.cc b/src/corecel/sys/ScopedSignalHandler.cc
index 524503aadb..531b227f9a 100644
--- a/src/corecel/sys/ScopedSignalHandler.cc
+++ b/src/corecel/sys/ScopedSignalHandler.cc
@@ -21,6 +21,7 @@ namespace
 {
 //---------------------------------------------------------------------------//
 // Bitset of signals that have been called
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 sig_atomic_t volatile g_celer_signal_bits_ = 0;
 
 //---------------------------------------------------------------------------//
diff --git a/src/corecel/sys/TracingSession.cc b/src/corecel/sys/TracingSession.cc
index 5566470ad5..d711030ca6 100644
--- a/src/corecel/sys/TracingSession.cc
+++ b/src/corecel/sys/TracingSession.cc
@@ -48,7 +48,6 @@ initialize_session(TracingMode mode) noexcept
             case TracingMode::in_process:
                 return perfetto::kInProcessBackend;
             case TracingMode::system:
-                return perfetto::kSystemBackend;
             default:
                 return perfetto::kSystemBackend;
         }
@@ -113,6 +112,7 @@ TracingSession::TracingSession(std::string_view filename) noexcept
     {
         if (!filename.empty())
         {
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
             fd_ = open(filename.data(), O_RDWR | O_CREAT | O_TRUNC, 0660);
         }
         session_->Setup(configure_session(), fd_);
diff --git a/src/corecel/sys/TypeDemangler.cc b/src/corecel/sys/TypeDemangler.cc
index 95644cf211..a6ead7979f 100644
--- a/src/corecel/sys/TypeDemangler.cc
+++ b/src/corecel/sys/TypeDemangler.cc
@@ -28,6 +28,7 @@ std::string demangled_typeid_name(char const* typeid_name)
     std::string result(status == 0 ? demangled : typeid_name);
 
     // Free the returned memory
+    // NOLINTNEXTLINE(cppcoreguidelines-no-malloc)
     std::free(demangled);
 #else  // __GNUG__
     std::string result(typeid_name);
diff --git a/src/geocel/GeoParamsInterface.hh b/src/geocel/GeoParamsInterface.hh
index 1c70207f77..fe25b59037 100644
--- a/src/geocel/GeoParamsInterface.hh
+++ b/src/geocel/GeoParamsInterface.hh
@@ -127,7 +127,7 @@ class GeoParamsSurfaceInterface : public GeoParamsInterface
 
   public:
     // Default destructor
-    virtual ~GeoParamsSurfaceInterface() = 0;
+    ~GeoParamsSurfaceInterface() override = 0;
 
     using GeoParamsInterface::id_to_label;
 
diff --git a/src/geocel/GeoVolumeFinder.cc b/src/geocel/GeoVolumeFinder.cc
index 8c5d3fd248..bd47018289 100644
--- a/src/geocel/GeoVolumeFinder.cc
+++ b/src/geocel/GeoVolumeFinder.cc
@@ -16,6 +16,7 @@ namespace celeritas
 /*!
  * Perform the search.
  */
+// NOLINTNEXTLINE(bugprone-exception-escape)
 VolumeId GeoVolumeFinder::operator()(Label const& label) const noexcept
 {
     if (auto id = vols_.find_exact(label))
diff --git a/src/geocel/ScopedGeantLogger.cc b/src/geocel/ScopedGeantLogger.cc
index 81654c2dad..ea013fdc55 100644
--- a/src/geocel/ScopedGeantLogger.cc
+++ b/src/geocel/ScopedGeantLogger.cc
@@ -17,6 +17,8 @@
 #include <G4UImanager.hh>
 #include <G4Version.hh>
 #include <G4coutDestination.hh>
+
+#include "corecel/Macros.hh"
 #if G4VERSION_NUMBER >= 1120
 #    include <G4ios.hh>
 #    define CELER_G4SSBUF 0
@@ -113,6 +115,7 @@ class GeantLoggerAdapter final : public G4coutDestination
   public:
     // Assign to Geant handlers on construction
     GeantLoggerAdapter();
+    CELER_DEFAULT_COPY_MOVE(GeantLoggerAdapter);
     ~GeantLoggerAdapter() final;
 
     // Handle error messages
@@ -187,6 +190,7 @@ G4int GeantLoggerAdapter::ReceiveG4cerr(G4String const& str)
 
 //---------------------------------------------------------------------------//
 //! Thread-local flag for "ownership" of the Geant4 logger
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 G4ThreadLocal bool g_adapter_active_{false};
 
 //---------------------------------------------------------------------------//
diff --git a/src/geocel/g4/GeantGeoParams.cc b/src/geocel/g4/GeantGeoParams.cc
index bd02126f61..9a87d50f78 100644
--- a/src/geocel/g4/GeantGeoParams.cc
+++ b/src/geocel/g4/GeantGeoParams.cc
@@ -106,16 +106,15 @@ std::vector<Label> get_pv_labels(G4VPhysicalVolume const& world)
 //---------------------------------------------------------------------------//
 LevelId::size_type get_max_depth(G4VPhysicalVolume const& world)
 {
-    int result{0};
+    LevelId::size_type result{0};
     visit_geant_volume_instances(
         [&result](G4VPhysicalVolume const&, int level) {
-            result = max(level, result);
+            result = max(level, static_cast<int>(result));
             return true;
         },
         world);
-    CELER_ENSURE(result >= 0);
     // Maximum "depth" is one greater than "highest level"
-    return static_cast<LevelId::size_type>(result + 1);
+    return result + 1;
 }
 
 //---------------------------------------------------------------------------//
diff --git a/src/geocel/g4vg/Converter.cc b/src/geocel/g4vg/Converter.cc
index 1daff34eb5..df356d3280 100644
--- a/src/geocel/g4vg/Converter.cc
+++ b/src/geocel/g4vg/Converter.cc
@@ -97,11 +97,12 @@ class DaughterPlacer
     using VecPv = Converter::VecPv;
 
     template<class F>
-    DaughterPlacer(F&& build_vgdaughter,
-                   Transformer const& trans,
-                   VecPv* placed_volumes,
-                   G4LogicalVolume const* daughter_g4lv,
-                   VGLogicalVolume* mother_lv)
+    DaughterPlacer(
+        F&& build_vgdaughter,  // NOLINT(cppcoreguidelines-missing-std-forward)
+        Transformer const& trans,
+        VecPv* placed_volumes,
+        G4LogicalVolume const* daughter_g4lv,
+        VGLogicalVolume* mother_lv)
         : convert_transform_{trans}
         , placed_pv_{placed_volumes}
         , mother_lv_{mother_lv}
diff --git a/src/geocel/g4vg/SolidConverter.cc b/src/geocel/g4vg/SolidConverter.cc
index 73ca0b894b..5073a3f102 100644
--- a/src/geocel/g4vg/SolidConverter.cc
+++ b/src/geocel/g4vg/SolidConverter.cc
@@ -407,7 +407,7 @@ auto SolidConverter::hype(arg_type solid_base) -> result_type
 auto SolidConverter::intersectionsolid(arg_type solid_base) -> result_type
 {
     PlacedBoolVolumes pv = this->convert_bool_impl(
-        static_cast<G4BooleanSolid const&>(solid_base));
+        dynamic_cast<G4BooleanSolid const&>(solid_base));
     return make_unplaced_boolean<kIntersection>(pv[0], pv[1]);
 }
 
@@ -536,7 +536,7 @@ auto SolidConverter::sphere(arg_type solid_base) -> result_type
 auto SolidConverter::subtractionsolid(arg_type solid_base) -> result_type
 {
     PlacedBoolVolumes pv = this->convert_bool_impl(
-        static_cast<G4BooleanSolid const&>(solid_base));
+        dynamic_cast<G4BooleanSolid const&>(solid_base));
     return make_unplaced_boolean<kSubtraction>(pv[0], pv[1]);
 }
 
@@ -668,7 +668,7 @@ auto SolidConverter::tubs(arg_type solid_base) -> result_type
 auto SolidConverter::unionsolid(arg_type solid_base) -> result_type
 {
     PlacedBoolVolumes pv = this->convert_bool_impl(
-        static_cast<G4BooleanSolid const&>(solid_base));
+        dynamic_cast<G4BooleanSolid const&>(solid_base));
     return make_unplaced_boolean<kUnion>(pv[0], pv[1]);
 }
 
diff --git a/src/geocel/rasterize/ImageWriter.libpng.cc b/src/geocel/rasterize/ImageWriter.libpng.cc
index 9f08d79dd8..765302f694 100644
--- a/src/geocel/rasterize/ImageWriter.libpng.cc
+++ b/src/geocel/rasterize/ImageWriter.libpng.cc
@@ -152,7 +152,7 @@ void ImageWriter::operator()(Span<Color const> colors)
         *iter++ = c.channel(Color::Channel::green);
         *iter++ = c.channel(Color::Channel::blue);
     }
-
+    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
     png_write_row(impl_->png, reinterpret_cast<png_byte*>(row_buffer_.data()));
 
     ++rows_written_;
diff --git a/src/geocel/vg/detail/VecgeomNavCollection.cc b/src/geocel/vg/detail/VecgeomNavCollection.cc
index 050e3a43cf..bd076e2369 100644
--- a/src/geocel/vg/detail/VecgeomNavCollection.cc
+++ b/src/geocel/vg/detail/VecgeomNavCollection.cc
@@ -102,8 +102,9 @@ auto VecgeomNavCollection<Ownership::reference, MemSpace::device>::operator=(
     -> VecgeomNavCollection&
 {
     CELER_ASSERT(other);
-    pool_view = vecgeom::NavStatePoolView{
-        (char*)other.ptr, other.max_depth, (int)other.size};
+    pool_view = vecgeom::NavStatePoolView{static_cast<char*>(other.ptr),
+                                          other.max_depth,
+                                          static_cast<int>(other.size)};
     return *this;
 }
 
diff --git a/src/orange/OrangeParams.cc b/src/orange/OrangeParams.cc
index a12aebf3db..550a1e60b9 100644
--- a/src/orange/OrangeParams.cc
+++ b/src/orange/OrangeParams.cc
@@ -134,6 +134,7 @@ OrangeParams::OrangeParams(G4VPhysicalVolume const* world)
  *
  * Volume and surface labels must be unique for the time being.
  */
+// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 OrangeParams::OrangeParams(OrangeInput&& input)
 {
     CELER_VALIDATE(input, << "input geometry is incomplete");
@@ -218,6 +219,7 @@ OrangeParams::OrangeParams(OrangeInput&& input)
  */
 OrangeParams::~OrangeParams() = default;
 
+// NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor)
 template class CollectionMirror<OrangeParamsData>;
 template class ParamsDataInterface<OrangeParamsData>;
 
diff --git a/src/orange/OrangeParams.hh b/src/orange/OrangeParams.hh
index 44f4cc9d36..245ad59626 100644
--- a/src/orange/OrangeParams.hh
+++ b/src/orange/OrangeParams.hh
@@ -55,7 +55,7 @@ class OrangeParams final : public GeoParamsSurfaceInterface,
     explicit OrangeParams(OrangeInput&& input);
 
     // Default destructor to anchor vtable
-    ~OrangeParams();
+    ~OrangeParams() final;
 
     // Moving would leave the class in an unspecified state
     CELER_DELETE_COPY_MOVE(OrangeParams);
diff --git a/src/orange/OrangeTypes.cc b/src/orange/OrangeTypes.cc
index fa2fc25385..2bfbe0c64e 100644
--- a/src/orange/OrangeTypes.cc
+++ b/src/orange/OrangeTypes.cc
@@ -221,6 +221,7 @@ char to_char(ZOrder zo)
  */
 ZOrder to_zorder(char c)
 {
+    // NOLINTNEXTLINE(bugprone-switch-missing-default-case)
     switch (c)
     {
         case '!':
diff --git a/src/orange/detail/OrangeInputIOImpl.json.cc b/src/orange/detail/OrangeInputIOImpl.json.cc
index 9e504485ca..4bfea27ff4 100644
--- a/src/orange/detail/OrangeInputIOImpl.json.cc
+++ b/src/orange/detail/OrangeInputIOImpl.json.cc
@@ -224,6 +224,7 @@ std::vector<logic_int> string_to_logic(std::string const& s)
         }
 
         // Parse a logic token
+        // NOLINTNEXTLINE(bugprone-switch-missing-default-case)
         switch (v)
         {
                 // clang-format off
diff --git a/src/orange/detail/UnitInserter.cc b/src/orange/detail/UnitInserter.cc
index 7e88c2b75d..4f3e5b50af 100644
--- a/src/orange/detail/UnitInserter.cc
+++ b/src/orange/detail/UnitInserter.cc
@@ -270,6 +270,7 @@ UnitInserter::UnitInserter(UniverseInserter* insert_universe, Data* orange_data)
 /*!
  * Create a simple unit and return its ID.
  */
+// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 UniverseId UnitInserter::operator()(UnitInput&& inp)
 {
     CELER_VALIDATE(inp,
diff --git a/src/orange/detail/UniverseInserter.cc b/src/orange/detail/UniverseInserter.cc
index 93f01a98ed..8f7a67b611 100644
--- a/src/orange/detail/UniverseInserter.cc
+++ b/src/orange/detail/UniverseInserter.cc
@@ -19,6 +19,7 @@ namespace
 {
 //---------------------------------------------------------------------------//
 template<class T>
+// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 void move_back(std::vector<T>& dst, std::vector<T>&& src)
 {
     dst.insert(dst.end(),
diff --git a/src/orange/g4org/SolidConverter.cc b/src/orange/g4org/SolidConverter.cc
index b942f4a2e3..95a3a1ac7c 100644
--- a/src/orange/g4org/SolidConverter.cc
+++ b/src/orange/g4org/SolidConverter.cc
@@ -186,14 +186,15 @@ auto make_shape(G4VSolid const& solid, Args&&... args)
  */
 template<class CR>
 auto make_solid(G4VSolid const& solid,
-                CR&& interior,
+                CR&& interior,  // NOLINT(cppcoreguidelines-missing-std-forward)
                 std::optional<CR>&& excluded,
                 SolidEnclosedAngle&& enclosed)
 {
-    return Solid<CR>::or_shape(std::string{solid.GetName()},
-                               std::move(interior),
-                               std::move(excluded),
-                               std::move(enclosed));
+    return Solid<CR>::or_shape(
+        std::string{solid.GetName()},
+        std::move(interior),  // NOLINT(bugprone-move-forwarding-reference)
+        std::move(excluded),
+        std::move(enclosed));
 }
 
 //---------------------------------------------------------------------------//
diff --git a/src/orange/orangeinp/InputBuilder.cc b/src/orange/orangeinp/InputBuilder.cc
index 08e0b44271..ab3fd2af66 100644
--- a/src/orange/orangeinp/InputBuilder.cc
+++ b/src/orange/orangeinp/InputBuilder.cc
@@ -62,6 +62,7 @@ class JsonProtoOutput
     }
 
     //! Save JSON
+    // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
     void operator()(UniverseId uid, JsonPimpl&& jpo)
     {
         CELER_EXPECT(uid < output_.size());
diff --git a/src/orange/orangeinp/PolySolid.cc b/src/orange/orangeinp/PolySolid.cc
index bd7a9a8eac..3427e75908 100644
--- a/src/orange/orangeinp/PolySolid.cc
+++ b/src/orange/orangeinp/PolySolid.cc
@@ -28,9 +28,10 @@ namespace
 //---------------------------------------------------------------------------//
 //! Construct the unioned "interior" of a polysolid
 template<class T>
-[[nodiscard]] NodeId construct_segments(PolySolidBase const& base,
-                                        T&& build_region,
-                                        detail::VolumeBuilder& vb)
+[[nodiscard]] NodeId construct_segments(
+    PolySolidBase const& base,
+    T&& build_region,  // NOLINT(cppcoreguidelines-missing-std-forward)
+    detail::VolumeBuilder& vb)
 {
     std::string const label{base.label()};
     auto const& segments = base.segments();
diff --git a/src/orange/surf/GeneralQuadric.cc b/src/orange/surf/GeneralQuadric.cc
index 990661067f..9154b51280 100644
--- a/src/orange/surf/GeneralQuadric.cc
+++ b/src/orange/surf/GeneralQuadric.cc
@@ -44,6 +44,7 @@ GeneralQuadric::GeneralQuadric(Real3 const& abc,
 /*!
  * Promote from a simple quadric.
  */
+// NOLINTNEXTLINE(bugprone-exception-escape)
 GeneralQuadric::GeneralQuadric(SimpleQuadric const& other) noexcept
     : GeneralQuadric{make_array(other.second()),
                      Real3{0, 0, 0},
diff --git a/src/orange/surf/SimpleQuadric.cc b/src/orange/surf/SimpleQuadric.cc
index fd82c1eb2b..4c1fdf7306 100644
--- a/src/orange/surf/SimpleQuadric.cc
+++ b/src/orange/surf/SimpleQuadric.cc
@@ -48,6 +48,7 @@ SimpleQuadric::SimpleQuadric(Real3 const& abc, Real3 const& def, real_type g)
  * whereas the simple quadric has a different sign for the constant:
  * \f$ dx + ey + fz + g = 0 \f$ .
  */
+// NOLINTNEXTLINE(bugprone-exception-escape)
 SimpleQuadric::SimpleQuadric(Plane const& other) noexcept
     : SimpleQuadric{{0, 0, 0}, other.normal(), negate(other.displacement())}
 {
@@ -94,6 +95,7 @@ template SimpleQuadric::SimpleQuadric(CylAligned<Axis::z> const&) noexcept;
        + x_0^2 + y_0^2 + z_0^2 - r^2 = 0
  * \endverbatim
  */
+// NOLINTNEXTLINE(bugprone-exception-escape)
 SimpleQuadric::SimpleQuadric(Sphere const& other) noexcept
 {
     Real3 const& origin = other.origin();

From 2a572ed3f247d517dde5e9aaa7c40dcc8d63a17e Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Wed, 27 Nov 2024 12:30:59 -0800
Subject: [PATCH 02/13] require successful clang-tidy

---
 .github/workflows/build-spack.yml           | 3 +--
 scripts/cmake-presets/ci-ubuntu-github.json | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
index e66bbe8c4c..bfa760e757 100644
--- a/.github/workflows/build-spack.yml
+++ b/.github/workflows/build-spack.yml
@@ -41,7 +41,7 @@ jobs:
           - geometry: "geant4"
             special: null
             geant: "11.0"
-          - geometry: "orange"
+          - geometry: "vecgeom"
             special: "clang-tidy"
             geant: "11.2"
     env:
@@ -139,7 +139,6 @@ jobs:
       - name: Build all
         id: build
         working-directory: build
-        continue-on-error: ${{matrix.special == 'clang-tidy'}}
         run: |
           ninja -v -k0
       - name: Regenerate ROOT test data
diff --git a/scripts/cmake-presets/ci-ubuntu-github.json b/scripts/cmake-presets/ci-ubuntu-github.json
index 871bb3d790..67c067d299 100644
--- a/scripts/cmake-presets/ci-ubuntu-github.json
+++ b/scripts/cmake-presets/ci-ubuntu-github.json
@@ -77,9 +77,9 @@
       "inherits": ["spack"]
     },
     {
-      "name": "reldeb-orange-clang-tidy",
+      "name": "reldeb-vecgeom-clang-tidy",
       "description": "Build with ORANGE and clang-tidy checks",
-      "inherits": ["spack"],
+      "inherits": ["spack", ".vecgeom"],
       "cacheVariables": {
         "CELERITAS_DEBUG":       {"type": "BOOL", "value": "ON"},
         "CELERITAS_BUILD_TESTS": {"type": "BOOL", "value": "OFF"},

From 12e5ddd0be8334ec647cf29c4a73ae122fb26ca5 Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Wed, 27 Nov 2024 13:52:35 -0800
Subject: [PATCH 03/13] warnings as error, fix clang-tidy-15 extra warnings

---
 .clang-tidy                          | 2 ++
 app/celer-g4/SensitiveHit.cc         | 1 +
 src/orange/orangeinp/InputBuilder.cc | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/.clang-tidy b/.clang-tidy
index 690a630687..3f5df461da 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -23,10 +23,12 @@ Checks: |
   -bugprone-macro-parentheses
   -bugprone-easily-swappable-parameters
   -bugprone-implicit-widening-of-multiplication-result
+WarningsAsErrors: '*'
 CheckOptions:
   cppcoreguidelines-macro-usage.CheckCapsOnly: true
   cppcoreguidelines-avoid-do-while.IgnoreMacros: true
   cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: true
+  cppcoreguidelines-avoid-non-const-global-variables.AllowInternalLinkage: true
 HeaderFilterRegex: ''
 FormatStyle: file
 ...
diff --git a/app/celer-g4/SensitiveHit.cc b/app/celer-g4/SensitiveHit.cc
index cb542ac2cd..042d51586a 100644
--- a/app/celer-g4/SensitiveHit.cc
+++ b/app/celer-g4/SensitiveHit.cc
@@ -24,6 +24,7 @@ namespace app
  */
 auto SensitiveHit::allocator() -> HitAllocator&
 {
+    // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
     static G4ThreadLocal HitAllocator* alloc_;
     if (CELER_UNLIKELY(!alloc_))
     {
diff --git a/src/orange/orangeinp/InputBuilder.cc b/src/orange/orangeinp/InputBuilder.cc
index ab3fd2af66..ff54bfa20e 100644
--- a/src/orange/orangeinp/InputBuilder.cc
+++ b/src/orange/orangeinp/InputBuilder.cc
@@ -52,6 +52,8 @@ void write_protos(detail::ProtoMap const& map, std::string const& filename)
 class JsonProtoOutput
 {
   public:
+    // false positive with clang-tidy-15, need cleanup
+    // NOLINTNEXTLINE(bugprone-exception-escape)
     JsonProtoOutput() = default;
 
     //! Construct with the number of universes

From 2af5572664396428971d44757f9f6950725b4123 Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Wed, 27 Nov 2024 14:54:45 -0800
Subject: [PATCH 04/13] fix warning

---
 src/corecel/sys/ScopedMpiInit.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/corecel/sys/ScopedMpiInit.cc b/src/corecel/sys/ScopedMpiInit.cc
index 69455a18bf..1f139d95ea 100644
--- a/src/corecel/sys/ScopedMpiInit.cc
+++ b/src/corecel/sys/ScopedMpiInit.cc
@@ -26,6 +26,8 @@
 namespace celeritas
 {
 //---------------------------------------------------------------------------//
+// False positive with clang-tidy-15, need cleanup
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 ScopedMpiInit::Status ScopedMpiInit::status_
     = ScopedMpiInit::Status::uninitialized;
 

From 58f1853eecccba8d039bd1d2de0ade689f7682ce Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Wed, 27 Nov 2024 14:55:02 -0800
Subject: [PATCH 05/13] fix potential leak for inactive processes

---
 .../ext/detail/CelerOpticalPhysics.cc         | 69 ++++++++++++++-----
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/celeritas/ext/detail/CelerOpticalPhysics.cc b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
index 2fe35f8300..a366985de1 100644
--- a/src/celeritas/ext/detail/CelerOpticalPhysics.cc
+++ b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
@@ -54,6 +54,45 @@ enum class OpticalProcessType
     size_,
 };
 
+/*!
+ * Wrapper around a unique pointer to accomodate keeping track whether we
+ * deleguated ownership to Geant4. We have to assume that Geant4 won't free the
+ * memory before we're done reading it...
+ */
+template<class T>
+class UniquePtrOwner
+{
+  public:
+    explicit UniquePtrOwner(std::unique_ptr<T> ptr) : ptr_(std::move(ptr)) {};
+    UniquePtrOwner(UniquePtrOwner const&) = delete;
+    UniquePtrOwner& operator=(UniquePtrOwner const&) = delete;
+    UniquePtrOwner(UniquePtrOwner&&) noexcept = default;
+    UniquePtrOwner& operator=(UniquePtrOwner&&) noexcept = default;
+
+    T* transferOwnership() noexcept
+    {
+        is_owner_ = false;
+        return ptr_.get();
+    };
+
+    operator T*() const noexcept { return ptr_.get(); };
+
+    T* operator->() const noexcept { return ptr_.get(); };
+
+    ~UniquePtrOwner()
+    {
+        // we transfered ownership, don't free the memory
+        if (!is_owner_)
+        {
+            ptr_.release();
+        }
+    };
+
+  private:
+    std::unique_ptr<T> ptr_;
+    bool is_owner_{true};
+};
+
 #if G4VERSION_NUMBER >= 1070
 G4OpticalProcessIndex
 optical_process_type_to_geant_index(OpticalProcessType value)
@@ -239,13 +278,13 @@ void CelerOpticalPhysics::ConstructProcess()
 
     // NB: boundary is also used later on in loop over particles,
     // though it's only ever applicable to G4OpticalPhotons
-    auto boundary = std::make_unique<G4OpBoundaryProcess>();
+    auto boundary = UniquePtrOwner{std::make_unique<G4OpBoundaryProcess>()};
 #if G4VERSION_NUMBER < 1070
     boundary->SetInvokeSD(options_.boundary.invoke_sd);
 #endif
     if (process_is_active(OpticalProcessType::boundary, options_))
     {
-        process_manager->AddDiscreteProcess(boundary.get());
+        process_manager->AddDiscreteProcess(boundary.transferOwnership());
         CELER_LOG(debug)
             << "Loaded Optical boundary process with G4OpBoundaryProcess "
                "process";
@@ -275,7 +314,7 @@ void CelerOpticalPhysics::ConstructProcess()
 
     // Add photon-generating processes to all particles they apply to
     // TODO: Eventually replace with Celeritas step collector processes
-    auto scint = std::make_unique<G4Scintillation>();
+    auto scint = UniquePtrOwner{std::make_unique<G4Scintillation>()};
 #if G4VERSION_NUMBER < 1070
     scint->SetStackPhotons(options_.scintillation.stack_photons);
     scint->SetTrackSecondariesFirst(
@@ -290,7 +329,7 @@ void CelerOpticalPhysics::ConstructProcess()
 #endif
     scint->AddSaturation(G4LossTableManager::Instance()->EmSaturation());
 
-    auto cerenkov = std::make_unique<G4Cerenkov>();
+    auto cerenkov = UniquePtrOwner{std::make_unique<G4Cerenkov>()};
 #if G4VERSION_NUMBER < 1070
     cerenkov->SetStackPhotons(options_.cerenkov.stack_photons);
     cerenkov->SetTrackSecondariesFirst(
@@ -311,8 +350,8 @@ void CelerOpticalPhysics::ConstructProcess()
         if (cerenkov->IsApplicable(*p)
             && process_is_active(OpticalProcessType::cerenkov, options_))
         {
-            process_manager->AddProcess(cerenkov.get());
-            process_manager->SetProcessOrdering(cerenkov.get(), idxPostStep);
+            process_manager->AddProcess(cerenkov.transferOwnership());
+            process_manager->SetProcessOrdering(cerenkov, idxPostStep);
             CELER_LOG(debug) << "Loaded Optical Cerenkov with G4Cerenkov "
                                 "process for particle "
                              << p->GetParticleName();
@@ -320,9 +359,9 @@ void CelerOpticalPhysics::ConstructProcess()
         if (scint->IsApplicable(*p)
             && process_is_active(OpticalProcessType::scintillation, options_))
         {
-            process_manager->AddProcess(scint.get());
-            process_manager->SetProcessOrderingToLast(scint.get(), idxAtRest);
-            process_manager->SetProcessOrderingToLast(scint.get(), idxPostStep);
+            process_manager->AddProcess(scint.transferOwnership());
+            process_manager->SetProcessOrderingToLast(scint, idxAtRest);
+            process_manager->SetProcessOrderingToLast(scint, idxPostStep);
             CELER_LOG(debug)
                 << "Loaded Optical Scintillation with G4Scintillation "
                    "process for particle "
@@ -331,18 +370,10 @@ void CelerOpticalPhysics::ConstructProcess()
         if (boundary->IsApplicable(*p)
             && process_is_active(OpticalProcessType::boundary, options_))
         {
-            process_manager->SetProcessOrderingToLast(boundary.get(),
-                                                      idxPostStep);
+            process_manager->SetProcessOrderingToLast(boundary, idxPostStep);
         }
     }
-    // NOLINTBEGIN(bugprone-unused-return-value,
-    // clang-analyzer-cplusplus.NewDeleteLeaks)
-    boundary.release();
-    cerenkov.release();
-    scint.release();
-    // NOLINTEND(bugprone-unused-return-value,
-    // clang-analyzer-cplusplus.NewDeleteLeaks)
-}  // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
+}
 
 }  // namespace detail
 }  // namespace celeritas

From 71fbd5806181c832a0bbd16fc44a171089d7b034 Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Wed, 27 Nov 2024 15:46:36 -0800
Subject: [PATCH 06/13] fix unused return

disable unnecessary steps
---
 .github/workflows/build-spack.yml               | 14 +++++++++-----
 src/celeritas/ext/detail/CelerOpticalPhysics.cc |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
index bfa760e757..8372f8cfac 100644
--- a/.github/workflows/build-spack.yml
+++ b/.github/workflows/build-spack.yml
@@ -56,6 +56,7 @@ jobs:
       SPACK_BUILDCACHE: "celer-buildcache" # see spack.yaml
       CC: "clang-15"
       CXX: "clang++-15"
+      CLANG_TIDY: "clang-tidy-15"
     runs-on: ubuntu-22.04
     continue-on-error: false
     steps:
@@ -126,8 +127,6 @@ jobs:
         run: |
           ccache -z
       - name: Configure Celeritas
-        env:
-          CLANG_TIDY: "clang-tidy-15"
         run: |
           ln -fs scripts/cmake-presets/ci-ubuntu-github.json CMakeUserPresets.json
           if [ "${{matrix.geant}}" == "11.0" ]; then
@@ -140,7 +139,11 @@ jobs:
         id: build
         working-directory: build
         run: |
-          ninja -v -k0
+          if [ "${{matrix.special}}" == "clang-tidy" ]; then
+            ninja -k0
+          else
+            ninja -v -k0
+          fi
       - name: Regenerate ROOT test data
         if: ${{matrix.geant == '11.0'}}
         working-directory: build
@@ -183,18 +186,19 @@ jobs:
         if: >-
           ${{
             (matrix.special != 'asanlite')
+            && (matrix.special != 'clang-tidy')
           }}
         run: |
           . ${SPACK_VIEW}/rc
           CELER_INSTALL_DIR=${PWD}/build ./scripts/ci/test-examples.sh
       - name: Install
         id: install
-        if: ${{!cancelled() && steps.build.outcome == 'success'}}
+        if: ${{!cancelled() && steps.build.outcome == 'success' && matrix.special != 'clang-tidy'}}
         working-directory: build
         run: |
           ninja install
       - name: Check installation
-        if: ${{steps.install.outcome == 'success'}}
+        if: ${{steps.install.outcome == 'success' && matrix.special != 'clang-tidy'}}
         working-directory: install
         run: |
           for exe in orange-update celer-export-geant celer-dump-data \
diff --git a/src/celeritas/ext/detail/CelerOpticalPhysics.cc b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
index a366985de1..a96ef71285 100644
--- a/src/celeritas/ext/detail/CelerOpticalPhysics.cc
+++ b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
@@ -84,6 +84,7 @@ class UniquePtrOwner
         // we transfered ownership, don't free the memory
         if (!is_owner_)
         {
+            // NOLINTNEXTLINE(bugprone-unused-return-value)
             ptr_.release();
         }
     };

From da4600fe98c04c847cf89955f7a2ebb44fddd639 Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Thu, 28 Nov 2024 10:19:47 -0800
Subject: [PATCH 07/13] address review feedback

---
 .clang-tidy                                   |  1 +
 .github/workflows/build-spack.yml             |  2 +-
 .../ext/detail/CelerOpticalPhysics.cc         | 53 +++++++------------
 src/celeritas/geo/GeoMaterialParams.cc        |  8 ++-
 src/celeritas/optical/OpticalCollector.cc     |  1 -
 .../optical/detail/OpticalLaunchAction.cc     |  9 ++--
 src/celeritas/user/SlotDiagnostic.cc          |  7 +--
 src/corecel/io/ColorUtils.cc                  |  3 +-
 src/corecel/io/LoggerTypes.cc                 |  2 +-
 src/corecel/sys/MultiExceptionHandler.cc      |  3 +-
 src/corecel/sys/MultiExceptionHandler.hh      |  2 +-
 src/corecel/sys/ScopedMem.cc                  |  5 +-
 src/corecel/sys/ScopedMem.hh                  |  2 +-
 src/corecel/sys/TracingSession.cc             |  1 +
 src/geocel/GeoVolumeFinder.cc                 |  4 +-
 src/geocel/GeoVolumeFinder.hh                 |  4 +-
 src/geocel/g4vg/Converter.cc                  | 13 +++--
 src/orange/detail/UnitInserter.cc             |  1 -
 src/orange/detail/UniverseInserter.cc         |  3 +-
 src/orange/g4org/SolidConverter.cc            | 12 ++---
 src/orange/orangeinp/InputBuilder.cc          |  1 -
 21 files changed, 59 insertions(+), 78 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 3f5df461da..2de890cc5a 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -28,6 +28,7 @@ CheckOptions:
   cppcoreguidelines-macro-usage.CheckCapsOnly: true
   cppcoreguidelines-avoid-do-while.IgnoreMacros: true
   cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: true
+  cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove: true
   cppcoreguidelines-avoid-non-const-global-variables.AllowInternalLinkage: true
 HeaderFilterRegex: ''
 FormatStyle: file
diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
index 8372f8cfac..477df483e9 100644
--- a/.github/workflows/build-spack.yml
+++ b/.github/workflows/build-spack.yml
@@ -198,7 +198,7 @@ jobs:
         run: |
           ninja install
       - name: Check installation
-        if: ${{steps.install.outcome == 'success' && matrix.special != 'clang-tidy'}}
+        if: ${{steps.install.outcome == 'success'}}
         working-directory: install
         run: |
           for exe in orange-update celer-export-geant celer-dump-data \
diff --git a/src/celeritas/ext/detail/CelerOpticalPhysics.cc b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
index a96ef71285..41aae804ba 100644
--- a/src/celeritas/ext/detail/CelerOpticalPhysics.cc
+++ b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
@@ -20,6 +20,8 @@
 #include <G4ProcessManager.hh>
 #include <G4Scintillation.hh>
 #include <G4Version.hh>
+
+#include "corecel/Macros.hh"
 #if G4VERSION_NUMBER >= 1070
 #    include <G4OpWLS2.hh>
 #    include <G4OpticalParameters.hh>
@@ -56,42 +58,27 @@ enum class OpticalProcessType
 
 /*!
  * Wrapper around a unique pointer to accomodate keeping track whether we
- * deleguated ownership to Geant4. We have to assume that Geant4 won't free the
+ * delegated ownership to Geant4. We have to assume that Geant4 won't free the
  * memory before we're done reading it...
  */
 template<class T>
-class UniquePtrOwner
+class ObservingUniquePtr
 {
   public:
-    explicit UniquePtrOwner(std::unique_ptr<T> ptr) : ptr_(std::move(ptr)) {};
-    UniquePtrOwner(UniquePtrOwner const&) = delete;
-    UniquePtrOwner& operator=(UniquePtrOwner const&) = delete;
-    UniquePtrOwner(UniquePtrOwner&&) noexcept = default;
-    UniquePtrOwner& operator=(UniquePtrOwner&&) noexcept = default;
-
-    T* transferOwnership() noexcept
+    explicit ObservingUniquePtr(std::unique_ptr<T> ptr)
+        : uptr_(std::move(ptr)), ptr_{uptr_.get()}
     {
-        is_owner_ = false;
-        return ptr_.get();
-    };
-
-    operator T*() const noexcept { return ptr_.get(); };
-
-    T* operator->() const noexcept { return ptr_.get(); };
+    }
+    CELER_DEFAULT_MOVE_DELETE_COPY(ObservingUniquePtr);
+    ~ObservingUniquePtr() = default;
 
-    ~UniquePtrOwner()
-    {
-        // we transfered ownership, don't free the memory
-        if (!is_owner_)
-        {
-            // NOLINTNEXTLINE(bugprone-unused-return-value)
-            ptr_.release();
-        }
-    };
+    T* release() noexcept { return uptr_.release(); }
+    operator T*() const noexcept { return ptr_; }
+    T* operator->() const noexcept { return ptr_; }
 
   private:
-    std::unique_ptr<T> ptr_;
-    bool is_owner_{true};
+    std::unique_ptr<T> uptr_;
+    T* ptr_;
 };
 
 #if G4VERSION_NUMBER >= 1070
@@ -279,13 +266,13 @@ void CelerOpticalPhysics::ConstructProcess()
 
     // NB: boundary is also used later on in loop over particles,
     // though it's only ever applicable to G4OpticalPhotons
-    auto boundary = UniquePtrOwner{std::make_unique<G4OpBoundaryProcess>()};
+    auto boundary = ObservingUniquePtr{std::make_unique<G4OpBoundaryProcess>()};
 #if G4VERSION_NUMBER < 1070
     boundary->SetInvokeSD(options_.boundary.invoke_sd);
 #endif
     if (process_is_active(OpticalProcessType::boundary, options_))
     {
-        process_manager->AddDiscreteProcess(boundary.transferOwnership());
+        process_manager->AddDiscreteProcess(boundary.release());
         CELER_LOG(debug)
             << "Loaded Optical boundary process with G4OpBoundaryProcess "
                "process";
@@ -315,7 +302,7 @@ void CelerOpticalPhysics::ConstructProcess()
 
     // Add photon-generating processes to all particles they apply to
     // TODO: Eventually replace with Celeritas step collector processes
-    auto scint = UniquePtrOwner{std::make_unique<G4Scintillation>()};
+    auto scint = ObservingUniquePtr{std::make_unique<G4Scintillation>()};
 #if G4VERSION_NUMBER < 1070
     scint->SetStackPhotons(options_.scintillation.stack_photons);
     scint->SetTrackSecondariesFirst(
@@ -330,7 +317,7 @@ void CelerOpticalPhysics::ConstructProcess()
 #endif
     scint->AddSaturation(G4LossTableManager::Instance()->EmSaturation());
 
-    auto cerenkov = UniquePtrOwner{std::make_unique<G4Cerenkov>()};
+    auto cerenkov = ObservingUniquePtr{std::make_unique<G4Cerenkov>()};
 #if G4VERSION_NUMBER < 1070
     cerenkov->SetStackPhotons(options_.cerenkov.stack_photons);
     cerenkov->SetTrackSecondariesFirst(
@@ -351,7 +338,7 @@ void CelerOpticalPhysics::ConstructProcess()
         if (cerenkov->IsApplicable(*p)
             && process_is_active(OpticalProcessType::cerenkov, options_))
         {
-            process_manager->AddProcess(cerenkov.transferOwnership());
+            process_manager->AddProcess(cerenkov.release());
             process_manager->SetProcessOrdering(cerenkov, idxPostStep);
             CELER_LOG(debug) << "Loaded Optical Cerenkov with G4Cerenkov "
                                 "process for particle "
@@ -360,7 +347,7 @@ void CelerOpticalPhysics::ConstructProcess()
         if (scint->IsApplicable(*p)
             && process_is_active(OpticalProcessType::scintillation, options_))
         {
-            process_manager->AddProcess(scint.transferOwnership());
+            process_manager->AddProcess(scint.release());
             process_manager->SetProcessOrderingToLast(scint, idxAtRest);
             process_manager->SetProcessOrderingToLast(scint, idxPostStep);
             CELER_LOG(debug)
diff --git a/src/celeritas/geo/GeoMaterialParams.cc b/src/celeritas/geo/GeoMaterialParams.cc
index 001982a8ef..b88493b089 100644
--- a/src/celeritas/geo/GeoMaterialParams.cc
+++ b/src/celeritas/geo/GeoMaterialParams.cc
@@ -40,11 +40,9 @@ using MapLabelMatId = std::unordered_map<Label, MaterialId>;
  * The input is effectively an "unzipped" unordered list of (volume label,
  * material id) pairs.
  */
-MapLabelMatId build_label_map(
-    MaterialParams const& mat_params,
-    std::vector<Label>&&
-        labels,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
-    std::vector<MaterialId> const& materials)
+MapLabelMatId build_label_map(MaterialParams const& mat_params,
+                              std::vector<Label> const& labels,
+                              std::vector<MaterialId> const& materials)
 {
     CELER_EXPECT(materials.size() == labels.size());
     CELER_EXPECT(std::all_of(
diff --git a/src/celeritas/optical/OpticalCollector.cc b/src/celeritas/optical/OpticalCollector.cc
index d432a85b8a..81f0ed930f 100644
--- a/src/celeritas/optical/OpticalCollector.cc
+++ b/src/celeritas/optical/OpticalCollector.cc
@@ -34,7 +34,6 @@ namespace celeritas
  *
  * This adds several actions and auxiliary data to the registry.
  */
-// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 OpticalCollector::OpticalCollector(CoreParams const& core, Input&& inp)
 {
     CELER_EXPECT(inp);
diff --git a/src/celeritas/optical/detail/OpticalLaunchAction.cc b/src/celeritas/optical/detail/OpticalLaunchAction.cc
index b2c7aaa9e4..5aa2ac6f5c 100644
--- a/src/celeritas/optical/detail/OpticalLaunchAction.cc
+++ b/src/celeritas/optical/detail/OpticalLaunchAction.cc
@@ -48,11 +48,10 @@ OpticalLaunchAction::make_and_insert(CoreParams const& core, Input&& input)
 /*!
  * Construct with action ID, generator storage.
  */
-OpticalLaunchAction::OpticalLaunchAction(
-    ActionId action_id,
-    AuxId data_id,
-    CoreParams const& core,
-    Input&& input)  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
+OpticalLaunchAction::OpticalLaunchAction(ActionId action_id,
+                                         AuxId data_id,
+                                         CoreParams const& core,
+                                         Input&& input)
     : action_id_{action_id}
     , aux_id_{data_id}
     , offload_params_{std::move(input.offload)}
diff --git a/src/celeritas/user/SlotDiagnostic.cc b/src/celeritas/user/SlotDiagnostic.cc
index e9984a15e5..1ef7ff21a5 100644
--- a/src/celeritas/user/SlotDiagnostic.cc
+++ b/src/celeritas/user/SlotDiagnostic.cc
@@ -10,6 +10,7 @@
 #include <fstream>
 #include <nlohmann/json.hpp>
 
+#include "corecel/Macros.hh"
 #include "corecel/data/AuxParamsRegistry.hh"
 #include "corecel/data/AuxStateVec.hh"
 #include "corecel/io/JsonPimpl.hh"
@@ -33,11 +34,7 @@ struct SlotDiagnostic::State final : AuxStateInterface
     std::vector<int> buffer;
 
     State() = default;
-    State(State const&) = delete;
-    State& operator=(State const&) = delete;
-    State(State&&) noexcept = default;
-    State& operator=(State&&) noexcept = default;
-
+    CELER_DEFAULT_MOVE_DELETE_COPY(State);
     ~State() final
     {
         CELER_LOG_LOCAL(debug) << "Closing slot diagnostic file";
diff --git a/src/corecel/io/ColorUtils.cc b/src/corecel/io/ColorUtils.cc
index d1c73f90b1..fe7da1c5e1 100644
--- a/src/corecel/io/ColorUtils.cc
+++ b/src/corecel/io/ColorUtils.cc
@@ -86,7 +86,6 @@ char const* color_code(char abbrev)
     if (!use_color())
         return "";
 
-    // NOLINTNEXTLINE(bugprone-switch-missing-default-case)
     switch (abbrev)
     {
         case 'g':
@@ -103,7 +102,7 @@ char const* color_code(char abbrev)
             return "\033[31;1m";
         case 'W':
             return "\033[37;1m";
-        case ' ':
+        default:
             return "\033[0m";
     }
 
diff --git a/src/corecel/io/LoggerTypes.cc b/src/corecel/io/LoggerTypes.cc
index 65443b5fbb..e4e5f13157 100644
--- a/src/corecel/io/LoggerTypes.cc
+++ b/src/corecel/io/LoggerTypes.cc
@@ -40,7 +40,7 @@ char const* to_color_code(LogLevel lev)
     char c = ' ';
     switch (lev)
     {
-        case LogLevel::debug:
+        case LogLevel::debug:     [[fallthrough]];
         case LogLevel::diagnostic: c = 'x'; break;
         case LogLevel::status:     c = 'b'; break;
         case LogLevel::info:       c = 'g'; break;
diff --git a/src/corecel/sys/MultiExceptionHandler.cc b/src/corecel/sys/MultiExceptionHandler.cc
index 6afcadee05..68f2ebe560 100644
--- a/src/corecel/sys/MultiExceptionHandler.cc
+++ b/src/corecel/sys/MultiExceptionHandler.cc
@@ -44,11 +44,10 @@ namespace detail
 /*!
  * Throw the first exception and log all the rest.
  */
-// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 [[noreturn]] void log_and_rethrow_impl(MultiExceptionHandler&& exceptions)
 {
     CELER_EXPECT(!exceptions.empty());
-    auto exc_vec = exceptions.release();
+    auto exc_vec = std::move(exceptions).release();
 
     for (auto eptr_iter = exc_vec.begin() + 1; eptr_iter != exc_vec.end();
          ++eptr_iter)
diff --git a/src/corecel/sys/MultiExceptionHandler.hh b/src/corecel/sys/MultiExceptionHandler.hh
index 1f1cae8cc5..96202455e2 100644
--- a/src/corecel/sys/MultiExceptionHandler.hh
+++ b/src/corecel/sys/MultiExceptionHandler.hh
@@ -62,7 +62,7 @@ class MultiExceptionHandler
     bool empty() const { return exceptions_.empty(); }
 
     //! Release exceptions for someone else to process (not thread safe)
-    VecExceptionPtr release() { return std::move(exceptions_); }
+    VecExceptionPtr release() && { return std::move(exceptions_); }
 
   private:
     VecExceptionPtr exceptions_;
diff --git a/src/corecel/sys/ScopedMem.cc b/src/corecel/sys/ScopedMem.cc
index cd6c728961..b3201928da 100644
--- a/src/corecel/sys/ScopedMem.cc
+++ b/src/corecel/sys/ScopedMem.cc
@@ -7,6 +7,8 @@
 //---------------------------------------------------------------------------//
 #include "ScopedMem.hh"
 
+#include "corecel/Config.hh"
+
 #if defined(__APPLE__)
 #    include <cstring>
 #    include <mach/mach.h>
@@ -118,7 +120,8 @@ ScopedMem::ScopedMem(std::string_view label, MemRegistry* registry)
 /*!
  * Register data on destruction.
  */
-ScopedMem::~ScopedMem()  // NOLINT(bugprone-exception-escape)
+// NOLINTNEXTLINE(cppcoreguidelines-noexcept-destructor)
+ScopedMem::~ScopedMem() noexcept(!CELERITAS_DEBUG)
 {
     if (registry_.value() != nullptr)
     {
diff --git a/src/corecel/sys/ScopedMem.hh b/src/corecel/sys/ScopedMem.hh
index c854c199bf..4884dee2b2 100644
--- a/src/corecel/sys/ScopedMem.hh
+++ b/src/corecel/sys/ScopedMem.hh
@@ -56,7 +56,7 @@ class ScopedMem
     }
 
     // Register data on destruction
-    ~ScopedMem();
+    ~ScopedMem() noexcept(!CELERITAS_DEBUG);
 
     //! Prevent copying but allow moving
     CELER_DEFAULT_MOVE_DELETE_COPY(ScopedMem);
diff --git a/src/corecel/sys/TracingSession.cc b/src/corecel/sys/TracingSession.cc
index d711030ca6..e45d7773dd 100644
--- a/src/corecel/sys/TracingSession.cc
+++ b/src/corecel/sys/TracingSession.cc
@@ -48,6 +48,7 @@ initialize_session(TracingMode mode) noexcept
             case TracingMode::in_process:
                 return perfetto::kInProcessBackend;
             case TracingMode::system:
+                [[fallthrough]];
             default:
                 return perfetto::kSystemBackend;
         }
diff --git a/src/geocel/GeoVolumeFinder.cc b/src/geocel/GeoVolumeFinder.cc
index bd47018289..c8fa0b970f 100644
--- a/src/geocel/GeoVolumeFinder.cc
+++ b/src/geocel/GeoVolumeFinder.cc
@@ -16,8 +16,8 @@ namespace celeritas
 /*!
  * Perform the search.
  */
-// NOLINTNEXTLINE(bugprone-exception-escape)
-VolumeId GeoVolumeFinder::operator()(Label const& label) const noexcept
+VolumeId GeoVolumeFinder::operator()(Label const& label) const
+    noexcept(!CELERITAS_DEBUG)
 {
     if (auto id = vols_.find_exact(label))
     {
diff --git a/src/geocel/GeoVolumeFinder.hh b/src/geocel/GeoVolumeFinder.hh
index cc28f5cf49..c37d906b30 100644
--- a/src/geocel/GeoVolumeFinder.hh
+++ b/src/geocel/GeoVolumeFinder.hh
@@ -7,6 +7,8 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
+#include "corecel/Config.hh"
+
 #include "GeoParamsInterface.hh"
 
 namespace celeritas
@@ -33,7 +35,7 @@ class GeoVolumeFinder
     explicit inline GeoVolumeFinder(GeoParamsInterface const& geo);
 
     // Perform search
-    VolumeId operator()(Label const& label) const noexcept;
+    VolumeId operator()(Label const& label) const noexcept(!CELERITAS_DEBUG);
 
   private:
     VolumeMap const& vols_;
diff --git a/src/geocel/g4vg/Converter.cc b/src/geocel/g4vg/Converter.cc
index df356d3280..49be6c0f52 100644
--- a/src/geocel/g4vg/Converter.cc
+++ b/src/geocel/g4vg/Converter.cc
@@ -97,12 +97,11 @@ class DaughterPlacer
     using VecPv = Converter::VecPv;
 
     template<class F>
-    DaughterPlacer(
-        F&& build_vgdaughter,  // NOLINT(cppcoreguidelines-missing-std-forward)
-        Transformer const& trans,
-        VecPv* placed_volumes,
-        G4LogicalVolume const* daughter_g4lv,
-        VGLogicalVolume* mother_lv)
+    DaughterPlacer(F&& build_vgdaughter,
+                   Transformer const& trans,
+                   VecPv* placed_volumes,
+                   G4LogicalVolume const* daughter_g4lv,
+                   VGLogicalVolume* mother_lv)
         : convert_transform_{trans}
         , placed_pv_{placed_volumes}
         , mother_lv_{mother_lv}
@@ -122,7 +121,7 @@ class DaughterPlacer
             flip_z_ = true;
         }
 
-        daughter_lv_ = build_vgdaughter(daughter_g4lv);
+        daughter_lv_ = std::forward<F>(build_vgdaughter)(daughter_g4lv);
         CELER_ENSURE(daughter_lv_);
     }
 
diff --git a/src/orange/detail/UnitInserter.cc b/src/orange/detail/UnitInserter.cc
index 4f3e5b50af..7e88c2b75d 100644
--- a/src/orange/detail/UnitInserter.cc
+++ b/src/orange/detail/UnitInserter.cc
@@ -270,7 +270,6 @@ UnitInserter::UnitInserter(UniverseInserter* insert_universe, Data* orange_data)
 /*!
  * Create a simple unit and return its ID.
  */
-// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 UniverseId UnitInserter::operator()(UnitInput&& inp)
 {
     CELER_VALIDATE(inp,
diff --git a/src/orange/detail/UniverseInserter.cc b/src/orange/detail/UniverseInserter.cc
index 8f7a67b611..f591c3fa5e 100644
--- a/src/orange/detail/UniverseInserter.cc
+++ b/src/orange/detail/UniverseInserter.cc
@@ -19,13 +19,12 @@ namespace
 {
 //---------------------------------------------------------------------------//
 template<class T>
-// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 void move_back(std::vector<T>& dst, std::vector<T>&& src)
 {
     dst.insert(dst.end(),
                std::make_move_iterator(src.begin()),
                std::make_move_iterator(src.end()));
-    src.clear();
+    std::move(src).clear();
 }
 
 //---------------------------------------------------------------------------//
diff --git a/src/orange/g4org/SolidConverter.cc b/src/orange/g4org/SolidConverter.cc
index 95a3a1ac7c..a4b2eba276 100644
--- a/src/orange/g4org/SolidConverter.cc
+++ b/src/orange/g4org/SolidConverter.cc
@@ -10,6 +10,7 @@
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 #include <G4BooleanSolid.hh>
 #include <G4Box.hh>
@@ -186,15 +187,14 @@ auto make_shape(G4VSolid const& solid, Args&&... args)
  */
 template<class CR>
 auto make_solid(G4VSolid const& solid,
-                CR&& interior,  // NOLINT(cppcoreguidelines-missing-std-forward)
+                CR&& interior,
                 std::optional<CR>&& excluded,
                 SolidEnclosedAngle&& enclosed)
 {
-    return Solid<CR>::or_shape(
-        std::string{solid.GetName()},
-        std::move(interior),  // NOLINT(bugprone-move-forwarding-reference)
-        std::move(excluded),
-        std::move(enclosed));
+    return Solid<CR>::or_shape(std::string{solid.GetName()},
+                               std::forward<CR>(interior),
+                               std::move(excluded),
+                               std::move(enclosed));
 }
 
 //---------------------------------------------------------------------------//
diff --git a/src/orange/orangeinp/InputBuilder.cc b/src/orange/orangeinp/InputBuilder.cc
index ff54bfa20e..f993ac134a 100644
--- a/src/orange/orangeinp/InputBuilder.cc
+++ b/src/orange/orangeinp/InputBuilder.cc
@@ -64,7 +64,6 @@ class JsonProtoOutput
     }
 
     //! Save JSON
-    // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
     void operator()(UniverseId uid, JsonPimpl&& jpo)
     {
         CELER_EXPECT(uid < output_.size());

From 876dc9fcb97797d12c33616e53fe73d09fa89b31 Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Thu, 28 Nov 2024 11:44:12 -0800
Subject: [PATCH 08/13] fix clang-tidy-15

---
 src/corecel/sys/ScopedMem.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/corecel/sys/ScopedMem.cc b/src/corecel/sys/ScopedMem.cc
index b3201928da..c89199dedf 100644
--- a/src/corecel/sys/ScopedMem.cc
+++ b/src/corecel/sys/ScopedMem.cc
@@ -120,7 +120,9 @@ ScopedMem::ScopedMem(std::string_view label, MemRegistry* registry)
 /*!
  * Register data on destruction.
  */
-// NOLINTNEXTLINE(cppcoreguidelines-noexcept-destructor)
+// bugprone-exception-escape shouldn't be needed after we upgrade to
+// clang-tidy-18
+// NOLINTNEXTLINE(bugprone-exception-escape,cppcoreguidelines-noexcept-destructor)
 ScopedMem::~ScopedMem() noexcept(!CELERITAS_DEBUG)
 {
     if (registry_.value() != nullptr)

From 47f1cc4099d18a19bfaf9ebfa3d25c2815816169 Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Thu, 28 Nov 2024 11:51:18 -0800
Subject: [PATCH 09/13] fix noexcept

---
 src/corecel/sys/ScopedMem.cc      | 2 --
 src/corecel/sys/ScopedMem.hh      | 2 ++
 src/orange/surf/GeneralQuadric.cc | 4 +++-
 src/orange/surf/GeneralQuadric.hh | 5 ++++-
 src/orange/surf/SimpleQuadric.cc  | 6 ++++--
 src/orange/surf/SimpleQuadric.hh  | 6 ++++--
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/corecel/sys/ScopedMem.cc b/src/corecel/sys/ScopedMem.cc
index c89199dedf..ba93ed4a42 100644
--- a/src/corecel/sys/ScopedMem.cc
+++ b/src/corecel/sys/ScopedMem.cc
@@ -7,8 +7,6 @@
 //---------------------------------------------------------------------------//
 #include "ScopedMem.hh"
 
-#include "corecel/Config.hh"
-
 #if defined(__APPLE__)
 #    include <cstring>
 #    include <mach/mach.h>
diff --git a/src/corecel/sys/ScopedMem.hh b/src/corecel/sys/ScopedMem.hh
index 4884dee2b2..68af7c1049 100644
--- a/src/corecel/sys/ScopedMem.hh
+++ b/src/corecel/sys/ScopedMem.hh
@@ -9,6 +9,8 @@
 
 #include <string_view>
 
+#include "corecel/Config.hh"
+
 #include "corecel/cont/InitializedValue.hh"
 
 #include "MemRegistry.hh"
diff --git a/src/orange/surf/GeneralQuadric.cc b/src/orange/surf/GeneralQuadric.cc
index 9154b51280..82cda9e26a 100644
--- a/src/orange/surf/GeneralQuadric.cc
+++ b/src/orange/surf/GeneralQuadric.cc
@@ -44,8 +44,10 @@ GeneralQuadric::GeneralQuadric(Real3 const& abc,
 /*!
  * Promote from a simple quadric.
  */
+// Remove after upgrade to clang-tidy-18:
 // NOLINTNEXTLINE(bugprone-exception-escape)
-GeneralQuadric::GeneralQuadric(SimpleQuadric const& other) noexcept
+GeneralQuadric::GeneralQuadric(SimpleQuadric const& other) noexcept(
+    !CELERITAS_DEBUG)
     : GeneralQuadric{make_array(other.second()),
                      Real3{0, 0, 0},
                      make_array(other.first()),
diff --git a/src/orange/surf/GeneralQuadric.hh b/src/orange/surf/GeneralQuadric.hh
index 2d2f2e19ce..be42990b12 100644
--- a/src/orange/surf/GeneralQuadric.hh
+++ b/src/orange/surf/GeneralQuadric.hh
@@ -7,6 +7,8 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
+#include "corecel/Config.hh"
+
 #include "corecel/Types.hh"
 #include "corecel/cont/Array.hh"
 #include "corecel/cont/Span.hh"
@@ -70,7 +72,8 @@ class GeneralQuadric
     explicit inline CELER_FUNCTION GeneralQuadric(Span<R, StorageSpan::extent>);
 
     // Promote from a simple quadric
-    explicit GeneralQuadric(SimpleQuadric const& other) noexcept;
+    explicit GeneralQuadric(SimpleQuadric const& other) noexcept(
+        !CELERITAS_DEBUG);
 
     //// ACCESSORS ////
 
diff --git a/src/orange/surf/SimpleQuadric.cc b/src/orange/surf/SimpleQuadric.cc
index 4c1fdf7306..21bee90ea8 100644
--- a/src/orange/surf/SimpleQuadric.cc
+++ b/src/orange/surf/SimpleQuadric.cc
@@ -48,8 +48,9 @@ SimpleQuadric::SimpleQuadric(Real3 const& abc, Real3 const& def, real_type g)
  * whereas the simple quadric has a different sign for the constant:
  * \f$ dx + ey + fz + g = 0 \f$ .
  */
+// Remove after upgrade to clang-tidy-18:
 // NOLINTNEXTLINE(bugprone-exception-escape)
-SimpleQuadric::SimpleQuadric(Plane const& other) noexcept
+SimpleQuadric::SimpleQuadric(Plane const& other) noexcept(!CELERITAS_DEBUG)
     : SimpleQuadric{{0, 0, 0}, other.normal(), negate(other.displacement())}
 {
 }
@@ -95,8 +96,9 @@ template SimpleQuadric::SimpleQuadric(CylAligned<Axis::z> const&) noexcept;
        + x_0^2 + y_0^2 + z_0^2 - r^2 = 0
  * \endverbatim
  */
+// Remove after upgrade to clang-tidy-18:
 // NOLINTNEXTLINE(bugprone-exception-escape)
-SimpleQuadric::SimpleQuadric(Sphere const& other) noexcept
+SimpleQuadric::SimpleQuadric(Sphere const& other) noexcept(!CELERITAS_DEBUG)
 {
     Real3 const& origin = other.origin();
 
diff --git a/src/orange/surf/SimpleQuadric.hh b/src/orange/surf/SimpleQuadric.hh
index 616f943e5f..9a83ba4106 100644
--- a/src/orange/surf/SimpleQuadric.hh
+++ b/src/orange/surf/SimpleQuadric.hh
@@ -7,6 +7,8 @@
 //---------------------------------------------------------------------------//
 #pragma once
 
+#include "corecel/Config.hh"
+
 #include "corecel/Types.hh"
 #include "corecel/cont/Array.hh"
 #include "corecel/cont/Span.hh"
@@ -69,14 +71,14 @@ class SimpleQuadric
     explicit inline CELER_FUNCTION SimpleQuadric(Span<R, StorageSpan::extent>);
 
     // Promote from a plane
-    explicit SimpleQuadric(Plane const& other) noexcept;
+    explicit SimpleQuadric(Plane const& other) noexcept(!CELERITAS_DEBUG);
 
     // Promote from an axis-aligned cylinder
     template<Axis T>
     explicit SimpleQuadric(CylAligned<T> const& other) noexcept;
 
     // Promote from a sphere
-    explicit SimpleQuadric(Sphere const& other) noexcept;
+    explicit SimpleQuadric(Sphere const& other) noexcept(!CELERITAS_DEBUG);
 
     // Promote from a cone
     template<Axis T>

From 4bf9597536587be0e5f3388bb1f691481982df3d Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Thu, 28 Nov 2024 19:40:20 -0800
Subject: [PATCH 10/13] revert change

---
 src/celeritas/geo/GeoMaterialParams.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/celeritas/geo/GeoMaterialParams.cc b/src/celeritas/geo/GeoMaterialParams.cc
index b88493b089..0296c3eaf7 100644
--- a/src/celeritas/geo/GeoMaterialParams.cc
+++ b/src/celeritas/geo/GeoMaterialParams.cc
@@ -41,7 +41,7 @@ using MapLabelMatId = std::unordered_map<Label, MaterialId>;
  * material id) pairs.
  */
 MapLabelMatId build_label_map(MaterialParams const& mat_params,
-                              std::vector<Label> const& labels,
+                              std::vector<Label>&& labels,
                               std::vector<MaterialId> const& materials)
 {
     CELER_EXPECT(materials.size() == labels.size());

From 3bdf1667e087e9b02aff1429c057c2ae5dcd34ad Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Thu, 28 Nov 2024 19:40:39 -0800
Subject: [PATCH 11/13] enable a few more checks

---
 .clang-tidy                                  | 13 ++++++++++---
 app/celer-dump-data.cc                       |  2 +-
 app/celer-g4/GeantDiagnostics.cc             |  2 +-
 app/celer-g4/SensitiveHit.cc                 |  5 +----
 src/celeritas/mat/MaterialParams.cc          |  1 +
 src/celeritas/phys/ImportedProcessAdapter.cc |  2 +-
 src/celeritas/phys/PrimaryGenerator.cc       |  8 ++++----
 src/celeritas/user/SimpleCalo.cc             |  1 +
 src/corecel/sys/MultiExceptionHandler.cc     |  2 +-
 src/corecel/sys/ScopedMem.cc                 |  2 +-
 src/corecel/sys/Stream.cc                    |  4 +---
 src/orange/detail/UnitInserter.cc            |  4 ++--
 src/orange/g4org/PhysicalVolumeConverter.cc  |  1 +
 src/orange/g4org/ProtoConstructor.cc         |  1 +
 src/orange/orangeinp/IntersectRegion.cc      |  2 +-
 15 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 2de890cc5a..73a4b6db18 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,9 +1,14 @@
 ---
 Checks: |
   -*
-  clang-analyzer-cplusplus.Move
-  clang-analyzer-cplusplus.NewDeleteLeaks
-  clang-analyzer-core.StackAddressEscape
+  clang-analyzer-core.*
+  clang-analyzer-deadcode.*
+  clang-analyzer-cplusplus.*
+  -clang-analyzer-cplusplus.NewDelete
+  performance-*
+  -performance-avoid-endl
+  -performance-unnecessary-value-param
+  -performance-enum-size
   cppcoreguidelines-*
   -cppcoreguidelines-owning-memory
   -cppcoreguidelines-narrowing-conversions
@@ -30,6 +35,8 @@ CheckOptions:
   cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: true
   cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove: true
   cppcoreguidelines-avoid-non-const-global-variables.AllowInternalLinkage: true
+  performance-move-const-arg.CheckTriviallyCopyableMove: false
+  performance-move-const-arg.CheckMoveToConstRef: false
 HeaderFilterRegex: ''
 FormatStyle: file
 ...
diff --git a/app/celer-dump-data.cc b/app/celer-dump-data.cc
index 07fc6fb3ba..a34340d41e 100644
--- a/app/celer-dump-data.cc
+++ b/app/celer-dump-data.cc
@@ -624,7 +624,7 @@ void print_trans_params(ImportTransParameters const& trans_params,
     for (auto const& kv : trans_params.looping)
     {
         auto pid = particles.find(PDGNumber{kv.first});
-        auto par = particles.id_to_label(pid);
+        auto const& par = particles.id_to_label(pid);
         cout << PEP_STREAM_PAR_PARAM(threshold_trials, par)
              << PEP_STREAM_PAR_PARAM(important_energy, par);
     }
diff --git a/app/celer-g4/GeantDiagnostics.cc b/app/celer-g4/GeantDiagnostics.cc
index accefa93d1..783119f38c 100644
--- a/app/celer-g4/GeantDiagnostics.cc
+++ b/app/celer-g4/GeantDiagnostics.cc
@@ -75,7 +75,7 @@ GeantDiagnostics::GeantDiagnostics(SharedParams const& params)
     CELER_LOG_LOCAL(status) << "Initializing Geant4 diagnostics";
 
     // Get output registry
-    auto output_reg = params.output_reg();
+    auto const& output_reg = params.output_reg();
     CELER_ASSERT(output_reg);
     size_type num_threads = params.num_streams();
 
diff --git a/app/celer-g4/SensitiveHit.cc b/app/celer-g4/SensitiveHit.cc
index 042d51586a..33099ce733 100644
--- a/app/celer-g4/SensitiveHit.cc
+++ b/app/celer-g4/SensitiveHit.cc
@@ -37,10 +37,7 @@ auto SensitiveHit::allocator() -> HitAllocator&
 /*!
  * Construct with hit data.
  */
-SensitiveHit::SensitiveHit(EventHitData const& hit)
-    : G4VHit(), data_{std::move(hit)}
-{
-}
+SensitiveHit::SensitiveHit(EventHitData const& hit) : G4VHit(), data_{hit} {}
 
 //---------------------------------------------------------------------------//
 }  // namespace app
diff --git a/src/celeritas/mat/MaterialParams.cc b/src/celeritas/mat/MaterialParams.cc
index f92965b31f..2fe8483c77 100644
--- a/src/celeritas/mat/MaterialParams.cc
+++ b/src/celeritas/mat/MaterialParams.cc
@@ -349,6 +349,7 @@ void MaterialParams::append_element_def(ElementInput const& inp,
 
     // Isotopic data
     std::vector<ElIsotopeComponent> vec_eic;
+    vec_eic.reserve(inp.isotopes_fractions.size());
     for (auto const& key : inp.isotopes_fractions)
     {
         vec_eic.push_back(ElIsotopeComponent{key.first, key.second});
diff --git a/src/celeritas/phys/ImportedProcessAdapter.cc b/src/celeritas/phys/ImportedProcessAdapter.cc
index 12d0a7d993..c844fe1eb9 100644
--- a/src/celeritas/phys/ImportedProcessAdapter.cc
+++ b/src/celeritas/phys/ImportedProcessAdapter.cc
@@ -203,7 +203,7 @@ auto ImportedProcessAdapter::step_limits(Applicability const& applic) const
 {
     try
     {
-        return this->step_limits_impl(std::move(applic));
+        return this->step_limits_impl(applic);
     }
     catch (...)
     {
diff --git a/src/celeritas/phys/PrimaryGenerator.cc b/src/celeritas/phys/PrimaryGenerator.cc
index abbcf3749b..ba88751c9f 100644
--- a/src/celeritas/phys/PrimaryGenerator.cc
+++ b/src/celeritas/phys/PrimaryGenerator.cc
@@ -33,7 +33,7 @@ PrimaryGenerator::from_options(SPConstParticles particles,
 
     PrimaryGenerator::Input inp;
     inp.seed = opts.seed;
-    inp.pdg = std::move(opts.pdg);
+    inp.pdg = opts.pdg;
     inp.num_events = opts.num_events;
     inp.primaries_per_event = opts.primaries_per_event;
     inp.sample_energy = make_energy_sampler(opts.energy);
@@ -49,9 +49,9 @@ PrimaryGenerator::from_options(SPConstParticles particles,
 PrimaryGenerator::PrimaryGenerator(SPConstParticles particles, Input const& inp)
     : num_events_(inp.num_events)
     , primaries_per_event_(inp.primaries_per_event)
-    , sample_energy_(std::move(inp.sample_energy))
-    , sample_pos_(std::move(inp.sample_pos))
-    , sample_dir_(std::move(inp.sample_dir))
+    , sample_energy_(inp.sample_energy)
+    , sample_pos_(inp.sample_pos)
+    , sample_dir_(inp.sample_dir)
 {
     CELER_EXPECT(particles);
 
diff --git a/src/celeritas/user/SimpleCalo.cc b/src/celeritas/user/SimpleCalo.cc
index e6b3f4760b..c8b0a1663e 100644
--- a/src/celeritas/user/SimpleCalo.cc
+++ b/src/celeritas/user/SimpleCalo.cc
@@ -128,6 +128,7 @@ void SimpleCalo::output(JsonPimpl* j) const
     // Save detector volumes
     {
         std::vector<int> ids;
+        ids.reserve(volume_ids_.size());
         for (VolumeId vid : volume_ids_)
         {
             ids.push_back(static_cast<int>(vid.get()));
diff --git a/src/corecel/sys/MultiExceptionHandler.cc b/src/corecel/sys/MultiExceptionHandler.cc
index 68f2ebe560..a4d7356c26 100644
--- a/src/corecel/sys/MultiExceptionHandler.cc
+++ b/src/corecel/sys/MultiExceptionHandler.cc
@@ -80,7 +80,7 @@ namespace detail
 {
     CELER_EXPECT(!exceptions_.empty());
 
-    for (auto eptr : exceptions_)
+    for (auto const& eptr : exceptions_)
     {
         try
         {
diff --git a/src/corecel/sys/ScopedMem.cc b/src/corecel/sys/ScopedMem.cc
index ba93ed4a42..543b74e310 100644
--- a/src/corecel/sys/ScopedMem.cc
+++ b/src/corecel/sys/ScopedMem.cc
@@ -120,7 +120,7 @@ ScopedMem::ScopedMem(std::string_view label, MemRegistry* registry)
  */
 // bugprone-exception-escape shouldn't be needed after we upgrade to
 // clang-tidy-18
-// NOLINTNEXTLINE(bugprone-exception-escape,cppcoreguidelines-noexcept-destructor)
+// NOLINTNEXTLINE(bugprone-exception-escape,*-noexcept-destructor)
 ScopedMem::~ScopedMem() noexcept(!CELERITAS_DEBUG)
 {
     if (registry_.value() != nullptr)
diff --git a/src/corecel/sys/Stream.cc b/src/corecel/sys/Stream.cc
index cd63e27a2b..16af5f25f6 100644
--- a/src/corecel/sys/Stream.cc
+++ b/src/corecel/sys/Stream.cc
@@ -198,7 +198,6 @@ Stream::~Stream()
  * Move construct.
  */
 Stream::Stream(Stream&& other) noexcept
-    : memory_resource_{other.memory_resource_}
 {
     this->swap(other);
 }
@@ -209,8 +208,7 @@ Stream::Stream(Stream&& other) noexcept
  */
 Stream& Stream::operator=(Stream&& other) noexcept
 {
-    Stream temp(std::move(other));
-    this->swap(temp);
+    this->swap(other);
     return *this;
 }
 
diff --git a/src/orange/detail/UnitInserter.cc b/src/orange/detail/UnitInserter.cc
index 7e88c2b75d..af88f49bf2 100644
--- a/src/orange/detail/UnitInserter.cc
+++ b/src/orange/detail/UnitInserter.cc
@@ -146,12 +146,12 @@ std::vector<Label> make_surface_labels(UnitInput& inp)
 
 //---------------------------------------------------------------------------//
 //! Construct volume labels from the input volumes
-std::vector<Label> make_volume_labels(UnitInput& inp)
+std::vector<Label> make_volume_labels(UnitInput const& inp)
 {
     std::vector<Label> result;
     for (auto const& v : inp.volumes)
     {
-        Label vl = std::move(v.label);
+        Label vl = v.label;
         if (vl.ext.empty())
         {
             vl.ext = inp.label.name;
diff --git a/src/orange/g4org/PhysicalVolumeConverter.cc b/src/orange/g4org/PhysicalVolumeConverter.cc
index a051c1dccf..fa4df2d7cb 100644
--- a/src/orange/g4org/PhysicalVolumeConverter.cc
+++ b/src/orange/g4org/PhysicalVolumeConverter.cc
@@ -146,6 +146,7 @@ PhysicalVolumeConverter::Builder::make_pv(int depth,
         // Replace with constituent volume, and reflect across Z.
         // See G4ReflectionFactory::CheckScale: the reflection value is
         // hardcoded to {1, 1, -1}
+        // NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores)
         g4lv = unrefl_g4lv;
         CELER_NOT_IMPLEMENTED("reflecting a placed volume");
     }
diff --git a/src/orange/g4org/ProtoConstructor.cc b/src/orange/g4org/ProtoConstructor.cc
index 0ae4d6c2af..67251bfe8b 100644
--- a/src/orange/g4org/ProtoConstructor.cc
+++ b/src/orange/g4org/ProtoConstructor.cc
@@ -38,6 +38,7 @@ SPConstObject make_explicit_background(LogicalVolume const& lv,
     using namespace orangeinp;
 
     std::vector<SPConstObject> children;
+    children.reserve(lv.children.size());
     for (auto const& child_pv : lv.children)
     {
         children.push_back(
diff --git a/src/orange/orangeinp/IntersectRegion.cc b/src/orange/orangeinp/IntersectRegion.cc
index 15e79b4ae7..59fb85e904 100644
--- a/src/orange/orangeinp/IntersectRegion.cc
+++ b/src/orange/orangeinp/IntersectRegion.cc
@@ -407,7 +407,7 @@ GenPrism GenPrism::from_trap(
  * Construct from half Z height and 1-4 vertices for top and bottom planes.
  */
 GenPrism::GenPrism(real_type halfz, VecReal2 const& lo, VecReal2 const& hi)
-    : hz_{halfz}, lo_{std::move(lo)}, hi_{std::move(hi)}
+    : hz_{halfz}, lo_{lo}, hi_{hi}
 {
     CELER_VALIDATE(hz_ > 0, << "nonpositive halfheight: " << hz_);
     CELER_VALIDATE(lo_.size() >= 3,

From 885756c1988d21b971a7f32dd3bd58b1d18fc806 Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Thu, 28 Nov 2024 21:30:59 -0800
Subject: [PATCH 12/13] fixed and remove duplicate checks

---
 .clang-tidy                                     | 3 +++
 src/accel/SharedParams.cc                       | 2 +-
 src/celeritas/ext/detail/CelerOpticalPhysics.cc | 2 ++
 src/corecel/sys/ScopedMem.cc                    | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 73a4b6db18..44d03f0fc5 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -22,6 +22,9 @@ Checks: |
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay
   -cppcoreguidelines-avoid-const-or-ref-data-members
   -cppcoreguidelines-pro-bounds-constant-array-index
+  -cppcoreguidelines-noexcept-swap
+  -cppcoreguidelines-noexcept-move-operations
+  -cppcoreguidelines-noexcept-destructor
   bugprone-*
   -bugprone-sizeof-expression
   -bugprone-narrowing-conversions
diff --git a/src/accel/SharedParams.cc b/src/accel/SharedParams.cc
index 318c426d85..57eb82e697 100644
--- a/src/accel/SharedParams.cc
+++ b/src/accel/SharedParams.cc
@@ -599,7 +599,7 @@ void SharedParams::initialize_core(SetupOptions const& options)
         asfi.cutoff = params.cutoff;
         asfi.physics = params.physics;
         asfi.imported = imported;
-        auto const along_step{options.make_along_step(asfi)};
+        auto along_step{options.make_along_step(asfi)};
         CELER_VALIDATE(along_step,
                        << "along-step factory returned a null pointer");
         return along_step;
diff --git a/src/celeritas/ext/detail/CelerOpticalPhysics.cc b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
index 41aae804ba..c8554d85cb 100644
--- a/src/celeritas/ext/detail/CelerOpticalPhysics.cc
+++ b/src/celeritas/ext/detail/CelerOpticalPhysics.cc
@@ -69,6 +69,8 @@ class ObservingUniquePtr
         : uptr_(std::move(ptr)), ptr_{uptr_.get()}
     {
     }
+    // False positive(fixed in clang-tidy-18)
+    // NOLINTNEXTLINE(performance-noexcept-move-constructor)
     CELER_DEFAULT_MOVE_DELETE_COPY(ObservingUniquePtr);
     ~ObservingUniquePtr() = default;
 
diff --git a/src/corecel/sys/ScopedMem.cc b/src/corecel/sys/ScopedMem.cc
index 543b74e310..265b4ed463 100644
--- a/src/corecel/sys/ScopedMem.cc
+++ b/src/corecel/sys/ScopedMem.cc
@@ -120,7 +120,7 @@ ScopedMem::ScopedMem(std::string_view label, MemRegistry* registry)
  */
 // bugprone-exception-escape shouldn't be needed after we upgrade to
 // clang-tidy-18
-// NOLINTNEXTLINE(bugprone-exception-escape,*-noexcept-destructor)
+// NOLINTNEXTLINE(bugprone-exception-escape,performance-noexcept-destructor)
 ScopedMem::~ScopedMem() noexcept(!CELERITAS_DEBUG)
 {
     if (registry_.value() != nullptr)

From 81d03745daba64fe9a328e76165f16c8fb6cb5cc Mon Sep 17 00:00:00 2001
From: Julien Esseiva <jesseiva@lbl.gov>
Date: Fri, 29 Nov 2024 09:29:47 -0800
Subject: [PATCH 13/13] revert

---
 src/corecel/sys/Stream.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/corecel/sys/Stream.cc b/src/corecel/sys/Stream.cc
index 16af5f25f6..4f424939c6 100644
--- a/src/corecel/sys/Stream.cc
+++ b/src/corecel/sys/Stream.cc
@@ -208,7 +208,8 @@ Stream::Stream(Stream&& other) noexcept
  */
 Stream& Stream::operator=(Stream&& other) noexcept
 {
-    this->swap(other);
+    Stream temp(std::move(other));
+    this->swap(temp);
     return *this;
 }