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.

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

Fix unchecking sep. TTL in DB causes ASSERTion on ITC hardware if first TTL rack channel is not active #1881

Merged
merged 2 commits into from
Sep 9, 2023

Conversation

MichaelHuth
Copy link
Collaborator

close #1874

@MichaelHuth MichaelHuth added the PR:NeedsForwardPort (Pull requests only) Mark it as requiring a forwardport to the main branch label Sep 7, 2023
@MichaelHuth MichaelHuth self-assigned this Sep 7, 2023
@MichaelHuth MichaelHuth force-pushed the bugfix/1881-mh_fix_uncheck_sep_TTL_on_ITC branch 2 times, most recently from 77ed703 to 0abc960 Compare September 8, 2023 14:57
since
31e201b (Util: Add GUI channel number to TUD in CreateTiledChannelGraph, 2023-07-15)

When unchecking sep.TTL when using ITC hardware always the first TTL channel
of the current rack range was referred as GUI channel. But actually it should
be the first active GUI channel. Thus, if the first channel of a rack range was
not used, then the current GUI channel was set NaN. This lead to a follow up
ASSERTion when determining the correct trace color after the color index was
calculated with a NaN result from the NaN GUI channelnumber.

The fix is to use the first active GUI channel in the current rack range.

Directly related, the axis naming for composite TTL traces was wrong as it
originally referred to the hardware channel and after 31e201b referred to
the first GUI channel in the rack range. This was wrong as a composite
trace does not represent this channel (unless its the only one enabled).
The name is now set to "TTLC" followed by a underscore separated list of active
GUI channels, e.g. TTLC1_3 if TTL GUI channel 1 and 3 are enabled.

Add historic data test for DataBrowser Channel Checkboxes

- integrative test that checks if switching the channel checkboxes of the
  data browser (ADC, DAC, TTL and related) causes in some combination or
  transition a RTE.
- make it clear what channel number has to be give if isSplitted is zero
  (composite TTL traces)
@MichaelHuth MichaelHuth force-pushed the bugfix/1881-mh_fix_uncheck_sep_TTL_on_ITC branch from 0abc960 to 253ba98 Compare September 8, 2023 14:59
@MichaelHuth MichaelHuth assigned t-b and unassigned MichaelHuth Sep 8, 2023
@t-b t-b enabled auto-merge September 8, 2023 15:01
@t-b t-b merged commit 1bf6394 into release/2.7 Sep 9, 2023
16 checks passed
@t-b t-b deleted the bugfix/1881-mh_fix_uncheck_sep_TTL_on_ITC branch September 9, 2023 00:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR:NeedsForwardPort (Pull requests only) Mark it as requiring a forwardport to the main branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants