Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add three new ZMQ publishers for TP results / Retrieve TP results #2230

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add three new ZMQ publishers for TP results / Retrieve TP results #2230

wants to merge 7 commits into from

Commits on Nov 26, 2024

  1. Util: Add two conversion function for DA/AD unit string return 

    Added GetADChannelUnit, GetDAChannelUnit that return the unit string
depending on clamp mode.

Adapted GetChanAmpAssignUnit to use the new functions.
    @MichaelHuth @t-b
    MichaelHuth authored and t-b committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    3dd0dcf View commit details
    Browse the repository at this point in the history

  2. TP: Add more information that is transferred to the TP analysis thread 

    - extended the TPAnalysisInput structure

This is a preparation commit for adding zeromq publishers that include
some of that information.
    @MichaelHuth @t-b
    MichaelHuth authored and t-b committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    92a4275 View commit details
    Browse the repository at this point in the history

  3. PUB: Preparation to add four zeromq publishers for TP data 

    - the data is published from the TP analysis thread including additional
information available in the thread through the previous commit.
- The additional values are also returned by the thread and collected in
the async buffer as well then in TPResult and in TPStorage.
- The involved waves and their respective getters were adapted with new
elements that the additional data can be stored.
- As most of the elements store the same information, thus a constant
was introduced with a dimension label list that is used as helper for
the wave creation in the getter functions.
    @MichaelHuth @t-b
    MichaelHuth authored and t-b committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    a10846d View commit details
    Browse the repository at this point in the history

  4. PUB: Add four publishers to publish TP data 

    - The four publishers publish the same json, just with a different period.
  There is a filter for live, 1s, 5s and 10s publishing interval.

- See PUB_TPResult for JSON description

- publisher is called from TP_TSAnalysis thread
    @MichaelHuth @t-b
    MichaelHuth authored and t-b committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    c57a13a View commit details
    Browse the repository at this point in the history

  5. TP: Rename TP_GetStoredTPs to TP_GetConsecutiveTPsUptoMarker 

    This prevent misleading naming and it more fitting to the functionality
the function actually implements
    @MichaelHuth @t-b
    MichaelHuth authored and t-b committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    22a9ef3 View commit details
    Browse the repository at this point in the history

  6. TP: Added two functions that allow to retrieve info about TPs 

    Added TP_GetStoredTP and TP_GetStoredTPsFromCycle that allow to get
information about a TP by tpMarker or TPs by cycle id and headstage.

- both functions allow to recreate the DA wave for the TPs with the flag includeDAC
- the returned data includes the AD, DA data as well as metadata for
  each returned TP (from TPStorage).

- These TP functions use the same TP utility function.
    @MichaelHuth @t-b
    MichaelHuth authored and t-b committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    cc95e5c View commit details
    Browse the repository at this point in the history

  7. Tests: Adapt FetchPublishedMessage for more tries 

    With a running TP adding zeromq publishing messages for each TP
it appears that we have to look through more than the last 100 messages
after a test to find the requested.

- split logic into two parts: either read out upto 10000 existing messages
  or wait up to 10 seconds (100 trys with 100 ms sleep) if no message
  is available
    @MichaelHuth @t-b
    MichaelHuth authored and t-b committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    fc20936 View commit details
    Browse the repository at this point in the history