search

DUNE-DAQ / readout

This package contains Upstream DAQ Readout specific software and utilities, appfwk DAQModules, CCM interface implementations, and software emulators.
2 stars 1 forks source link

Updated for the new version of PACMANFrame.hpp. #104

Closed krisfur closed 3 years ago

krisfur commented 3 years ago

Updates to NDReadoutTypes.hpp and some others to properly handle the new PACMANFrame now included in dataformats as per issue #103

dingp commented 3 years ago

FWIW, my build with commit 1689afe failed with:

/build/dingpf/github-runner/actions-runner/_work/daq-release/daq-release/dev/sourcecode/readout/include/readout/models/DefaultRequestHandlerModel.hpp:366:77: error: ‘frames_per_element’ is not a member of ‘dunedaq::readout::types::PACMAN_MESSAGE_STRUCT’
                 element->get_timestamp() + (ReadoutType::frames_per_element - 1) * ReadoutType::tick_dist >=
                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
/build/dingpf/github-runner/actions-runner/_work/daq-release/daq-release/dev/sourcecode/readout/include/readout/models/DefaultRequestHandlerModel.hpp:366:82: error: ‘tick_dist’ is not a member of ‘dunedaq::readout::types::PACMAN_MESSAGE_STRUCT’
                 element->get_timestamp() + (ReadoutType::frames_per_element - 1) * ReadoutType::tick_dist >=
                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
/build/dingpf/github-runner/actions-runner/_work/daq-release/daq-release/dev/sourcecode/readout/include/readout/models/DefaultRequestHandlerModel.hpp:369:47: error: ‘struct dunedaq::readout::types::PACMAN_MESSAGE_STRUCT’ has no member named ‘begin’
               for (auto frame_iter = element->begin(); frame_iter != element->end(); frame_iter++) {
                                      ~~~~~~~~~^~~~~
/build/dingpf/github-runner/actions-runner/_work/daq-release/daq-release/dev/sourcecode/readout/include/readout/models/DefaultRequestHandlerModel.hpp:369:79: error: ‘struct dunedaq::readout::types::PACMAN_MESSAGE_STRUCT’ has no member named ‘end’
               for (auto frame_iter = element->begin(); frame_iter != element->end(); frame_iter++) {
krisfur commented 3 years ago

Yeah there has been some changes in readout since we wrote this and waited for dataformats changes to be approved. Will try to get this fixed tomorrow.

dingp commented 3 years ago

Sounds good! Thanks! Though you may bear the blame of breaking develop and nightly build in the mean time. 🤣

krisfur commented 3 years ago

@dingp can you check against commit 7e47864 ? It should've fixed the issue you've quoted above.

dingp commented 3 years ago

@krisfur Yes, that fixed the issue. I would like the fix to be in develop branch before nightly build runs. Should I merge the PR?

krisfur commented 3 years ago

If all builds then sure go ahead, it shouldn't impact operation for anyone but ND readout stuff (I think), and if that has bugs we can PR later.

roland-sipos commented 3 years ago

@dingp please don't merge before @jimbrooke or me gives a green light on PRs, or reviewers are assigned. I'm reverting this.

roland-sipos commented 3 years ago

I'm not sure if the linter was run on this. If not, please do so.

dingp commented 3 years ago

@dingp please don't merge before @jimbrooke or me gives a green light on PRs, or reviewers are assigned. I'm reverting this.

Whoops, clicked the button too soon after I saw Krzysztof's comment. Sorry for the inconvenience.

willpvazquez commented 3 years ago

FYI - the underlying issues should now be fixed in https://github.com/DUNE-DAQ/readout/pull/106