Skip to content

fix: harden workbench units and usability #6

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

Merged
D-sudoasd merged 2 commits into from
Aug 23, 2026
Merged

fix: harden workbench units and usability #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15dac5a
fix: harden workbench units and usability
D-sudoasd Aug 23, 2026
cac6efc
fix: close PR review gaps
D-sudoasd Aug 23, 2026
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
946 changes: 745 additions & 201 deletions SASAbs.py
View file
Open in desktop

Large diffs are not rendered by default.

356 changes: 349 additions & 7 deletions src/saxsabs/cli.py
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 25 additions & 5 deletions src/saxsabs/core/intensity_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,27 @@ def protected_corrections(self) -> tuple[str, ...]:


def _normalized_token(value: object) -> str:
return re.sub(r"[^a-z0-9]+", "", str(value or "").strip().lower())
text = str(value or "").strip().lower().translate(
str.maketrans(
{
"⁰": "0",
"¹": "1",
"²": "2",
"³": "3",
"⁴": "4",
"⁵": "5",
"⁶": "6",
"⁷": "7",
"⁸": "8",
"⁹": "9",
"⁻": "-",
"−": "-",
"–": "-",
"—": "-",
}
)
)
return re.sub(r"[^a-z0-9]+", "", text)


def _canonical_correction(value: object) -> str:
Expand Down Expand Up @@ -217,12 +237,12 @@ def assess_intensity_state(profile: Mapping[str, object]) -> IntensityStateAsses
semantic_states.add(IntensityState.RAW_COUNTS)
evidence.append(f"column:{profile.get('i_col')}")

unit = _normalized_token(
profile.get("intensity_unit", provenance.get("intensity_unit", ""))
raw_intensity_unit = profile.get(
"intensity_unit", provenance.get("intensity_unit", "")
)
if is_cm_inv_intensity_unit(unit):
if is_cm_inv_intensity_unit(raw_intensity_unit):
semantic_states.add(IntensityState.ABSOLUTE_CM_INV)
evidence.append(f"unit:{profile.get('intensity_unit', provenance.get('intensity_unit'))}")
evidence.append(f"unit:{raw_intensity_unit}")

# ``corrections_applied`` is evidence about the physical state. The
# ``do_not_repeat`` ledger is an execution guard and may be stricter than
Expand Down
Loading