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

FIX: ensure np.interp gets an increasing sequence in LUTs #1282

Merged
merged 12 commits into from
Oct 16, 2024
Merged

FIX: ensure np.interp gets an increasing sequence in LUTs #1282

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e6a10fa
FIX: ensure np.interp gets an increasing sequence
ZLLentz Sep 3, 2024
8babfea
REF: bring shared code from forward and inverse into shared method
ZLLentz Oct 16, 2024
120a573
DOC: make docstring more specific
ZLLentz Oct 16, 2024
97820c4
ENH: more thorough check for monotonic sequence and add warning
ZLLentz Oct 16, 2024
a8362b0
TST: extend lut tests to cover inverted arrays and new helper function
ZLLentz Oct 16, 2024
260f47e
FIX: adapt stackoverflow magic to this 1D case
ZLLentz Oct 16, 2024
3946143
TST: add test case for equal adjacent points in the lut
ZLLentz Oct 16, 2024
3eb5b83
DOC: add docs for 1282
ZLLentz Oct 16, 2024
7799050
MNT/DOC: use more precise verbiage, strict instead of monotonic
ZLLentz Oct 16, 2024
1a6f120
MNT: switch from stackoverflow's suggestion to numpy docs suggestion
ZLLentz Oct 16, 2024
50b3686
FIX/DOC: more verbiage fixes monotonic -> strict
ZLLentz Oct 16, 2024
8aa11e1
Merge branch 'master' into fix_decr_lut
ZLLentz Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions pcdsdevices/pseudopos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,10 +1013,18 @@ def forward(self, pseudo_pos: tuple) -> tuple:
pseudo_field, = self.PseudoPosition._fields
real_field, = self.RealPosition._fields

xp = self._table_data_by_name[pseudo_field]
fp = self._table_data_by_name[real_field]

# xp must be increasing
if not xp[1] > xp[0]:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is very intolerant of noise in the signal, are we confident we won't jitter enough to trigger this by accident?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These come from fixed values in a text file that can look something like this:

50        71
55        41.5
60        18.8
65        6
70        1.3
75        0.5

Since they are fixed values there won't be any jitter, but I think it's worth adding a more thorough check so we can throw a warning if the values aren't monotonic

xp = xp[::-1]
fp = fp[::-1]

real_value = np.interp(
values[pseudo_field],
self._table_data_by_name[pseudo_field],
self._table_data_by_name[real_field]
xp,
fp,
)
return self.RealPosition(**{real_field: real_value})

Expand All @@ -1040,10 +1048,18 @@ def inverse(self, real_pos: tuple) -> tuple:
pseudo_field, = self.PseudoPosition._fields
real_field, = self.RealPosition._fields

xp = self._table_data_by_name[real_field]
fp = self._table_data_by_name[pseudo_field]

# xp must be increasing
if not xp[1] > xp[0]:
xp = xp[::-1]
fp = fp[::-1]

pseudo_value = np.interp(
values[real_field],
self._table_data_by_name[real_field],
self._table_data_by_name[pseudo_field]
xp,
fp,
)
return self.PseudoPosition(**{pseudo_field: pseudo_value})

Expand Down