Skip to content

Improved the naming of configuration session name and DAQ session name variables used in integtests#153

Merged
bieryAtFnal merged 4 commits intodevelopfrom
kbiery/integtest_session_name_changes
Apr 16, 2026
Merged

Improved the naming of configuration session name and DAQ session name variables used in integtests#153
bieryAtFnal merged 4 commits intodevelopfrom
kbiery/integtest_session_name_changes

Conversation

@bieryAtFnal
Copy link
Copy Markdown
Contributor

@bieryAtFnal bieryAtFnal commented Apr 15, 2026

Description

These changes are intended to be included in fddaq-v5.7.0...

To me, it seems really beneficial to improve the naming of variables and parameters in our code so that we can differentiate between Configuration Session names (aka OKS Session names) and DAQ Session names.

One of the places in our existing code where I found the current names confusing is in the integrationtest drunc_config data structure.

To help make things more clear, I propose that we modify

  • drunc_config.session to drunc_config.config_session_name
  • drunc_config.session_name to drunc_config.daq_session_name

This PR has these changes. If there are suggestions for better new names, we can certainly talk about that (configuration_session_name?).

These changes are coupled with ones in the following repositories:

Here are suggested instructions for testing the full set of changes:

DATE_PREFIX=`date '+%d%b'`
TIME_SUFFIX=`date '+%H%M'`

source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh
setup_dbt latest
dbt-create -n NFD_DEV_260415_A9 ${DATE_PREFIX}FDDevTest_${TIME_SUFFIX}
cd ${DATE_PREFIX}FDDevTest_${TIME_SUFFIX}/sourcecode

git clone https://github.com/DUNE-DAQ/daqsystemtest.git -b kbiery/integtest_session_name_changes
git clone https://github.com/DUNE-DAQ/dfmodules.git -b kbiery/integtest_session_name_changes
git clone https://github.com/DUNE-DAQ/listrev.git -b kbiery/integtest_session_name_changes
git clone https://github.com/DUNE-DAQ/snbmodules.git -b kbiery/integtest_session_name_changes
git clone https://github.com/DUNE-DAQ/trigger.git -b kbiery/integtest_session_name_changes
cd ..

cd pythoncode
git clone https://github.com/DUNE-DAQ/integrationtest.git -b kbiery/integtest_session_name_changes
cd ..

dbt-workarea-env
dbt-build -j 12
dbt-workarea-env

dunedaq_integtest_bundle.sh -k min

I have run tests on daq.fnal.gov and np04-srv-029 with all of the modified integtests (dunedaq_integtest_bundle.sh -r local), and the results look good.

And, I should say that I have additional improvements planned to help make it easier for users to know how to specify configuration (confgen_parameters) information in our integtests.

Type of change

  • Optimization (non-breaking change that improves code/performance)

Testing checklist

  • Full set of integration tests pass (dunedaq_integtest_bundle.sh)

Kurt Biery added 4 commits March 8, 2026 12:26
… as config_session_name and renamed session_name as daq_session_name to help make their meaning more clear.
… we pass to Popen in a local variable so that we don't have it typed in twice (thus reducing the chance of the two instances getting out of sync).
@bieryAtFnal bieryAtFnal merged commit bfb6f01 into develop Apr 16, 2026
1 check passed
@bieryAtFnal bieryAtFnal deleted the kbiery/integtest_session_name_changes branch April 16, 2026 20:51
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