Apply patches from #136 late review: fix header guard and rename levels_ to layers_

[Copilot]

Applies two patches from post-merge review of #136 (level→layer terminology refactoring).

Changes

• Header guard mismatch: Fixed data_cell_index.hpp guard macro from PHLEX_MODEL_DATA_CELL_ID_HPP → PHLEX_MODEL_DATA_CELL_INDEX_HPP to match filename
• Inconsistent member name: Renamed levels_ → layers_ in framework_graph to match its type std::stack<layer_sentry>

Remaining items from #136 analysis (not in scope)

1. Inconsistent "cell" vs "layer" terminology (data_cell_index vs data_layer_hierarchy)
2. Some comments may still reference "level"
3. Header include redundancies (data_cell_index.hpp + fwd.hpp)
4. product_query::to_layer() takes non-const ref while to_name uses const ref
5. Public API breakages require downstream updates

Original prompt

---

This section details on the original issue you should resolve

<issue_title>Late review/suggestions for #136</issue_title>
<issue_description>I was still trying to produce a readable composite review (Copilot/me) of #136 when it was approved and merged.

Below, please find Copilot's analysis of #136 followed by two patches it generated to address some of its findings:

---

Thanks — I analyzed the full diff you attached (git diff -w --minimal upstream/main). Below I list the terminology/naming changes I found, grouped by concept, and then I call out anomalies >(misspellings, inconsistent terminology, likely-missed edits, and a few places that could cause build/semantic surprises). At the end I note recommended fixes and next steps I can take if you want.

What I did

• Read the unified diff you provided and walked each changed file to extract every rename, file rename, and API change.
• Verified cross-file consistency where practical (includes, typedefs, function signatures, class names, tests).
• Looked for leftover uses of the old terminology, spelling/guard mistakes, and naming inconsistencies.

Summary (global mapping of old → new)

• level_id → data_cell_index

  • level_id.hpp / level_id.cpp deleted
  • data_cell_index.hpp / data_cell_index.cpp added
  • level_id::hash_type → data_cell_index::hash_type
  • level_id_ptr → data_cell_index_ptr
  • level_id::base_ptr() → data_cell_index::base_ptr()
  • level_id::level_name() → data_cell_index::layer_name()
  • level_id::level_hash() → data_cell_index::layer_hash()
  • methods: make_child(...) use new_layer_name argument name

• level_counter → data_cell_counter

  • level_counter.hpp / .cpp deleted
  • data_cell_counter.hpp / .cpp added
  • flush_counts uses data_cell_index::hash_type (was level_id::hash_type)

• level_hierarchy → data_layer_hierarchy

  • level_hierarchy.hpp / .cpp renamed → data_layer_hierarchy.hpp / .cpp
  • level_entry → layer_entry
  • levels_ map → layers_ map (inside hierarchy files)

• "level" (as a concept) → "layer" (as user-facing term in many places)

  • e.g. product_query.family → product_query.layer
  • product_query.operator()(std::string family) → operator()(std::string layer)
  • product_matcher.level_path → product_matcher.layer_path
  • product_matcher-level_path encode / error messages changed to mention “layer”
  • Many comments changed from “level(s)” to “layer(s) / data layer”

• level-related APIs in product_store and core

  • product_store::level_name() → product_store::layer_name()
  • product_store::parent(level_name) → parent(layer_name)
  • product_store constructors now use new_layer_name parameter names
  • product_store::id() now returns data_cell_index_ptr (instead of level_id_ptr)

• Naming in concurrency/graph primitives

  • level_sentry → layer_sentry (class)
  • member types updated accordingly (std::stack<layer_sentry>), but see anomaly re: member variable name below

• Many tests and examples updated to use the new types/terms:

  • test filenames: level_counting.cpp → data_cell_counting.cpp, level_id.cpp → data_cell_index.cpp
  • many test helpers, test expectations, and strings updated.

• CMake

  • model/CMakeLists.txt: removed level_* files and added data_cell_counter.cpp, data_layer_hierarchy.cpp, data_cell_index.cpp

Files renamed or added / removed (high-level)

• Removed:

  • phlex/model/level_id.hpp (deleted)
  • phlex/model/level_id.cpp (deleted)
  • phlex/model/level_counter.hpp/.cpp (deleted)
  • phlex/model/level_hierarchy.hpp/.cpp (renamed)

• Added:

  • phlex/model/data_cell_index.hpp/.cpp
  • phlex/model/data_cell_counter.hpp/.cpp
  • phlex/model/data_layer_hierarchy.hpp/.cpp (rename of level_hierarchy.*)

• Many source files updated to include the new headers and to use the new types/names.

All concrete symbol renames (representative list)

• level_id -> data_cell_index (class)
• level_id_ptr -> data_cell_index_ptr
• level_hash -> layer_hash
• level_name -> layer_name
• level_counter -> data_cell_counter
• level_hierarchy -> data_layer_hierarchy
• level_entry -> layer_entry
• levels_ (in hierarchy) -> layers_ (map in hierarchy implementation)
• level_sentry -> layer_sentry
• product_query.family -> product_query.layer
• product_query.operator()(std::string family) -> operator()(std::string layer)
• product_matcher.level_path -> product_matcher.layer_path
• product_store::level_name() -> product_store::layer_name()
• message_sender(level_hierarchy&) -> message_sender(data_layer_hierarchy&)
• Many variables, parameters, messages, and test strings swapped "level" → "layer" o...

• Partially addresses Late review/suggestions for #136 #159

---

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

[Copilot]

Pull request overview

This PR applies two post-merge cleanup fixes from the review of PR #136, which refactored "level" terminology to "layer" throughout the codebase. The changes correct a header guard mismatch and an inconsistent member variable name that were missed in the original refactoring.

• Fixed header guard macro in data_cell_index.hpp to match the actual filename
• Renamed levels_ member variable to layers_ in framework_graph to align with its type std::stack<layer_sentry>

Reviewed changes

Copilot reviewed 3 out of 4 changed files in this pull request and generated no comments.

File	Description
phlex/model/data_cell_index.hpp	Corrects header guard from PHLEX_MODEL_DATA_CELL_ID_HPP to PHLEX_MODEL_DATA_CELL_INDEX_HPP (lines 1, 2, 65) to match filename convention
phlex/core/framework_graph.hpp	Renames member variable levels_ to layers_ (line 149) to match its type std::stack<layer_sentry>
phlex/core/framework_graph.cpp	Updates all references to levels_ → layers_ (lines 160, 161, 164, 170, 171) in accept() and drain() methods
.gitignore	Adds standard CMake build artifacts: CMakeCache.txt, CMakeFiles/, _deps/, and _codeql_detected_source_root

[knoepfel]

Looks good @greenc-FNAL. Sorry about the communication issue wrt. #136.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@           Coverage Diff           @@
##             main     #160   +/-   ##
=======================================
  Coverage   81.18%   81.18%           
=======================================
  Files         116      116           
  Lines        2046     2046           
  Branches      328      328           
=======================================
  Hits         1661     1661           
  Misses        250      250           
  Partials      135      135           

Flag	Coverage Δ
unittests	81.18% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
phlex/core/framework_graph.cpp	83.75% <100.00%> (ø)
phlex/core/framework_graph.hpp	100.00% <ø> (ø)
phlex/model/data_cell_index.hpp	100.00% <ø> (ø)

---

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2994c8a...6e6e7a9. Read the comment docs.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.