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

Jump to bottom

SweepFormula/psxKernel: Various fixes #2023

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

SweepFormula/psxKernel: Various fixes #2023

wants to merge 29 commits into from

Conversation

t-b
Copy link
Collaborator

@t-b t-b commented Feb 23, 2024 •
edited
Loading

@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).

  • Add test
  • Drop empty results in PSX_Operation
  • intersecting ranges bug IVSCCMiniAnalysis on the FTP (same name, new content)
  • StatsRangeTesting: Check that the correct range was used for multi dataset examples
  • Update psxStats documentation
  • Throw away events which have an amplitude which has a different sign compared to the psxKernel amplitude
  • Replace PSX_DEFAULT_X_START_OFFSET with a factor and the decay tau from psxKernel
  • Fix incorrect usage of StatsQuantiles as /Z with err = ... does not make sense
  • psx should return sweepData waves if there are no events, as psxPrep relies on that for the histogram. Otherwise the data psx uses and what psxPrep plots is different
  • Fix kernelAmp sign check again
  • Reverse order of offsetting and filtering, rename all names
  • Hack session with Tim to check that it is now what we want
  • Implement first version with outcome from hack session
  • Fix bug, Tim uploads data for assertion
  !!! Assertion FAILED !!!
  Message: "Can not work with NaN as mapIndex"
  Please provide the following information if you contact the MIES developers:
  ################################
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  Stacktrace:
  SF_button_sweepFormula_display(...)#L2995 [MIES_SweepFormula.ipf]
SF_FormulaPlotter(...)#L1920 [MIES_SweepFormula.ipf]
SF_GetTraceColor(...)#L1518 [MIES_SweepFormula.ipf]
SFH_GetLabNoteBookForSweep(...)#L1842 [MIES_SweepFormula_Helpers.ipf]
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  Time: 2024-11-26T14:05:34-08:00
  Locked device: [- none -]
  Current sweep: [- none -]
  DAQ: [- none -]
  Testpulse: [- none -]
  Acquisition state: [- none -]
  Experiment: Sample NWB files from Jessica (Packed)
  Igor Pro version: 9.0.6.1 (56565)
  MIES version:
  
  ################################
  • Adapt documentation for psxDeconvFilter, document new default values
  • Fix tests
  • Cleanup commits

Close #2016
Close #2011
Close #1660

@t-b t-b requested a review from timjarsky as a code owner February 23, 2024 14:58
@t-b t-b mentioned this pull request Feb 23, 2024
Closed
1 task
@t-b t-b assigned t-b and unassigned timjarsky Feb 23, 2024
@t-b t-b changed the title SweepFormula/psxKernel: Skip kernel creation for too large decayTau SweepFormula/psxKernel: Various fixes Feb 23, 2024
@t-b t-b assigned timjarsky and unassigned t-b Feb 23, 2024
@timjarsky timjarsky assigned t-b and unassigned timjarsky Feb 23, 2024
@t-b t-b force-pushed the bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel branch from 718e3ac to 108f961 Compare March 1, 2024 18:24
@t-b t-b assigned timjarsky and unassigned t-b Mar 1, 2024
@t-b t-b force-pushed the bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel branch from 108f961 to ed6c2fb Compare March 1, 2024 22:19
@timjarsky timjarsky assigned t-b and unassigned timjarsky Mar 7, 2024
@t-b t-b force-pushed the bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel branch from ed6c2fb to 56305c1 Compare March 8, 2024 18:50
@t-b t-b mentioned this pull request Mar 13, 2024
Open
@t-b t-b force-pushed the bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel branch from 56305c1 to 475065e Compare April 18, 2024 19:36
@t-b t-b mentioned this pull request Apr 19, 2024
Merged
@t-b t-b marked this pull request as draft April 19, 2024 18:17
@t-b t-b force-pushed the bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel branch from 475065e to ffeff20 Compare May 21, 2024 18:15
@t-b t-b force-pushed the bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel branch from ffeff20 to ffe3676 Compare June 5, 2024 22:13
@t-b t-b assigned timjarsky and unassigned t-b Jun 5, 2024
@t-b

This comment was marked as outdated.

Sign in to view
@t-b t-b marked this pull request as ready for review June 5, 2024 22:13
@t-b t-b force-pushed the bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel branch from ffe3676 to 7637e16 Compare June 5, 2024 22:38
@t-b t-b mentioned this pull request Jun 6, 2024
Merged
14 tasks
@timjarsky

This comment was marked as outdated.

Sign in to view
t-b and others added 23 commits November 18, 2024 14:55
@t-b
PSX_OperationSetDimensionLabels: Factor it out
c160389
@t-b
PSX_Operation: Handle partial results better
24afbdd 
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.
@t-b
PSX_Operation: Output error message when we could not generate data
9531183
@t-b
PSX_OperationStatsImpl: Rework range handling
54d37e8 
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.
@t-b
Documentation: Update it for psxstats
5bee6a9
@t-b
PSX_OperationImpl: Reorganize code for no event case
5901856 
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.
@t-b
PSX_AnalyzePeaks: Factor out calculation of various event properties
7b150fc 
In a future commit we want to reuse these calculations for event
filtering.
@t-b
PSX_AnalyzePeaks: Skip superfluous redimension calls
2eeb44f 
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.
@t-b
PSX_AnalyzePeaks: Throw away events with different sign as the kernel…
b34fb6e 
… 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.
@t-b
PSX_CalculateRiseTime: Multithread the calculation
527868a
@t-b
PSX_GetSingleEventRange: Make the offset dependent on tau
322383b 
We only use the fixed value in case tau is NaN.
@t-b
PSX_UpdateSingleEventGraph: Check passed index
023d0e0 
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.
@t-b
SF_PreparePlotter: Remove controls/draw elements on existing panels
12f9b03 
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.
@t-b
PSX_ApplyMacroToExistingPanel: Make it static
bce9ab2
@t-b
PSX_ApplyMacroToExistingPanel: Fix execution
d1920b5 
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.
@t-b
DeepCopyWaveRefWave: Fix assertion message
63a6a36
@t-b
DeepCopyWaveRefWave: Allow src to contain null waves
ec4aa97 
This makes it easier to use and is more according to our philosopy that null
wave refs should be preferred over empty waves.
@t-b
DeepCopyWaveRefWave: Nificy the code
11783cd 
We only need index in the else branch and some more spaces are nice.
@t-b
PSX_OperationImpl: Always return a result
2e41b47 
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.
@t-b
PSX: Change order of offsetting and filtering
5f6264c 
We now first offset and then filter. This requires that we also rename all
variables, constants and dimension labels.

Change requested by Tim Jarsky.
@timjarsky @t-b
WIP
af76076
@timjarsky @t-b
changes deconvolved filter, trace filter, and histogram
26579be
@t-b
changes
ba27685
@t-b t-b force-pushed the bugfix/2023-ignore-too-large-decay-Tau-in-psx-kernel branch from adff4e2 to ba27685 Compare November 18, 2024 13:56
@t-b t-b assigned timjarsky and unassigned t-b Nov 18, 2024
@t-b t-b assigned t-b and unassigned timjarsky Nov 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timjarsky timjarsky Awaiting requested review from timjarsky timjarsky is a code owner

@MichaelHuth MichaelHuth Awaiting requested review from MichaelHuth MichaelHuth is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

@t-b t-b

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Make psx more robust psxStats does not support epoch wildcards Allow wildcard expressions in psxStats
2 participants
@t-b @timjarsky