8000 Johnfreeman/daq deliverables issue216 resource renaming by jcfreeman2 · Pull Request #635 · DUNE-DAQ/daqconf · GitHub
[go: up one dir, main page]

Skip to content

Johnfreeman/daq deliverables issue216 resource renaming - #635

Merged
mroda88 merged 12 commits into
prep-release/fddaq-v5.7.0from
johnfreeman/daq-deliverables_issue216_resource_renaming
Sep 2, 2026
Merged

mroda88 merged 12 commits into
prep-release/fddaq-v5.7.0from
johnfreeman/daq-deliverables_issue216_resource_renaming

Conversation

@jcfreeman2
Copy link
Copy Markdown
Contributor

Description

This a PR which reflects name changes made in confmodel. It is only to be merged at the same time as the other PRs which reflect this name change. See DUNE-DAQ/daq-deliverables#216 for details

If full description and testing details are included on a parent issue, please link to that here.
See issue # for details

Otherwise, please include a summary of the change and which issue is fixed (if any).
Include relevant motivation and context, including a target environment and dunedaq version if known.
Also list any dependencies that are required for this change.

Addresses issue #

Please also include instructions for how a reviewer can test your changes.

Type of change

  • Documentation (non-breaking change that adds or improves the documentation)
  • New feature or enhancement (non-breaking change which adds functionality)
  • Optimization (non-breaking change that improves code/performance)
  • Bug fix (non-breaking change which fixes an issue)
  • Breaking change (whatever its nature)

Testing checklist

  • Unit tests pass (e.g. dbt-build --unittest)
  • Minimal system quicktest passes (pytest -s minimal_system_quick_test.py)
  • Full set of integration tests pass (dunedaq_integtest_bundle.sh)
  • Python tests pass if applicable (e.g. python -m pytest)
  • Pre-commit hooks run successfully if applicable (e.g. pre-commit run --all-files)

Comments here on the testing

Further checks

  • Code is commented where needed, particularly in hard-to-understand areas
  • Code style is correct (dbt-build --lint, and/or see https://dune-daq-sw.readthedocs.io/en/latest/packages/styleguide/)
  • If applicable, new tests have been added or an issue has been opened to tackle that in the future.
    (Indicate issue here: # (issue))

Your Name added 4 commits August 18, 2026 15:41
@jcfreeman2
jcfreeman2 marked this pull request as draft August 20, 2026 03:19
mroda88 and others added 7 commits August 21, 2026 11:22
… enabling an activity (like TPG, etc.) from the old, formal use of enabling something in a config
…urrent scheme by reverting the name of oks_include_tpg back to oks_enable_tpg
…nable_tpg.py and oks_enable_tpg _entirely_ back to their state on develop, removing the enable -> include swap which had remained in place
@jcfreeman2
jcfreeman2 requested a review from bieryAtFnal August 25, 2026 17:16
@jcfreeman2
jcfreeman2 changed the base branch from develop to prep-release/fddaq-v5.7.0 August 26, 2026 13:52
@bieryAtFnal
Copy link
Copy Markdown
Collaborator

I noticed that the oks_enable script was converted to the oks_include script, but the oks_enable_tpg script has not yet been converted. Should it be?

@jcfreeman2
Copy link
Copy Markdown
Contributor Author

@bieryAtFnal good question. This falls under a point I make in the third bullet point of my August 22 comment in https://github.com/DUNE-DAQ/daq-deliverables/issues/216 (reposted below this), which is basically, when is "enable" the old formal term applying to a resource (now ExcludableEntity), and when is "enable" being used in a different context? For now, my thinking was that "trigger primitive generation" is a kind of behavior you'd enable, so "enable" is used in a casual context. I realize this is open to debate, however.

The daq-deliverables comment:
"enable", "include" and "resource" are very common terms, and of course in our codebase these terms are used in a context outside of pieces of configuration. Usually it's clear cut (e.g., "resource" as used to describe available disk space in daqsystemtest shouldn't be swapped out), but sometimes it's borderline. E.g., I left disabled_tpg_test.py in daqsystemtest and enable-triggers as a drunc argument untouched, thinking of disabled and enable in those contexts as more like the English words and less like technical terms describing the include or exclude of ExcludableEntitys

@bieryAtFnal
Copy link
Copy Markdown
Collaborator

Ok, thanks for the clarification. I was thinking that oks_enable_tpg did something with Resources, but I see that it does not, so I understand the reasoning behind leaving it alone.
Thanks

@eflumerf
eflumerf force-pushed the johnfreeman/daq-deliverables_issue216_resource_renaming branch from 7dd15cc to dbe3704 Compare August 27, 2026 19:26
@bieryAtFnal bieryAtFnal left a comment
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jcfreeman2
jcfreeman2 marked this pull request as ready for review September 1, 2026 22:46
@mroda88
mroda88 merged commit 1236e42 into prep-release/fddaq-v5.7.0 Sep 2, 2026
10 checks passed
@mroda88
mroda88 deleted the johnfreeman/daq-deliverables_issue216_resource_renaming branch September 2, 2026 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

0