Move alongstep directory to top level (#1499)

celeritas-project · Nov 14, 2024 · 9879c71 · 9879c71
1 parent 8d52d45
commit 9879c71
Show file tree

Hide file tree

Showing 43 changed files with 52 additions and 52 deletions.
diff --git a/app/celer-sim/Runner.cc b/app/celer-sim/Runner.cc
@@ -30,6 +30,8 @@
 #include "corecel/sys/ScopedProfiling.hh"
 #include "celeritas/Types.hh"
 #include "celeritas/Units.hh"
+#include "celeritas/alongstep/AlongStepGeneralLinearAction.hh"
+#include "celeritas/alongstep/AlongStepUniformMscAction.hh"
 #include "celeritas/em/params/UrbanMscParams.hh"
 #include "celeritas/em/params/WentzelOKVIParams.hh"
 #include "celeritas/ext/GeantImporter.hh"
@@ -42,8 +44,6 @@
 #include "celeritas/geo/GeoMaterialParams.hh"
 #include "celeritas/geo/GeoParams.hh"  // IWYU pragma: keep
 #include "celeritas/global/CoreParams.hh"
-#include "celeritas/global/alongstep/AlongStepGeneralLinearAction.hh"
-#include "celeritas/global/alongstep/AlongStepUniformMscAction.hh"
 #include "celeritas/io/EventReader.hh"
 #include "celeritas/io/RootEventReader.hh"
 #include "celeritas/mat/MaterialParams.hh"

diff --git a/src/accel/AlongStepFactory.cc b/src/accel/AlongStepFactory.cc
@@ -13,13 +13,13 @@
 #include "corecel/math/ArrayUtils.hh"
 #include "corecel/math/QuantityIO.hh"
 #include "geocel/g4/Convert.hh"
+#include "celeritas/alongstep/AlongStepGeneralLinearAction.hh"
+#include "celeritas/alongstep/AlongStepRZMapFieldMscAction.hh"
+#include "celeritas/alongstep/AlongStepUniformMscAction.hh"
 #include "celeritas/em/params/UrbanMscParams.hh"
 #include "celeritas/ext/GeantUnits.hh"
 #include "celeritas/field/RZMapFieldInput.hh"
 #include "celeritas/field/UniformFieldData.hh"
-#include "celeritas/global/alongstep/AlongStepGeneralLinearAction.hh"
-#include "celeritas/global/alongstep/AlongStepRZMapFieldMscAction.hh"
-#include "celeritas/global/alongstep/AlongStepUniformMscAction.hh"
 #include "celeritas/io/ImportData.hh"
 
 namespace celeritas

diff --git a/src/accel/AlongStepFactory.hh b/src/accel/AlongStepFactory.hh
@@ -72,7 +72,7 @@ struct AlongStepFactoryInput
  * has the same interface.
  *
  * Celeritas provides a few "default" configurations of along-step actions in
- * `celeritas/global/alongstep`.
+ * `celeritas/alongstep`.
  */
 class AlongStepFactoryInterface
 {

diff --git a/src/celeritas/CMakeLists.txt b/src/celeritas/CMakeLists.txt
@@ -127,7 +127,7 @@ endif()
 if(CELERITAS_USE_CUDA OR CELERITAS_USE_HIP)
   list(APPEND SOURCES
     track/detail/Filler.cu
-    global/alongstep/detail/AlongStepKernels.cu
+    alongstep/detail/AlongStepKernels.cu
   )
 endif()
 
@@ -262,6 +262,10 @@ macro(celeritas_polysource filename_we)
   celeritas_polysource_append(SOURCES ${filename_we})
 endmacro()
 
+celeritas_polysource(alongstep/AlongStepGeneralLinearAction)
+celeritas_polysource(alongstep/AlongStepNeutralAction)
+celeritas_polysource(alongstep/AlongStepUniformMscAction)
+celeritas_polysource(alongstep/AlongStepRZMapFieldMscAction)
 celeritas_polysource(em/model/BetheHeitlerModel)
 celeritas_polysource(em/model/BetheBlochModel)
 celeritas_polysource(em/model/BraggModel)
@@ -278,10 +282,6 @@ celeritas_polysource(em/model/RelativisticBremModel)
 celeritas_polysource(em/model/SeltzerBergerModel)
 celeritas_polysource(em/model/CoulombScatteringModel)
 celeritas_polysource(geo/detail/BoundaryAction)
-celeritas_polysource(global/alongstep/AlongStepGeneralLinearAction)
-celeritas_polysource(global/alongstep/AlongStepNeutralAction)
-celeritas_polysource(global/alongstep/AlongStepUniformMscAction)
-celeritas_polysource(global/alongstep/AlongStepRZMapFieldMscAction)
 celeritas_polysource(global/detail/KillActive)
 celeritas_polysource(global/detail/TrackSlotUtils)
 celeritas_polysource(neutron/model/ChipsNeutronElasticModel)

diff --git a/src/celeritas/global/alongstep/AlongStep.hh → src/celeritas/alongstep/AlongStep.hh b/src/celeritas/global/alongstep/AlongStep.hh → src/celeritas/alongstep/AlongStep.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStep.hh
+//! \file celeritas/alongstep/AlongStep.hh
 //! \brief Along-step function and helper classes
 //---------------------------------------------------------------------------//
 #pragma once

diff --git a/...alongstep/AlongStepGeneralLinearAction.cc → ...alongstep/AlongStepGeneralLinearAction.cc b/...alongstep/AlongStepGeneralLinearAction.cc → ...alongstep/AlongStepGeneralLinearAction.cc
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepGeneralLinearAction.cc
+//! \file celeritas/alongstep/AlongStepGeneralLinearAction.cc
 //---------------------------------------------------------------------------//
 #include "AlongStepGeneralLinearAction.hh"
 

diff --git a/...alongstep/AlongStepGeneralLinearAction.cu → ...alongstep/AlongStepGeneralLinearAction.cu b/...alongstep/AlongStepGeneralLinearAction.cu → ...alongstep/AlongStepGeneralLinearAction.cu
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepGeneralLinearAction.cu
+//! \file celeritas/alongstep/AlongStepGeneralLinearAction.cu
 //---------------------------------------------------------------------------//
 #include "AlongStepGeneralLinearAction.hh"
 

diff --git a/...alongstep/AlongStepGeneralLinearAction.hh → ...alongstep/AlongStepGeneralLinearAction.hh b/...alongstep/AlongStepGeneralLinearAction.hh → ...alongstep/AlongStepGeneralLinearAction.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepGeneralLinearAction.hh
+//! \file celeritas/alongstep/AlongStepGeneralLinearAction.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...lobal/alongstep/AlongStepNeutralAction.cc → ...ritas/alongstep/AlongStepNeutralAction.cc b/...lobal/alongstep/AlongStepNeutralAction.cc → ...ritas/alongstep/AlongStepNeutralAction.cc
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepNeutralAction.cc
+//! \file celeritas/alongstep/AlongStepNeutralAction.cc
 //---------------------------------------------------------------------------//
 #include "AlongStepNeutralAction.hh"
 

diff --git a/...lobal/alongstep/AlongStepNeutralAction.cu → ...ritas/alongstep/AlongStepNeutralAction.cu b/...lobal/alongstep/AlongStepNeutralAction.cu → ...ritas/alongstep/AlongStepNeutralAction.cu
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepNeutralAction.cu
+//! \file celeritas/alongstep/AlongStepNeutralAction.cu
 //---------------------------------------------------------------------------//
 #include "AlongStepNeutralAction.hh"
 

diff --git a/...lobal/alongstep/AlongStepNeutralAction.hh → ...ritas/alongstep/AlongStepNeutralAction.hh b/...lobal/alongstep/AlongStepNeutralAction.hh → ...ritas/alongstep/AlongStepNeutralAction.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepNeutralAction.hh
+//! \file celeritas/alongstep/AlongStepNeutralAction.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...alongstep/AlongStepRZMapFieldMscAction.cc → ...alongstep/AlongStepRZMapFieldMscAction.cc b/...alongstep/AlongStepRZMapFieldMscAction.cc → ...alongstep/AlongStepRZMapFieldMscAction.cc
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepRZMapFieldMscAction.cc
+//! \file celeritas/alongstep/AlongStepRZMapFieldMscAction.cc
 //---------------------------------------------------------------------------//
 #include "AlongStepRZMapFieldMscAction.hh"
 

diff --git a/...alongstep/AlongStepRZMapFieldMscAction.cu → ...alongstep/AlongStepRZMapFieldMscAction.cu b/...alongstep/AlongStepRZMapFieldMscAction.cu → ...alongstep/AlongStepRZMapFieldMscAction.cu
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepRZMapFieldMscAction.cu
+//! \file celeritas/alongstep/AlongStepRZMapFieldMscAction.cu
 //---------------------------------------------------------------------------//
 #include "AlongStepRZMapFieldMscAction.hh"
 

diff --git a/...alongstep/AlongStepRZMapFieldMscAction.hh → ...alongstep/AlongStepRZMapFieldMscAction.hh b/...alongstep/AlongStepRZMapFieldMscAction.hh → ...alongstep/AlongStepRZMapFieldMscAction.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepRZMapFieldMscAction.hh
+//! \file celeritas/alongstep/AlongStepRZMapFieldMscAction.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...al/alongstep/AlongStepUniformMscAction.cc → ...as/alongstep/AlongStepUniformMscAction.cc b/...al/alongstep/AlongStepUniformMscAction.cc → ...as/alongstep/AlongStepUniformMscAction.cc
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepUniformMscAction.cc
+//! \file celeritas/alongstep/AlongStepUniformMscAction.cc
 //---------------------------------------------------------------------------//
 #include "AlongStepUniformMscAction.hh"
 

diff --git a/...al/alongstep/AlongStepUniformMscAction.cu → ...as/alongstep/AlongStepUniformMscAction.cu b/...al/alongstep/AlongStepUniformMscAction.cu → ...as/alongstep/AlongStepUniformMscAction.cu
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepUniformMscAction.cu
+//! \file celeritas/alongstep/AlongStepUniformMscAction.cu
 //---------------------------------------------------------------------------//
 #include "AlongStepUniformMscAction.hh"
 

diff --git a/...al/alongstep/AlongStepUniformMscAction.hh → ...as/alongstep/AlongStepUniformMscAction.hh b/...al/alongstep/AlongStepUniformMscAction.hh → ...as/alongstep/AlongStepUniformMscAction.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/AlongStepUniformMscAction.hh
+//! \file celeritas/alongstep/AlongStepUniformMscAction.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...obal/alongstep/detail/AlongStepKernels.cu → ...itas/alongstep/detail/AlongStepKernels.cu b/...obal/alongstep/detail/AlongStepKernels.cu → ...itas/alongstep/detail/AlongStepKernels.cu
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/AlongStepKernels.cu
+//! \file celeritas/alongstep/detail/AlongStepKernels.cu
 //---------------------------------------------------------------------------//
 #include "AlongStepKernels.hh"
 

diff --git a/...obal/alongstep/detail/AlongStepKernels.hh → ...itas/alongstep/detail/AlongStepKernels.hh b/...obal/alongstep/detail/AlongStepKernels.hh → ...itas/alongstep/detail/AlongStepKernels.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/AlongStepKernels.hh
+//! \file celeritas/alongstep/detail/AlongStepKernels.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/.../alongstep/detail/AlongStepNeutralImpl.hh → .../alongstep/detail/AlongStepNeutralImpl.hh b/.../alongstep/detail/AlongStepNeutralImpl.hh → .../alongstep/detail/AlongStepNeutralImpl.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/AlongStepNeutralImpl.hh
+//! \file celeritas/alongstep/detail/AlongStepNeutralImpl.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...s/global/alongstep/detail/ElossApplier.hh → ...eleritas/alongstep/detail/ElossApplier.hh b/...s/global/alongstep/detail/ElossApplier.hh → ...eleritas/alongstep/detail/ElossApplier.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/ElossApplier.hh
+//! \file celeritas/alongstep/detail/ElossApplier.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...tas/global/alongstep/detail/FluctELoss.hh → src/celeritas/alongstep/detail/FluctELoss.hh b/...tas/global/alongstep/detail/FluctELoss.hh → src/celeritas/alongstep/detail/FluctELoss.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/FluctELoss.hh
+//! \file celeritas/alongstep/detail/FluctELoss.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...ongstep/detail/LinearPropagatorFactory.hh → ...ongstep/detail/LinearPropagatorFactory.hh b/...ongstep/detail/LinearPropagatorFactory.hh → ...ongstep/detail/LinearPropagatorFactory.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/LinearPropagatorFactory.hh
+//! \file celeritas/alongstep/detail/LinearPropagatorFactory.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...itas/global/alongstep/detail/MeanELoss.hh → src/celeritas/alongstep/detail/MeanELoss.hh b/...itas/global/alongstep/detail/MeanELoss.hh → src/celeritas/alongstep/detail/MeanELoss.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/MeanELoss.hh
+//! \file celeritas/alongstep/detail/MeanELoss.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...tas/global/alongstep/detail/MscApplier.hh → src/celeritas/alongstep/detail/MscApplier.hh b/...tas/global/alongstep/detail/MscApplier.hh → src/celeritas/alongstep/detail/MscApplier.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/MscApplier.hh
+//! \file celeritas/alongstep/detail/MscApplier.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...l/alongstep/detail/MscStepLimitApplier.hh → ...s/alongstep/detail/MscStepLimitApplier.hh b/...l/alongstep/detail/MscStepLimitApplier.hh → ...s/alongstep/detail/MscStepLimitApplier.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/MscStepLimitApplier.hh
+//! \file celeritas/alongstep/detail/MscStepLimitApplier.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...al/alongstep/detail/PropagationApplier.hh → ...as/alongstep/detail/PropagationApplier.hh b/...al/alongstep/detail/PropagationApplier.hh → ...as/alongstep/detail/PropagationApplier.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/PropagationApplier.hh
+//! \file celeritas/alongstep/detail/PropagationApplier.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...tep/detail/RZMapFieldPropagatorFactory.hh → ...tep/detail/RZMapFieldPropagatorFactory.hh b/...tep/detail/RZMapFieldPropagatorFactory.hh → ...tep/detail/RZMapFieldPropagatorFactory.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/RZMapFieldPropagatorFactory.hh
+//! \file celeritas/alongstep/detail/RZMapFieldPropagatorFactory.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...as/global/alongstep/detail/TimeUpdater.hh → ...celeritas/alongstep/detail/TimeUpdater.hh b/...as/global/alongstep/detail/TimeUpdater.hh → ...celeritas/alongstep/detail/TimeUpdater.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/TimeUpdater.hh
+//! \file celeritas/alongstep/detail/TimeUpdater.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...s/global/alongstep/detail/TrackUpdater.hh → ...eleritas/alongstep/detail/TrackUpdater.hh b/...s/global/alongstep/detail/TrackUpdater.hh → ...eleritas/alongstep/detail/TrackUpdater.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/TrackUpdater.hh
+//! \file celeritas/alongstep/detail/TrackUpdater.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/...p/detail/UniformFieldPropagatorFactory.hh → ...p/detail/UniformFieldPropagatorFactory.hh b/...p/detail/UniformFieldPropagatorFactory.hh → ...p/detail/UniformFieldPropagatorFactory.hh
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/alongstep/detail/UniformFieldPropagatorFactory.hh
+//! \file celeritas/alongstep/detail/UniformFieldPropagatorFactory.hh
 //---------------------------------------------------------------------------//
 #pragma once
 

diff --git a/src/celeritas/global/CoreParams.cc b/src/celeritas/global/CoreParams.cc
@@ -33,6 +33,7 @@
 #include "corecel/sys/MpiCommunicator.hh"
 #include "corecel/sys/ScopedMem.hh"
 #include "geocel/GeoParamsOutput.hh"
+#include "celeritas/alongstep/AlongStepNeutralAction.hh"
 #include "celeritas/em/params/WentzelOKVIParams.hh"
 #include "celeritas/geo/GeoMaterialParams.hh"  // IWYU pragma: keep
 #include "celeritas/geo/GeoParams.hh"  // IWYU pragma: keep
@@ -54,7 +55,6 @@
 #include "celeritas/track/TrackInitParams.hh"  // IWYU pragma: keep
 
 #include "ActionInterface.hh"
-#include "alongstep/AlongStepNeutralAction.hh"
 
 #if CELERITAS_CORE_GEO == CELERITAS_CORE_GEO_ORANGE
 #    include "orange/OrangeParams.hh"

diff --git a/test/celeritas/GeantTestBase.cc b/test/celeritas/GeantTestBase.cc
@@ -15,12 +15,12 @@
 #include "corecel/io/StringUtils.hh"
 #include "corecel/sys/ActionRegistry.hh"
 #include "geocel/ScopedGeantExceptionHandler.hh"
+#include "celeritas/alongstep/AlongStepGeneralLinearAction.hh"
 #include "celeritas/em/params/UrbanMscParams.hh"
 #include "celeritas/ext/GeantImporter.hh"
 #include "celeritas/ext/GeantPhysicsOptions.hh"
 #include "celeritas/ext/GeantSetup.hh"
 #include "celeritas/geo/GeoParams.hh"
-#include "celeritas/global/alongstep/AlongStepGeneralLinearAction.hh"
 #include "celeritas/io/ImportData.hh"
 #include "celeritas/track/TrackInitParams.hh"
 

diff --git a/test/celeritas/MockTestBase.cc b/test/celeritas/MockTestBase.cc
@@ -9,8 +9,8 @@
 
 #include "corecel/math/Algorithms.hh"
 #include "corecel/sys/ActionRegistry.hh"
+#include "celeritas/alongstep/AlongStepGeneralLinearAction.hh"
 #include "celeritas/geo/GeoMaterialParams.hh"
-#include "celeritas/global/alongstep/AlongStepGeneralLinearAction.hh"
 #include "celeritas/mat/MaterialParams.hh"
 #include "celeritas/phys/CutoffParams.hh"
 #include "celeritas/phys/ParticleParams.hh"

diff --git a/test/celeritas/SimpleTestBase.cc b/test/celeritas/SimpleTestBase.cc
@@ -9,10 +9,10 @@
 
 #include "corecel/sys/ActionRegistry.hh"
 #include "celeritas/Quantities.hh"
+#include "celeritas/alongstep/AlongStepNeutralAction.hh"
 #include "celeritas/em/params/WentzelOKVIParams.hh"
 #include "celeritas/em/process/ComptonProcess.hh"
 #include "celeritas/geo/GeoMaterialParams.hh"
-#include "celeritas/global/alongstep/AlongStepNeutralAction.hh"
 #include "celeritas/io/ImportProcess.hh"
 #include "celeritas/io/detail/ImportDataConverter.hh"
 #include "celeritas/mat/MaterialParams.hh"

diff --git a/test/celeritas/global/AlongStep.test.cc b/test/celeritas/global/AlongStep.test.cc
@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 //---------------------------------------------------------------------------//
-//! \file celeritas/global/AlongStep.test.cc
+//! \file celeritas/alongstep.test.cc
 //---------------------------------------------------------------------------//
 #include <fstream>
 
@@ -16,12 +16,12 @@
 #include "celeritas/LeadBoxTestBase.hh"
 #include "celeritas/SimpleCmsTestBase.hh"
 #include "celeritas/TestEm3Base.hh"
+#include "celeritas/alongstep/AlongStepRZMapFieldMscAction.hh"
+#include "celeritas/alongstep/AlongStepUniformMscAction.hh"
 #include "celeritas/em/params/UrbanMscParams.hh"
 #include "celeritas/ext/GeantPhysicsOptions.hh"
 #include "celeritas/field/RZMapFieldInput.hh"
 #include "celeritas/field/UniformFieldData.hh"
-#include "celeritas/global/alongstep/AlongStepRZMapFieldMscAction.hh"
-#include "celeritas/global/alongstep/AlongStepUniformMscAction.hh"
 #include "celeritas/phys/PDGNumber.hh"
 #include "celeritas/phys/ParticleParams.hh"