From 36a67f19a5ff3df7016889fd5ea26270d740e34b Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Thu, 14 Nov 2024 12:38:21 -0500 Subject: [PATCH] Move `alongstep` directory to top level (#1499) --- app/celer-sim/Runner.cc | 4 ++-- src/accel/AlongStepFactory.cc | 6 +++--- src/accel/AlongStepFactory.hh | 2 +- src/celeritas/CMakeLists.txt | 10 +++++----- src/celeritas/{global => }/alongstep/AlongStep.hh | 2 +- .../alongstep/AlongStepGeneralLinearAction.cc | 2 +- .../alongstep/AlongStepGeneralLinearAction.cu | 2 +- .../alongstep/AlongStepGeneralLinearAction.hh | 2 +- .../{global => }/alongstep/AlongStepNeutralAction.cc | 2 +- .../{global => }/alongstep/AlongStepNeutralAction.cu | 2 +- .../{global => }/alongstep/AlongStepNeutralAction.hh | 2 +- .../alongstep/AlongStepRZMapFieldMscAction.cc | 2 +- .../alongstep/AlongStepRZMapFieldMscAction.cu | 2 +- .../alongstep/AlongStepRZMapFieldMscAction.hh | 2 +- .../alongstep/AlongStepUniformMscAction.cc | 2 +- .../alongstep/AlongStepUniformMscAction.cu | 2 +- .../alongstep/AlongStepUniformMscAction.hh | 2 +- .../{global => }/alongstep/detail/AlongStepKernels.cu | 2 +- .../{global => }/alongstep/detail/AlongStepKernels.hh | 2 +- .../alongstep/detail/AlongStepNeutralImpl.hh | 2 +- .../{global => }/alongstep/detail/ElossApplier.hh | 2 +- .../{global => }/alongstep/detail/FluctELoss.hh | 2 +- .../alongstep/detail/LinearPropagatorFactory.hh | 2 +- .../{global => }/alongstep/detail/MeanELoss.hh | 2 +- .../{global => }/alongstep/detail/MscApplier.hh | 2 +- .../alongstep/detail/MscStepLimitApplier.hh | 2 +- .../alongstep/detail/PropagationApplier.hh | 2 +- .../alongstep/detail/RZMapFieldPropagatorFactory.hh | 2 +- .../{global => }/alongstep/detail/TimeUpdater.hh | 2 +- .../{global => }/alongstep/detail/TrackUpdater.hh | 2 +- .../alongstep/detail/UniformFieldPropagatorFactory.hh | 2 +- src/celeritas/global/CoreParams.cc | 2 +- test/celeritas/GeantTestBase.cc | 2 +- test/celeritas/MockTestBase.cc | 2 +- test/celeritas/SimpleTestBase.cc | 2 +- test/celeritas/global/AlongStep.test.cc | 6 +++--- test/celeritas/global/AlongStepTestBase.cc | 2 +- test/celeritas/global/AlongStepTestBase.hh | 2 +- test/celeritas/global/Stepper.test.cc | 2 +- test/celeritas/global/StepperGeant.test.cc | 2 +- test/celeritas/optical/OpticalCollector.test.cc | 2 +- test/celeritas/user/Diagnostic.test.cc | 2 +- test/celeritas/user/StepCollector.test.cc | 2 +- 43 files changed, 52 insertions(+), 52 deletions(-) rename src/celeritas/{global => }/alongstep/AlongStep.hh (97%) rename src/celeritas/{global => }/alongstep/AlongStepGeneralLinearAction.cc (98%) rename src/celeritas/{global => }/alongstep/AlongStepGeneralLinearAction.cu (96%) rename src/celeritas/{global => }/alongstep/AlongStepGeneralLinearAction.hh (98%) rename src/celeritas/{global => }/alongstep/AlongStepNeutralAction.cc (97%) rename src/celeritas/{global => }/alongstep/AlongStepNeutralAction.cu (95%) rename src/celeritas/{global => }/alongstep/AlongStepNeutralAction.hh (96%) rename src/celeritas/{global => }/alongstep/AlongStepRZMapFieldMscAction.cc (98%) rename src/celeritas/{global => }/alongstep/AlongStepRZMapFieldMscAction.cu (97%) rename src/celeritas/{global => }/alongstep/AlongStepRZMapFieldMscAction.hh (97%) rename src/celeritas/{global => }/alongstep/AlongStepUniformMscAction.cc (98%) rename src/celeritas/{global => }/alongstep/AlongStepUniformMscAction.cu (97%) rename src/celeritas/{global => }/alongstep/AlongStepUniformMscAction.hh (97%) rename src/celeritas/{global => }/alongstep/detail/AlongStepKernels.cu (99%) rename src/celeritas/{global => }/alongstep/detail/AlongStepKernels.hh (97%) rename src/celeritas/{global => }/alongstep/detail/AlongStepNeutralImpl.hh (96%) rename src/celeritas/{global => }/alongstep/detail/ElossApplier.hh (98%) rename src/celeritas/{global => }/alongstep/detail/FluctELoss.hh (99%) rename src/celeritas/{global => }/alongstep/detail/LinearPropagatorFactory.hh (94%) rename src/celeritas/{global => }/alongstep/detail/MeanELoss.hh (98%) rename src/celeritas/{global => }/alongstep/detail/MscApplier.hh (97%) rename src/celeritas/{global => }/alongstep/detail/MscStepLimitApplier.hh (96%) rename src/celeritas/{global => }/alongstep/detail/PropagationApplier.hh (99%) rename src/celeritas/{global => }/alongstep/detail/RZMapFieldPropagatorFactory.hh (95%) rename src/celeritas/{global => }/alongstep/detail/TimeUpdater.hh (96%) rename src/celeritas/{global => }/alongstep/detail/TrackUpdater.hh (98%) rename src/celeritas/{global => }/alongstep/detail/UniformFieldPropagatorFactory.hh (95%) diff --git a/app/celer-sim/Runner.cc b/app/celer-sim/Runner.cc index d7dab5d20e..c68e666196 100644 --- 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 index 8267295167..b05f2cf622 100644 --- 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 index 82413e2f68..7e45177cc1 100644 --- 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 index 65ec986f16..0d28add4ed 100644 --- a/src/celeritas/CMakeLists.txt +++ b/src/celeritas/CMakeLists.txt @@ -128,7 +128,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() @@ -263,6 +263,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) @@ -279,10 +283,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 b/src/celeritas/alongstep/AlongStep.hh similarity index 97% rename from src/celeritas/global/alongstep/AlongStep.hh rename to src/celeritas/alongstep/AlongStep.hh index 53f05434d4..759d687b62 100644 --- a/src/celeritas/global/alongstep/AlongStep.hh +++ b/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/src/celeritas/global/alongstep/AlongStepGeneralLinearAction.cc b/src/celeritas/alongstep/AlongStepGeneralLinearAction.cc similarity index 98% rename from src/celeritas/global/alongstep/AlongStepGeneralLinearAction.cc rename to src/celeritas/alongstep/AlongStepGeneralLinearAction.cc index 79298f825a..03cb4f300c 100644 --- a/src/celeritas/global/alongstep/AlongStepGeneralLinearAction.cc +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepGeneralLinearAction.cu b/src/celeritas/alongstep/AlongStepGeneralLinearAction.cu similarity index 96% rename from src/celeritas/global/alongstep/AlongStepGeneralLinearAction.cu rename to src/celeritas/alongstep/AlongStepGeneralLinearAction.cu index 8d77bcb0da..fff80fbd16 100644 --- a/src/celeritas/global/alongstep/AlongStepGeneralLinearAction.cu +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepGeneralLinearAction.hh b/src/celeritas/alongstep/AlongStepGeneralLinearAction.hh similarity index 98% rename from src/celeritas/global/alongstep/AlongStepGeneralLinearAction.hh rename to src/celeritas/alongstep/AlongStepGeneralLinearAction.hh index 5d20a357bd..54b9e27366 100644 --- a/src/celeritas/global/alongstep/AlongStepGeneralLinearAction.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepNeutralAction.cc b/src/celeritas/alongstep/AlongStepNeutralAction.cc similarity index 97% rename from src/celeritas/global/alongstep/AlongStepNeutralAction.cc rename to src/celeritas/alongstep/AlongStepNeutralAction.cc index 8b8639c0c3..3538a97c3f 100644 --- a/src/celeritas/global/alongstep/AlongStepNeutralAction.cc +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepNeutralAction.cu b/src/celeritas/alongstep/AlongStepNeutralAction.cu similarity index 95% rename from src/celeritas/global/alongstep/AlongStepNeutralAction.cu rename to src/celeritas/alongstep/AlongStepNeutralAction.cu index 2e75e600de..4c314a67ee 100644 --- a/src/celeritas/global/alongstep/AlongStepNeutralAction.cu +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepNeutralAction.hh b/src/celeritas/alongstep/AlongStepNeutralAction.hh similarity index 96% rename from src/celeritas/global/alongstep/AlongStepNeutralAction.hh rename to src/celeritas/alongstep/AlongStepNeutralAction.hh index 8b8d61cd86..a42a85cd60 100644 --- a/src/celeritas/global/alongstep/AlongStepNeutralAction.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepRZMapFieldMscAction.cc b/src/celeritas/alongstep/AlongStepRZMapFieldMscAction.cc similarity index 98% rename from src/celeritas/global/alongstep/AlongStepRZMapFieldMscAction.cc rename to src/celeritas/alongstep/AlongStepRZMapFieldMscAction.cc index 5da2cb2390..58ddcc6e03 100644 --- a/src/celeritas/global/alongstep/AlongStepRZMapFieldMscAction.cc +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepRZMapFieldMscAction.cu b/src/celeritas/alongstep/AlongStepRZMapFieldMscAction.cu similarity index 97% rename from src/celeritas/global/alongstep/AlongStepRZMapFieldMscAction.cu rename to src/celeritas/alongstep/AlongStepRZMapFieldMscAction.cu index 1edf0d4dcc..a2092cd0e7 100644 --- a/src/celeritas/global/alongstep/AlongStepRZMapFieldMscAction.cu +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepRZMapFieldMscAction.hh b/src/celeritas/alongstep/AlongStepRZMapFieldMscAction.hh similarity index 97% rename from src/celeritas/global/alongstep/AlongStepRZMapFieldMscAction.hh rename to src/celeritas/alongstep/AlongStepRZMapFieldMscAction.hh index 984404db50..1854ebceff 100644 --- a/src/celeritas/global/alongstep/AlongStepRZMapFieldMscAction.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepUniformMscAction.cc b/src/celeritas/alongstep/AlongStepUniformMscAction.cc similarity index 98% rename from src/celeritas/global/alongstep/AlongStepUniformMscAction.cc rename to src/celeritas/alongstep/AlongStepUniformMscAction.cc index f66a9a8e79..69548fc9fe 100644 --- a/src/celeritas/global/alongstep/AlongStepUniformMscAction.cc +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepUniformMscAction.cu b/src/celeritas/alongstep/AlongStepUniformMscAction.cu similarity index 97% rename from src/celeritas/global/alongstep/AlongStepUniformMscAction.cu rename to src/celeritas/alongstep/AlongStepUniformMscAction.cu index cbe6887f20..efeb0a5577 100644 --- a/src/celeritas/global/alongstep/AlongStepUniformMscAction.cu +++ b/src/celeritas/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/src/celeritas/global/alongstep/AlongStepUniformMscAction.hh b/src/celeritas/alongstep/AlongStepUniformMscAction.hh similarity index 97% rename from src/celeritas/global/alongstep/AlongStepUniformMscAction.hh rename to src/celeritas/alongstep/AlongStepUniformMscAction.hh index b85d8dd062..6ce1f097e3 100644 --- a/src/celeritas/global/alongstep/AlongStepUniformMscAction.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/detail/AlongStepKernels.cu b/src/celeritas/alongstep/detail/AlongStepKernels.cu similarity index 99% rename from src/celeritas/global/alongstep/detail/AlongStepKernels.cu rename to src/celeritas/alongstep/detail/AlongStepKernels.cu index 2928d96d18..a6f90a08b5 100644 --- a/src/celeritas/global/alongstep/detail/AlongStepKernels.cu +++ b/src/celeritas/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/src/celeritas/global/alongstep/detail/AlongStepKernels.hh b/src/celeritas/alongstep/detail/AlongStepKernels.hh similarity index 97% rename from src/celeritas/global/alongstep/detail/AlongStepKernels.hh rename to src/celeritas/alongstep/detail/AlongStepKernels.hh index 0c19077c5f..2a0b7f62c2 100644 --- a/src/celeritas/global/alongstep/detail/AlongStepKernels.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/detail/AlongStepNeutralImpl.hh b/src/celeritas/alongstep/detail/AlongStepNeutralImpl.hh similarity index 96% rename from src/celeritas/global/alongstep/detail/AlongStepNeutralImpl.hh rename to src/celeritas/alongstep/detail/AlongStepNeutralImpl.hh index eff9a5797c..cf7b92d0e1 100644 --- a/src/celeritas/global/alongstep/detail/AlongStepNeutralImpl.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/detail/ElossApplier.hh b/src/celeritas/alongstep/detail/ElossApplier.hh similarity index 98% rename from src/celeritas/global/alongstep/detail/ElossApplier.hh rename to src/celeritas/alongstep/detail/ElossApplier.hh index 266fe2488a..1373b45df7 100644 --- a/src/celeritas/global/alongstep/detail/ElossApplier.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/detail/FluctELoss.hh b/src/celeritas/alongstep/detail/FluctELoss.hh similarity index 99% rename from src/celeritas/global/alongstep/detail/FluctELoss.hh rename to src/celeritas/alongstep/detail/FluctELoss.hh index 739e2ed8e7..f2c33b967a 100644 --- a/src/celeritas/global/alongstep/detail/FluctELoss.hh +++ b/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/src/celeritas/global/alongstep/detail/LinearPropagatorFactory.hh b/src/celeritas/alongstep/detail/LinearPropagatorFactory.hh similarity index 94% rename from src/celeritas/global/alongstep/detail/LinearPropagatorFactory.hh rename to src/celeritas/alongstep/detail/LinearPropagatorFactory.hh index 7dc3edcd5f..ca967248a3 100644 --- a/src/celeritas/global/alongstep/detail/LinearPropagatorFactory.hh +++ b/src/celeritas/alongstep/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/src/celeritas/global/alongstep/detail/MeanELoss.hh b/src/celeritas/alongstep/detail/MeanELoss.hh similarity index 98% rename from src/celeritas/global/alongstep/detail/MeanELoss.hh rename to src/celeritas/alongstep/detail/MeanELoss.hh index 2330d49bfd..ea9042ad0e 100644 --- a/src/celeritas/global/alongstep/detail/MeanELoss.hh +++ b/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/src/celeritas/global/alongstep/detail/MscApplier.hh b/src/celeritas/alongstep/detail/MscApplier.hh similarity index 97% rename from src/celeritas/global/alongstep/detail/MscApplier.hh rename to src/celeritas/alongstep/detail/MscApplier.hh index 2cbeda92fc..34537a5cdb 100644 --- a/src/celeritas/global/alongstep/detail/MscApplier.hh +++ b/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/src/celeritas/global/alongstep/detail/MscStepLimitApplier.hh b/src/celeritas/alongstep/detail/MscStepLimitApplier.hh similarity index 96% rename from src/celeritas/global/alongstep/detail/MscStepLimitApplier.hh rename to src/celeritas/alongstep/detail/MscStepLimitApplier.hh index c3f55ffea7..acae26e5e1 100644 --- a/src/celeritas/global/alongstep/detail/MscStepLimitApplier.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/detail/PropagationApplier.hh b/src/celeritas/alongstep/detail/PropagationApplier.hh similarity index 99% rename from src/celeritas/global/alongstep/detail/PropagationApplier.hh rename to src/celeritas/alongstep/detail/PropagationApplier.hh index d69d77ab63..8b48751329 100644 --- a/src/celeritas/global/alongstep/detail/PropagationApplier.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/detail/RZMapFieldPropagatorFactory.hh b/src/celeritas/alongstep/detail/RZMapFieldPropagatorFactory.hh similarity index 95% rename from src/celeritas/global/alongstep/detail/RZMapFieldPropagatorFactory.hh rename to src/celeritas/alongstep/detail/RZMapFieldPropagatorFactory.hh index 6cd454cb08..cd4d7b8505 100644 --- a/src/celeritas/global/alongstep/detail/RZMapFieldPropagatorFactory.hh +++ b/src/celeritas/alongstep/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/src/celeritas/global/alongstep/detail/TimeUpdater.hh b/src/celeritas/alongstep/detail/TimeUpdater.hh similarity index 96% rename from src/celeritas/global/alongstep/detail/TimeUpdater.hh rename to src/celeritas/alongstep/detail/TimeUpdater.hh index 9510dcdab6..d3807a2a79 100644 --- a/src/celeritas/global/alongstep/detail/TimeUpdater.hh +++ b/src/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/src/celeritas/global/alongstep/detail/TrackUpdater.hh b/src/celeritas/alongstep/detail/TrackUpdater.hh similarity index 98% rename from src/celeritas/global/alongstep/detail/TrackUpdater.hh rename to src/celeritas/alongstep/detail/TrackUpdater.hh index 25ad1c823d..59c868589d 100644 --- a/src/celeritas/global/alongstep/detail/TrackUpdater.hh +++ b/src/celeritas/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/src/celeritas/global/alongstep/detail/UniformFieldPropagatorFactory.hh b/src/celeritas/alongstep/detail/UniformFieldPropagatorFactory.hh similarity index 95% rename from src/celeritas/global/alongstep/detail/UniformFieldPropagatorFactory.hh rename to src/celeritas/alongstep/detail/UniformFieldPropagatorFactory.hh index 8936350fd6..6c6566ec50 100644 --- a/src/celeritas/global/alongstep/detail/UniformFieldPropagatorFactory.hh +++ b/src/celeritas/alongstep/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 index 6a5d122061..df806640f7 100644 --- 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 index 5738cc4794..a1baf559cb 100644 --- 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 index a8fc2ed242..e70e86bf16 100644 --- 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 index 249626f7a2..93596ebd27 100644 --- 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 index 21c6180152..9fc5eb2dae 100644 --- 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 @@ -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" diff --git a/test/celeritas/global/AlongStepTestBase.cc b/test/celeritas/global/AlongStepTestBase.cc index bbe77e1db5..03dbe7e8d3 100644 --- a/test/celeritas/global/AlongStepTestBase.cc +++ b/test/celeritas/global/AlongStepTestBase.cc @@ -3,7 +3,7 @@ // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: (Apache-2.0 OR MIT) //---------------------------------------------------------------------------// -//! \file celeritas/global/AlongStepTestBase.cc +//! \file celeritas/alongstepTestBase.cc //---------------------------------------------------------------------------// #include "AlongStepTestBase.hh" diff --git a/test/celeritas/global/AlongStepTestBase.hh b/test/celeritas/global/AlongStepTestBase.hh index e592583b2e..9ac7faa55a 100644 --- a/test/celeritas/global/AlongStepTestBase.hh +++ b/test/celeritas/global/AlongStepTestBase.hh @@ -3,7 +3,7 @@ // See the top-level COPYRIGHT file for details. // SPDX-License-Identifier: (Apache-2.0 OR MIT) //---------------------------------------------------------------------------// -//! \file celeritas/global/AlongStepTestBase.hh +//! \file celeritas/alongstepTestBase.hh //---------------------------------------------------------------------------// #pragma once diff --git a/test/celeritas/global/Stepper.test.cc b/test/celeritas/global/Stepper.test.cc index 8b6671474d..03d642d2b7 100644 --- a/test/celeritas/global/Stepper.test.cc +++ b/test/celeritas/global/Stepper.test.cc @@ -19,9 +19,9 @@ #include "corecel/io/Logger.hh" #include "corecel/sys/ActionRegistry.hh" #include "geocel/UnitUtils.hh" +#include "celeritas/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/global/CoreParams.hh" #include "celeritas/global/CoreState.hh" -#include "celeritas/global/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/phys/ParticleParams.hh" #include "celeritas/phys/Primary.hh" #include "celeritas/random/RngEngine.hh" diff --git a/test/celeritas/global/StepperGeant.test.cc b/test/celeritas/global/StepperGeant.test.cc index a2fd1ca6e2..bbeb6c92ff 100644 --- a/test/celeritas/global/StepperGeant.test.cc +++ b/test/celeritas/global/StepperGeant.test.cc @@ -12,12 +12,12 @@ #include "corecel/cont/Span.hh" #include "corecel/sys/ActionRegistry.hh" #include "geocel/UnitUtils.hh" +#include "celeritas/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/em/params/UrbanMscParams.hh" #include "celeritas/ext/GeantPhysicsOptions.hh" #include "celeritas/field/UniformFieldData.hh" #include "celeritas/global/ActionInterface.hh" #include "celeritas/global/Stepper.hh" -#include "celeritas/global/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/phys/PDGNumber.hh" #include "celeritas/phys/ParticleParams.hh" #include "celeritas/phys/Primary.hh" diff --git a/test/celeritas/optical/OpticalCollector.test.cc b/test/celeritas/optical/OpticalCollector.test.cc index 98b4310278..6d0706d807 100644 --- a/test/celeritas/optical/OpticalCollector.test.cc +++ b/test/celeritas/optical/OpticalCollector.test.cc @@ -21,9 +21,9 @@ #include "corecel/math/Algorithms.hh" #include "corecel/sys/ActionRegistry.hh" #include "geocel/UnitUtils.hh" +#include "celeritas/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/em/params/UrbanMscParams.hh" #include "celeritas/global/Stepper.hh" -#include "celeritas/global/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/optical/CoreState.hh" #include "celeritas/optical/detail/OffloadParams.hh" #include "celeritas/phys/ParticleParams.hh" diff --git a/test/celeritas/user/Diagnostic.test.cc b/test/celeritas/user/Diagnostic.test.cc index c3b64b0747..46760bba2c 100644 --- a/test/celeritas/user/Diagnostic.test.cc +++ b/test/celeritas/user/Diagnostic.test.cc @@ -11,10 +11,10 @@ #include "corecel/io/StringUtils.hh" #include "corecel/sys/ActionRegistry.hh" #include "geocel/UnitUtils.hh" +#include "celeritas/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/em/params/UrbanMscParams.hh" #include "celeritas/ext/GeantPhysicsOptions.hh" #include "celeritas/global/Stepper.hh" -#include "celeritas/global/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/phys/PDGNumber.hh" #include "celeritas/phys/ParticleParams.hh" #include "celeritas/phys/Primary.hh" diff --git a/test/celeritas/user/StepCollector.test.cc b/test/celeritas/user/StepCollector.test.cc index b3b7f65f5b..b2ca63a1fc 100644 --- a/test/celeritas/user/StepCollector.test.cc +++ b/test/celeritas/user/StepCollector.test.cc @@ -13,10 +13,10 @@ #include "corecel/io/LogContextException.hh" #include "corecel/sys/ActionRegistry.hh" #include "geocel/UnitUtils.hh" +#include "celeritas/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/em/params/UrbanMscParams.hh" #include "celeritas/geo/GeoParams.hh" #include "celeritas/global/Stepper.hh" -#include "celeritas/global/alongstep/AlongStepUniformMscAction.hh" #include "celeritas/phys/PDGNumber.hh" #include "celeritas/phys/ParticleParams.hh" #include "celeritas/phys/Primary.hh"