Skip to content

Merge make_trapezoid changes to master. #233

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
Merged
merged 16 commits into from
Jan 13, 2025
Merged

Merge make_trapezoid changes to master. #233

merged 16 commits into from
Jan 13, 2025

Conversation

btasdelen
Copy link
Collaborator

No description provided.

btasdelen and others added 15 commits December 3, 2024 09:41
@btasdelen
Fix incorrect fall_time calculation when duration and rise_time is su…
fa7ea14 
…pplied. Better warnings for incorrect inputs.
@btasdelen
Merge branch 'dev' into fix_make_trapezoid
f049750
@btasdelen
Run pre-commit.
249da2d
@btasdelen
Revert incorrect fall_time logic. Add test cases for the inputs.
9d2a535
@btasdelen
Merge branch 'dev' into fix_make_trapezoid
0ef79b9
@btasdelen
Setup tests for common cases and make them pass.
4f9c197
@btasdelen
Check if the outputs are as expected for traps instead of just checki…
bbc021e 
…ng types.
@btasdelen
Whoops, forgot to escape.
c876654
@btasdelen
If an input is not provided, it should be None rather than 0.
12c080d
@btasdelen
make_adiabatic_pulse was setting max_slew to 0 instead of None.
5a3a2c1
@btasdelen
Rewrite make_trapezoid logic.
c002dd3
@schuenke
some simplifications
6ab4368
@schuenke
fix test
3c5d991
@btasdelen
Remove file author info.
8124a70
@btasdelen
Merge pull request #212 from btasdelen/fix_make_trapezoid
514852a 
Bug fixes and input checks for `make_trapezoid`
@btasdelen btasdelen requested a review from schuenke January 12, 2025 22:08
schuenke
schuenke approved these changes Jan 13, 2025
View reviewed changes
Copy link
Collaborator

@schuenke schuenke left a comment

Choose a reason for hiding this comment

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

looks good to me. Only one minor comment.

@btasdelen btasdelen merged commit 6bc7499 into master Jan 13, 2025
13 checks passed
@schuenke schuenke mentioned this pull request Mar 21, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@schuenke schuenke schuenke approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@btasdelen @schuenke