Skip to content

Commit

Permalink
PSX_GetSingleEventRange: Make the offset dependent on tau
Browse files Browse the repository at this point in the history
We only use the fixed value in case tau is NaN.
  • Loading branch information
t-b committed Jun 5, 2024
1 parent 8fe2682 commit ffe3676
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions Packages/MIES/MIES_SweepFormula_PSX.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ static Constant PSX_NUM_PEAKS_MAX = 2000
static Constant PSX_PLOT_DEFAULT_X_RANGE = 200

static Constant PSX_DEFAULT_X_START_OFFSET = 2
static Constant PSX_DEFAULT_RANGE_FACTOR = 3

static StrConstant USER_DATA_KEYBOARD_DIR = "keyboard_direction"

Expand Down Expand Up @@ -613,17 +614,23 @@ End
/// @brief Return the x-axis range useful for displaying and extracting a single event
static Function [variable first, variable last] PSX_GetSingleEventRange(WAVE psxEvent, variable index)

variable numEvents
variable numEvents, offset

numEvents = DimSize(psxEvent, ROWS)

index = limit(index, 0, numEvents - 1)

offset = PSX_DEFAULT_RANGE_FACTOR * psxEvent[index][%tau]

if(IsNaN(offset))
offset = PSX_DEFAULT_X_START_OFFSET
endif

if(index == numEvents - 1)
first = psxEvent[index][%peak_t] - PSX_DEFAULT_X_START_OFFSET
last = psxEvent[index][%post_min_t] + PSX_DEFAULT_X_START_OFFSET
first = psxEvent[index][%peak_t] - offset
last = psxEvent[index][%post_min_t] + offset
else
first = psxEvent[index][%peak_t] - PSX_DEFAULT_X_START_OFFSET
first = psxEvent[index][%peak_t] - offset
last = psxEvent[index + 1][%peak_t] - 0.5
endif

Expand Down

0 comments on commit ffe3676

Please sign in to comment.