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.

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

Feat/full measure channel support #9

Merged
merged 21 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b87d6fc
adding tests
nulinspiratie Feb 13, 2024
1314445
Merge remote-tracking branch 'origin/main' into feat/measure-channels
nulinspiratie Feb 14, 2024
7bcf4d2
fixed integration weights tests
nulinspiratie Feb 14, 2024
22d473d
add measure_accumulated, measure_sliced
nulinspiratie Feb 14, 2024
f83bac4
add missing change
nulinspiratie Feb 14, 2024
88ee003
added most measurement types
nulinspiratie Feb 14, 2024
7965e63
Merge branch 'feat/digital_channels' into feat/measure-channels
nulinspiratie Feb 15, 2024
d3e6fd6
Merge remote-tracking branch 'origin/feat/digital_channels' into feat…
nulinspiratie Feb 16, 2024
470d24d
test fix + error msg improvement
nulinspiratie Feb 16, 2024
dfba451
remove minus sign in readout pulse phase
nulinspiratie Feb 16, 2024
447c8db
Merge remote-tracking branch 'origin/main' into feat/measure-channels
nulinspiratie Feb 16, 2024
308d1c3
fixes to get measure working on OPX (+amplitude_scale)
nulinspiratie Feb 16, 2024
22e0aa0
Merge remote-tracking branch 'origin/main' into feat/measure-channels
nulinspiratie Feb 16, 2024
3a92a81
Merge remote-tracking branch 'origin/main' into feat/measure-channels
nulinspiratie Feb 28, 2024
10518d5
add QuaVariableType
nulinspiratie Feb 28, 2024
9667a4e
Add `StandardReadoutPulse`, change `ConstantReadoutPulse` to `SquareR…
nulinspiratie Mar 2, 2024
d24df03
Add docstring
nulinspiratie Mar 2, 2024
71265e7
Merge commit 'da63a14cd3f1624796c0a76b70fc02e4a8436cf0' into feat/mea…
nulinspiratie Mar 21, 2024
b37b3bc
Allow pulse.axis_angle=None with IQ channel
nulinspiratie Mar 21, 2024
eb93202
Merge commit '4039b54f44d6c3f6632c53a0b8a9e049ec669e2e' into feat/mea…
nulinspiratie Mar 21, 2024
8950e53
Merge commit 'da08671ddc3aa11773c0fc6cc2c107011019a3b7' into feat/mea…
nulinspiratie Apr 12, 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
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
## [Unreleased]
### Added
- Add optional `config_settings` property to quam components indicating that they should be called before/after other components when generating QUA configuration
- Added `InOutIQChannel.measure_accumulated/sliced`
- Added `ReadoutPulse`. All readout pulses can now be created simply by inheriting from the `ReadoutPulse` and the non-readout variant.
- Added `Channel.set_dc_offset`

### Changed
- Pulses with `pulse.axis_angle = None` are now compatible with an `IQChannel` as all signal on the I port.

### Fixed
- Switched channel `RF_inputs` and `RF_outputs` for Octave
- Loading QuAM components when the expected type is a union or the actual type is a list
no longer raises an error
- The qua config entries from OctaveUpConverter entries I/Q_connection were of type
QuamList, resulting in errors during deepcopy. Converted to tuple


## [0.3.0]
### Added
- Added InOutSingleChannel
Expand All @@ -29,6 +35,8 @@
This happens if channel.id is not set, and channel.parent does not have a name either
- `Pulse.axis_angle` is now in radians instead of degrees.
- Channel offsets (e.g. `SingleChannel.opx_output_offset`) is None by default (see note in Fixed)
- Move `quam.components.superconducting_qubits` to `quam.examples.superconducting_qubits`
- Replaced `InOutIQChannel.measure` kwargs `I_var` and `Q_var` by `qua_vars` tuple
- `Pulse.id` is now an instance variable instead of a class variable
- Channel frequency converter default types are now `BaseFrequencyConverter` which has fewer attributes than `FrequencyConverter`. This is to make it compatible with the new Octave API.

Expand Down
Loading