-
Notifications
You must be signed in to change notification settings - Fork 7
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
SweepFormula/psxKernel: Various fixes #2023
Open
t-b
wants to merge
26
commits into
main
Choose a base branch
from
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
t-b
changed the title
SweepFormula/psxKernel: Skip kernel creation for too large decayTau
SweepFormula/psxKernel: Various fixes
Feb 23, 2024
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
March 1, 2024 18:24
718e3ac
to
108f961
Compare
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
March 1, 2024 22:19
108f961
to
ed6c2fb
Compare
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
March 8, 2024 18:50
ed6c2fb
to
56305c1
Compare
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
April 18, 2024 19:36
56305c1
to
475065e
Compare
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
May 21, 2024 18:15
475065e
to
ffeff20
Compare
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
June 5, 2024 22:13
ffeff20
to
ffe3676
Compare
This comment was marked as outdated.
This comment was marked as outdated.
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
June 5, 2024 22:38
ffe3676
to
7637e16
Compare
14 tasks
This comment was marked as outdated.
This comment was marked as outdated.
The additional /Z in the range based for loop is not required, but that is a bug reported to WM. Forgotten in 422eac8 (SF: Adapt SFH_EvaluateRange for multi dataset input, 2024-01-20).
We are now removing empty entries in the output wave. This avoids an issue with psxPrep which did not anticipate that. As we are now not feeding in any null waves into PSX_OperationImpl we can also remove the checks there.
The current implementation for the ranges did not handle multiple passed epochs nor epoch wildcards. The check for intersecting ranges added in 6d10790 (PSX_OperationStatsImpl: Assert on intersecting ranges, 2024-02-06) was also broken. While thinking about the current approach it was recognized that we actually want to collect the event data from all sweep ranges of all sweeps from the same equivalence class. This has now been done. We also support list of epochs and epoch wildcards.
This prepares for a future commit where we throw away single events and thus PSX_AnalyzePeaks can result in no events event if we found peaks in PSX_FindPeaks.
In a future commit we want to reuse these calculations for event filtering.
We know how many entries in psxEvent and eventFit we have before starting the loop so we can just call Redimension before and are done.
… amplitude We need to filter that out first as we need the neighbouring distance to the passing events. And we also have to introduce an override setting as otherwise the tests don't pass.
We only use the fixed value in case tau is NaN.
We can be called from PSX_PlotInteractionHook where we don't know if the passed index is valid. Let's do nothing if the index is out of range.
In dc9ed87 (SF_PreparePlotter: Don't kill and recreate the main panel for SF_DM_SUBWINDOWS, 2024-06-19) we switched from killing the sweepformula plot to clearing it. But we forgot to remove additional controls and draw elements added by e.g. PSX. And now we also have to explicitly remove TraceUserData (TUD) as these are not cleaned up automatically anymore, as killing an embedded subwindow does not trigger the main window hook.
Due to the changed window handling in dc9ed87 (SF_PreparePlotter: Don't kill and recreate the main panel for SF_DM_SUBWINDOWS, 2024-06-19) we need to ensure that the host window of the SF panel is active.
This makes it easier to use and is more according to our philosopy that null wave refs should be preferred over empty waves.
We only need index in the else branch and some more spaces are nice.
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
September 6, 2024 15:04
f54b1b1
to
eadd32d
Compare
I've fixed the cursor issue. @MichaelHuth FYI: 7e0c17e (DeepCopyWaveRefWave: Allow src to cotain null waves, 2024-09-06) |
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
September 6, 2024 15:10
eadd32d
to
33e101c
Compare
Using psxPrep requires sweep data from psx. But we used to only return sweep data if we have found events. We now always return sweep data so that psxPrep always works.
We now first offset and then filter. This requires that we also rename all variables, constants and dimension labels. Change requested by Tim Jarsky.
t-b
force-pushed
the
bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel
branch
from
September 6, 2024 21:47
33e101c
to
20d8f85
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@timjarsky This has our bugfixes for psxKernel and too large decayTau. I've removed the adaptations for the sweep range extraction as #1990 will fix that in a better way (also for old data).
/Z
witherr = ...
does not make senseClose #2016
Close #2011
Close #1660