Skip to content

Merge master again #260

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
henrikjacobsenfys merged 3 commits into from
Oct 8, 2026
Merged

Merge master again #260

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a8a4fe
🎉 Release: merge develop into master (#253)
easyscience[bot] Oct 8, 2026
870c6c1
resolve merge conflicts
henrikjacobsenfys Oct 8, 2026
ca9a744
pixi run fix
henrikjacobsenfys Oct 8, 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
6 changes: 3 additions & 3 deletions src/easydynamics/sample_model/components/delta_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ def __init__(
parameter is fixed.
area : Numeric, default=1.0
Integrated area (weight) of the delta function. Unit is ``x_unit * y_unit``.
x_unit : str | sc.Unit, default="meV"
x_unit : str | sc.Unit, default='meV'
Unit of the x-axis. center is stored in this unit. area_unit = x_unit * y_unit.
y_unit : str | sc.Unit, default="dimensionless"
y_unit : str | sc.Unit, default='dimensionless'
Unit of the y-axis (output).
name : str, default="DeltaFunction"
name : str, default='DeltaFunction'
Name of the component.
display_name : str | None, default=None
Display name of the component, shown when plotting. Falls back to *name* if None.
Expand Down
Loading