Fix ORANGE namespaces (celeritas-project#1117)

* Fix CSG namespaces
* Fix clang-format for detail classes
* Update git ignore revs
* Fix missing namespaces for ORANGE details

.clang-format

@@ -98,18 +98,18 @@ IncludeCategories:
     SortPriority:    9
     CaseSensitive:   true
   - Regex:           '^"[^/]+"'
-    Priority:        5
-    SortPriority:    10
-  - Regex:           '^"detail/"'
     Priority:        5
     SortPriority:    11
+  - Regex:           '^"detail/'
+    Priority:        6
+    SortPriority:    13
   - Regex:           '"(^gtest/|TestBase|\.test\.hh|celeritas_test\.hh)'
     Priority:        7
     CaseSensitive:   true
-    SortPriority:    12
+    SortPriority:    14
   - Regex:           '.*'
     Priority:        5
-    SortPriority:    13
+    SortPriority:    12 # higher than detail, lower than no-slash
 IncludeIsMainRegex: '(\.[^.]+)?$'
 IncludeIsMainSourceRegex: '(\.cu|\.t\.hh)$' # Allow CU/template files as main
 IndentCaseLabels: true

.git-blame-ignore-revs

@@ -10,6 +10,7 @@ f27dc24aac631ebfea4f487a0d122a0e69d3c083
 350a3c60a4cf34a63b342daa3de6e09de22ec06b
 638f7f9665222a1f49f9e1275d43bb8c74ce66e2
 cfc407b09185786e4b4939d3b9b720215afcc7f2
+0b805058892830cbad5aee2dd52fcc9c1bc8a09c
 # consolidate .hh, i.hh
 128b0eff32a159005019a8f18619e3630181d9d0
 d90f9cb55c0df92e36ccfd0646f9ffd1a51bbd14

src/orange/OrangeParams.cc

@@ -127,7 +127,7 @@ OrangeParams::OrangeParams(OrangeInput input)
     // Create host data for construction, setting tolerances first
     HostVal<OrangeParamsData> host_data;
     host_data.scalars.tol = input.tol;
-    host_data.scalars.max_depth = DepthCalculator{input.universes}();
+    host_data.scalars.max_depth = detail::DepthCalculator{input.universes}();
 
     // Insert all universes
     {

src/orange/OrangeTrackView.hh

@@ -14,14 +14,15 @@
 
 #include "OrangeData.hh"
 #include "OrangeTypes.hh"
-#include "detail/LevelStateAccessor.hh"
-#include "detail/UniverseIndexer.hh"
 #include "transform/TransformVisitor.hh"
 #include "univ/SimpleUnitTracker.hh"
 #include "univ/TrackerVisitor.hh"
 #include "univ/UniverseTypeTraits.hh"
 #include "univ/detail/Types.hh"
 
+#include "detail/LevelStateAccessor.hh"
+#include "detail/UniverseIndexer.hh"
+
 namespace celeritas
 {
 //---------------------------------------------------------------------------//
@@ -123,6 +124,10 @@ class OrangeTrackView
     inline CELER_FUNCTION void set_dir(Real3 const& newdir);
 
   private:
+    //// TYPES ////
+
+    using LSA = detail::LevelStateAccessor;
+
     //// DATA ////
 
     ParamsRef const& params_;
@@ -204,13 +209,13 @@ class OrangeTrackView
     inline CELER_FUNCTION void clear_surface();
 
     // Make a LevelStateAccessor for the current thread and level
-    inline CELER_FUNCTION LevelStateAccessor make_lsa() const;
+    inline CELER_FUNCTION LSA make_lsa() const;
 
     // Make a LevelStateAccessor for the current thread and a given level
-    inline CELER_FUNCTION LevelStateAccessor make_lsa(LevelId level) const;
+    inline CELER_FUNCTION LSA make_lsa(LevelId level) const;
 
     // Get the daughter ID for the volume in the universe (or null)
-    inline CELER_FUNCTION DaughterId get_daughter(LevelStateAccessor const& lsa);
+    inline CELER_FUNCTION DaughterId get_daughter(LSA const& lsa);
 
     // Get the transform ID for the given daughter.
     inline CELER_FUNCTION TransformId get_transform(DaughterId daughter_id);
@@ -1056,7 +1061,7 @@ CELER_FUNCTION void OrangeTrackView::clear_surface()
 /*!
  * Make a LevelStateAccessor for the current thread and level.
  */
-CELER_FORCEINLINE_FUNCTION LevelStateAccessor OrangeTrackView::make_lsa() const
+CELER_FORCEINLINE_FUNCTION auto OrangeTrackView::make_lsa() const -> LSA
 {
     return this->make_lsa(this->level());
 }
@@ -1065,10 +1070,10 @@ CELER_FORCEINLINE_FUNCTION LevelStateAccessor OrangeTrackView::make_lsa() const
 /*!
  * Make a LevelStateAccessor for the current thread and a given level.
  */
-CELER_FORCEINLINE_FUNCTION LevelStateAccessor
-OrangeTrackView::make_lsa(LevelId level) const
+CELER_FORCEINLINE_FUNCTION auto OrangeTrackView::make_lsa(LevelId level) const
+    -> LSA
 {
-    return LevelStateAccessor(&states_, track_slot_, level);
+    return LSA(&states_, track_slot_, level);
 }
 
 //---------------------------------------------------------------------------//
@@ -1077,8 +1082,7 @@ OrangeTrackView::make_lsa(LevelId level) const
  *
  * \return DaughterId or {} if the current volume is a leaf.
  */
-CELER_FUNCTION DaughterId
-OrangeTrackView::get_daughter(LevelStateAccessor const& lsa)
+CELER_FUNCTION DaughterId OrangeTrackView::get_daughter(LSA const& lsa)
 {
     TrackerVisitor visit_tracker{params_};
     return visit_tracker([&lsa](auto&& t) { return t.daughter(lsa.vol()); },
@@ -1102,7 +1106,7 @@ CELER_FUNCTION TransformId OrangeTrackView::get_transform(DaughterId daughter_id
 CELER_FUNCTION TransformId OrangeTrackView::get_transform(LevelId lev)
 {
     CELER_EXPECT(lev < this->level());
-    LevelStateAccessor lsa(&states_, track_slot_, lev);
+    LSA lsa(&states_, track_slot_, lev);
     return this->get_transform(this->get_daughter(lsa));
 }
 

src/orange/detail/DepthCalculator.cc

@@ -9,6 +9,8 @@
 
 namespace celeritas
 {
+namespace detail
+{
 //---------------------------------------------------------------------------//
 /*!
  * Construct with a reference to all universe inputs.
@@ -74,4 +76,5 @@ size_type DepthCalculator::operator()(UniverseId uid)
 }
 
 //---------------------------------------------------------------------------//
+}  // namespace detail
 }  // namespace celeritas

src/orange/detail/DepthCalculator.hh

@@ -16,6 +16,8 @@
 
 namespace celeritas
 {
+namespace detail
+{
 //---------------------------------------------------------------------------//
 /*!
  * Calculate the maximum number of levels deep in a geometry.
@@ -51,4 +53,5 @@ class DepthCalculator
 };
 
 //---------------------------------------------------------------------------//
+}  // namespace detail
 }  // namespace celeritas

src/orange/detail/LevelStateAccessor.hh

@@ -14,6 +14,8 @@
 
 namespace celeritas
 {
+namespace detail
+{
 //---------------------------------------------------------------------------//
 /*!
  * Accesss the 2D fields (i.e., {thread, level}) of OrangeStateData
@@ -116,4 +118,5 @@ LevelStateAccessor::operator=(LevelStateAccessor const& other)
 }
 
 //---------------------------------------------------------------------------//
+}  // namespace detail
 }  // namespace celeritas

src/orange/orangeinp/CsgTree.cc

@@ -78,8 +78,8 @@ auto CsgTree::insert(Node&& n) -> NodeId
 
     {
         // Try to simplify the node up to one level when inserting.
-        Node repl = std::visit(NodeSimplifier{*this}, n);
-        if (repl != Node{NodeSimplifier::no_simplification()})
+        Node repl = std::visit(detail::NodeSimplifier{*this}, n);
+        if (repl != Node{detail::NodeSimplifier::no_simplification()})
         {
             n = std::move(repl);
             if (auto* a = std::get_if<orangeinp::Aliased>(&n))
@@ -112,8 +112,8 @@ auto CsgTree::exchange(NodeId node_id, Node&& n) -> Node
                  && std::visit(IsUserNodeValid{node_id.unchecked_get()}, n));
 
     //! Simplify the node first
-    Node repl = std::visit(NodeSimplifier{*this}, n);
-    if (repl != Node{NodeSimplifier::no_simplification()})
+    Node repl = std::visit(detail::NodeSimplifier{*this}, n);
+    if (repl != Node{detail::NodeSimplifier::no_simplification()})
     {
         n = std::move(repl);
     }

src/orange/orangeinp/CsgTreeUtils.cc

@@ -40,7 +40,7 @@ NodeId replace_down(CsgTree* tree, NodeId n, Node repl)
 {
     CELER_EXPECT(is_boolean_node(repl));
 
-    NodeReplacementInserter::VecNode stack{{n, std::move(repl)}};
+    detail::NodeReplacementInserter::VecNode stack{{n, std::move(repl)}};
 
     NodeId lowest_node{n};
 
@@ -52,7 +52,7 @@ NodeId replace_down(CsgTree* tree, NodeId n, Node repl)
         lowest_node = std::min(n, lowest_node);
 
         Node prev = tree->exchange(n, std::move(repl));
-        std::visit(NodeReplacementInserter{&stack, repl}, prev);
+        std::visit(detail::NodeReplacementInserter{&stack, repl}, prev);
     }
     return lowest_node;
 }
@@ -107,13 +107,13 @@ void simplify(CsgTree* tree, NodeId start)
  * Convert a node to postfix notation.
  */
 std::vector<LocalSurfaceId::size_type>
-build_postfix(CsgTree const& tree, orangeinp::NodeId n)
+build_postfix(CsgTree const& tree, NodeId n)
 {
     CELER_EXPECT(n < tree.size());
     std::vector<LocalSurfaceId::size_type> result;
-    orangeinp::PostfixLogicBuilder build_logic{tree, &result};
+    detail::PostfixLogicBuilder build_impl{tree, &result};
 
-    build_logic(n);
+    build_impl(n);
     return result;
 }
 

src/orange/orangeinp/detail/CsgUnitBuilder.hh

@@ -81,8 +81,6 @@ class CsgUnitBuilder
     void set_exterior(NodeId);
 
   private:
-    using LocalSurfaceInserter = ::celeritas::detail::LocalSurfaceInserter;
-
     CsgUnit* unit_;
     Tol tol_;
     LocalSurfaceInserter insert_surface_;

src/orange/orangeinp/detail/LocalSurfaceInserter.cc

@@ -9,6 +9,8 @@
 
 namespace celeritas
 {
+namespace orangeinp
+{
 namespace detail
 {
 //---------------------------------------------------------------------------//
@@ -46,4 +48,5 @@ LocalSurfaceInserter::merge_impl(LocalSurfaceId source, LocalSurfaceId target)
 
 //---------------------------------------------------------------------------//
 }  // namespace detail
+}  // namespace orangeinp
 }  // namespace celeritas

src/orange/orangeinp/detail/LocalSurfaceInserter.hh

@@ -17,6 +17,8 @@
 
 namespace celeritas
 {
+namespace orangeinp
+{
 namespace detail
 {
 //---------------------------------------------------------------------------//
@@ -125,4 +127,5 @@ LocalSurfaceId LocalSurfaceInserter::operator()(S const& source)
 
 //---------------------------------------------------------------------------//
 }  // namespace detail
+}  // namespace orangeinp
 }  // namespace celeritas

src/orange/orangeinp/detail/NodeReplacementInserter.hh

@@ -17,6 +17,8 @@ namespace celeritas
 {
 namespace orangeinp
 {
+namespace detail
+{
 //---------------------------------------------------------------------------//
 /*!
  * Add a node ID and its "replaced" value.
@@ -142,5 +144,6 @@ void NodeReplacementInserter::operator()(Joined const& n)
 }
 
 //---------------------------------------------------------------------------//
+}  // namespace detail
 }  // namespace orangeinp
 }  // namespace celeritas

src/orange/orangeinp/detail/NodeSimplifier.cc

@@ -16,6 +16,8 @@ namespace celeritas
 {
 namespace orangeinp
 {
+namespace detail
+{
 namespace
 {
 //---------------------------------------------------------------------------//
@@ -160,5 +162,6 @@ auto NodeSimplifier::operator()(Joined& j) const -> Node
 }
 
 //---------------------------------------------------------------------------//
+}  // namespace detail
 }  // namespace orangeinp
 }  // namespace celeritas

src/orange/orangeinp/detail/NodeSimplifier.hh

@@ -16,6 +16,8 @@ namespace celeritas
 {
 namespace orangeinp
 {
+namespace detail
+{
 //---------------------------------------------------------------------------//
 /*!
  * Simplify a node by visiting up to one level below.
@@ -58,5 +60,6 @@ class NodeSimplifier
 };
 
 //---------------------------------------------------------------------------//
+}  // namespace detail
 }  // namespace orangeinp
 }  // namespace celeritas

src/orange/orangeinp/detail/PostfixLogicBuilder.hh

@@ -16,6 +16,8 @@ namespace celeritas
 {
 namespace orangeinp
 {
+namespace detail
+{
 //---------------------------------------------------------------------------//
 /*!
  * Recursively construct a logic vector from a node with postfix operation.
@@ -38,7 +40,7 @@ class PostfixLogicBuilder
 
   public:
     // Construct with pointer to vector to append to
-    explicit inline PostfixLogicBuilder(CsgTree const& tree, VecLogic* logic);
+    inline PostfixLogicBuilder(CsgTree const& tree, VecLogic* logic);
 
     //! Build from a node ID
     inline void operator()(NodeId const& n);
@@ -156,5 +158,6 @@ void PostfixLogicBuilder::operator()(Joined const& n)
 }
 
 //---------------------------------------------------------------------------//
+}  // namespace detail
 }  // namespace orangeinp
 }  // namespace celeritas

test/orange/orangeinp/detail/LocalSurfaceInserter.test.cc

@@ -17,6 +17,8 @@
 
 namespace celeritas
 {
+namespace orangeinp
+{
 namespace detail
 {
 namespace test
@@ -130,4 +132,5 @@ TEST_F(LocalSurfaceInserterTest, DISABLED_performance_test)
 //---------------------------------------------------------------------------//
 }  // namespace test
 }  // namespace detail
+}  // namespace orangeinp
 }  // namespace celeritas

test/orange/univ/SimpleUnitTracker.test.cc

@@ -279,7 +279,8 @@ auto SimpleUnitTrackerTest::setup_heuristic_states(size_type num_tracks) const
     IsotropicDistribution<> sample_isotropic;
     for (auto i : range(num_tracks))
     {
-        auto lsa = LevelStateAccessor(&result_ref, TrackSlotId{i}, LevelId{0});
+        auto lsa = detail::LevelStateAccessor(
+            &result_ref, TrackSlotId{i}, LevelId{0});
         lsa.pos() = sample_box(rng);
         lsa.dir() = sample_isotropic(rng);
     }
@@ -310,7 +311,7 @@ auto SimpleUnitTrackerTest::reduce_heuristic_init(StateHostRef const& host,
     {
         auto tid = TrackSlotId{i};
         // TODO Update for multiple universes
-        LevelStateAccessor lsa(&host, tid, LevelId{0});
+        detail::LevelStateAccessor lsa(&host, tid, LevelId{0});
         auto vol = lsa.vol();
 
         if (vol < counts.size())