Skip to content

Fix: speed energy conversion in utils..py #122

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
nvaytet merged 3 commits into from
Feb 13, 2026
Merged

Fix: speed energy conversion in utils..py #122

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b207bb8
Fix: speed energy conversion in utils..py
bingli621 Feb 13, 2026
2aa3d74
Update src/tof/utils.py
bingli621 Feb 13, 2026
a8f3fb8
Update src/tof/utils.py
bingli621 Feb 13, 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
16 changes: 8 additions & 8 deletions src/tof/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
two_pi = sc.constants.pi * (2.0 * sc.units.rad)


def speed_to_wavelength(x: sc.Variable, unit: str = 'angstrom') -> sc.Variable:
def speed_to_wavelength(x: sc.Variable, unit: str = "angstrom") -> sc.Variable:
"""
Convert neutron speeds to wavelengths.

Expand All @@ -27,7 +27,7 @@ def speed_to_wavelength(x: sc.Variable, unit: str = 'angstrom') -> sc.Variable:
return (1.0 / (m_over_h * x)).to(unit=unit)


def wavelength_to_speed(x: sc.Variable, unit: str = 'm/s') -> sc.Variable:
def wavelength_to_speed(x: sc.Variable, unit: str = "m/s") -> sc.Variable:
"""
Convert neutron wavelengths to speeds.

Expand All @@ -41,7 +41,7 @@ def wavelength_to_speed(x: sc.Variable, unit: str = 'm/s') -> sc.Variable:
return (1.0 / (m_over_h * x)).to(unit=unit)


def speed_to_energy(x: sc.Variable, unit='meV') -> sc.Variable:
def speed_to_energy(x: sc.Variable, unit="meV") -> sc.Variable:
"""
Convert neutron speeds to energies.

Expand All @@ -52,10 +52,10 @@ def speed_to_energy(x: sc.Variable, unit='meV') -> sc.Variable:
unit:
The unit of the output energies.
"""
return (const.m_n * x * x).to(unit=unit)
return ((0.5 * const.m_n) * x * x).to(unit=unit)


def energy_to_speed(x: sc.Variable, unit='m/s') -> sc.Variable:
def energy_to_speed(x: sc.Variable, unit="m/s") -> sc.Variable:
"""
Convert neutron energies to speeds.

Expand All @@ -66,7 +66,7 @@ def energy_to_speed(x: sc.Variable, unit='m/s') -> sc.Variable:
unit:
The unit of the output speeds.
"""
return sc.sqrt(x / const.m_n).to(unit=unit)
return sc.sqrt(x / (0.5 * const.m_n)).to(unit=unit)


def one_mask(
Expand Down Expand Up @@ -97,8 +97,8 @@ def var_to_dict(var: sc.Variable) -> dict:
The variable to convert.
"""
return {
'value': var.values.tolist() if var.ndim > 0 else float(var.value),
'unit': str(var.unit),
"value": var.values.tolist() if var.ndim > 0 else float(var.value),
"unit": str(var.unit),
}


Expand Down
Loading