Adding DMM notebook and Modifying SLM Mask #569

a-corni · 2023-08-11T17:25:37Z

Fixes on DMM:
- Display the DetuningMaps as traps (like a RegisterLayout, because it is not enforced to have an atom at the coordinates at which there is a weight). Label 'traps' is added to plot (label "atoms" added for general registers)
- labels could only take integers, now it can handle QubitId.
Addition to Sequence:
- Add possibility to draw detuning maps (2D or 3D). Can be drawn with/without register.
- Add possibility to draw local amplitude and detuning per group of qubits, that are represented on the register.
Tutorials:
- Creates a tutorial explaining how to create a DetuningMap, a DMM channel, and how to modulate a detuning map in a Schedule.
- Modifies the tutorial on state preparation with the SLM Mask to show difference between XY and Ising mode.
- Updates "Bayesan Optimisation for AFM state preparation" and "Building 1D Rydberg Crystals" to take into account changes on Register (and make fix since "Simulation" is deprecated in favour of QutipEmulator)

…d_dmm

review-notebook-app · 2023-08-11T17:25:41Z

Check out this pull request on

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

tutorials/advanced_features/Local addressability with DMM.ipynb

tutorials/advanced_features/State Preparation with the SLM Mask.ipynb

…into add_dmm_tuto

a-corni · 2023-09-18T14:53:27Z

Everything looks good from an aesthetic point of view, I let you have a look. However, there seems to be an error in the simulation. I start looking into it.

a-corni · 2023-09-19T09:30:34Z

There was no issue with the code in the end, just the optimization had to be relaunched. It's now ready for review @HGSilveri

…into add_dmm_sequence

HGSilveri

Looks like it's almost there :)

One question: how is print(seq) looking with DMMs?

pulser-core/pulser/register/_reg_drawer.py

pulser-core/pulser/sequence/sequence.py

pulser-core/pulser/sequence/_seq_drawer.py

tutorials/advanced_features/Local addressability with DMM.ipynb

a-corni · 2023-09-20T12:38:27Z

Looks like it's almost there :)

One question: how is print(seq) looking with DMMs?

Aah I was thinking of tackling it in a new issue afterwards, but I guess it's good to see it now ;)

HGSilveri · 2023-09-20T13:16:26Z

Aah I was thinking of tackling it in a new issue afterwards, but I guess it's good to see it now ;)

As you wish, as long as we don't forget about it it's okay

a-corni · 2023-09-20T13:33:36Z

Aah I was thinking of tackling it in a new issue afterwards, but I guess it's good to see it now ;)

As you wish, as long as we don't forget about it it's okay

Here is how it is shown:

HGSilveri · 2023-09-20T13:37:03Z

Here is how it is shown:

Ok, not so bad. What about when the detuning is not constant? I think it won't show as a detuned delay in that case

a-corni · 2023-09-20T13:38:19Z

Here is how it is shown:

Ok, not so bad. What about when the detuning is not constant? I think it won't show as a detuned delay in that case

As from 100->300 for dmm_0, it shows as a Pulse with 0 amplitude and Ramp from -10 to 0

HGSilveri · 2023-09-20T13:41:44Z

As from 100->300 for dmm_0, it shows as a Pulse with 0 amplitude and Ramp from -10 to 0

Of course, don't know how I missed that, sorry...
Ok, I think we can modify it a bit to always show something like:
t: {start} -> {end} | Detuning: {detuning_waveform} | Targets: ...
What do you think?

a-corni · 2023-09-20T13:47:13Z

As from 100->300 for dmm_0, it shows as a Pulse with 0 amplitude and Ramp from -10 to 0

Of course, don't know how I missed that, sorry... Ok, I think we can modify it a bit to always show something like: t: {start} -> {end} | Detuning: {detuning_waveform} | Targets: ... What do you think?

Sounds cool !

a-corni · 2023-09-20T14:45:42Z

As from 100->300 for dmm_0, it shows as a Pulse with 0 amplitude and Ramp from -10 to 0

Of course, don't know how I missed that, sorry... Ok, I think we can modify it a bit to always show something like: t: {start} -> {end} | Detuning: {detuning_waveform} | Targets: ... What do you think?

Here is where I am at. I am wondering if I should not delete Detuned Delays for DMM channels (Have t: 100->300 | Detuning: -10 rad/µs | Targets: q0, q1, q2, q3)

HGSilveri · 2023-09-20T14:59:47Z

As from 100->300 for dmm_0, it shows as a Pulse with 0 amplitude and Ramp from -10 to 0

Of course, don't know how I missed that, sorry... Ok, I think we can modify it a bit to always show something like: t: {start} -> {end} | Detuning: {detuning_waveform} | Targets: ... What do you think?

Here is where I am at. I am wondering if I should not delete Detuned Delays for DMM channels (Have t: 100->300 | Detuning: -10 rad/µs | Targets: q0, q1, q2, q3)

I was going to suggest that, I think that would be better indeed

a-corni · 2023-09-20T15:15:13Z

I think that's good ?

HGSilveri · 2023-09-20T15:25:48Z

I think that's good ?

Yes, looks great :)

a-corni · 2023-09-20T15:54:36Z

All comments should be fixed now :)

HGSilveri

Great job!

* Adding dmm config and modulation to sequence * Reverting changes for _SLMMask * Setting max_amp of dmm to zero * Fixing detection of virtual channels in Device * Reverting changes in serialization * Reverting SLM, modifying available_channels * deleting dmm of schedule if slm of xy, Fixing type * Add insert_slm_mask * fixing available_channels with slm * Special handling of samples from a DMM channel (#565) * Add `DetuningMap.get_qubit_weight_map()` * Define `_DMMSchedule.get_samples()` * Extract DMMSamples from a Sequence * Creating the `Traps` class * Eliminating the effects of the SLM mask * Use COORD_PRECISION in comparison * `Traps.coords` -> `Traps.sorted_coords` * Subclass `Traps` in `WeightMap` * Preserve effects of SLM mask in XY mode * Explicitly ask for labels in DetuningMap.draw() * Including slug in WeightMap * UTs for DetuningMap * Isort * Specialize pulse validation in DMM * Revamp test_dmm UTs * Formatting * Add support for legacy serializer * add in_ising * Add SLM pulse, ising, modif validate_channel * Add waiting_for_first_pulse, fixing mask time * Covering all code, modif after review * Add descr sequence, _config_detuning_map * Finishing UTs, fixing typos * Abstract representation support for new DMM features (#568) * Support for DMM channel serialization * WIP: Prepare for incoming updates to JSON schema * Add descr sequence, _config_detuning_map * Finishing UTs, fixing typos * de-/serializing det maps, adding schema, slug * Dev tests * Fixing doc --------- Co-authored-by: a_corni <[email protected]> * Testing detuning of unmasked qubits, del print * Enabling use of add with slm * Replacing Modulate_det_map by add_dmm_detuning * Updating schema * finalizing replacing of modulate_detp_map * finalizing replacing of modulate_det_map * Rephrasing doc, add OpAddDmmDet * Handle parametrized sequence, switching device and DMM, and serialize config_det_map as an operation (#576) * Add slug description * Handle DMM & parametrized/switch_device/MapReg * Modifying schema, fixing type * Moving to a store decoration * Storing config_det_map * Taking into account review comments * Delete seq_tools * Testing MappableRegister, strict conversion * Replace modulate_det_map by add_dmm_detuning * Adding DMM notebook and Modifying SLM Mask (#569) * adding dmm, draw to DetuningMap * Testing avoiding circular import * Refactoring to avoid circular imports * Fix broken UTs * Import sorting * Fixing plot DetuningMap * Serialization/Deserialization of DMM in device * Fixing typos * Testing DMM and DetuningMap * Fixing typo * adding xfails, fixing type * Remove DMM from devices and finish UTs * Take into account review comments * Add annotations * Error in Global and Local * Defining _DMMSchedule * Fixing nits * Fixing typo * Creating DMM notebook, modif SLM notebook * Taking into account review comments * Fixing type * Fix labels in reg_drawer, draw det_maps in seq * Fixing doc build, add draw_detuning_maps to docs * Separating register/det_maps drawing from channels * introducing get_qubit_data * Add drawing of quantities per qubit * Fixing for local pulses * Adding bounds to label * Drawing legend for local targetting * FIX sampling rate, QutipEmulator * Updating figures * Updating SLM Mask & local addressability notebook * Adding explanation text * Fixing type * Replace modulate_det_map by add_dmm_detuning * Replace modulate_det_map for add_dmm_detuning * Fixing tests * Revert changes to Bayesian optimization notebook * Fixing docs * clearing outputs * Deleting scaling in favor extending to draw reg * Placing legend in lower part of drawing * Updating figures * Relaunching bayesian optimisation * Taking into account review comments * Printing sequence with DMM * Adding subscript and indent * Defining __str__ for DMM --------- Co-authored-by: HGSilveri <[email protected]> --------- Co-authored-by: Henrique Silvério <[email protected]>

a-corni and others added 24 commits June 22, 2023 18:49

adding dmm, draw to DetuningMap

b96c3f4

Merge branch 'develop' of https://github.com/pasqal-io/Pulser into ad…

46a47f5

…d_dmm

Testing avoiding circular import

baf18a8

Refactoring to avoid circular imports

d44261f

Fix broken UTs

d530a4e

Import sorting

7f64d45

Merge branch 'develop' into add_dmm

ce3534e

Merge branch 'develop' of https://github.com/pasqal-io/Pulser into ad…

5e54cb2

…d_dmm

Merge branch 'add_dmm' of https://github.com/pasqal-io/Pulser into ad…

e4d5db6

…d_dmm

Fixing plot DetuningMap

9376f0c

Serialization/Deserialization of DMM in device

3a6faa4

Fixing typos

ae733c4

Testing DMM and DetuningMap

ac21b96

Fixing typo

d72556d

adding xfails, fixing type

dfa0d9a

Remove DMM from devices and finish UTs

742aa1b

Take into account review comments

fed8410

Add annotations

4d86d15

Merge branch 'develop' of https://github.com/pasqal-io/Pulser into ad…

db87c19

…d_dmm

Error in Global and Local

4ca5a20

Defining _DMMSchedule

789080f

Fixing nits

e30a873

Fixing typo

e5d30a6

Creating DMM notebook, modif SLM notebook

ebe367c

a-corni changed the base branch from develop to add_dmm_sequence August 11, 2023 17:26

HGSilveri reviewed Aug 24, 2023

View reviewed changes

a-corni added 3 commits August 29, 2023 11:25

Merge branch 'add_dmm_sequence' of https://github.com/pasqal-io/Pulser …

44b2989

…into add_dmm_tuto

Taking into account review comments

0df34f6

Fixing type

b9924f1

Updating figures

193cdfc

a-corni self-assigned this Sep 19, 2023

Relaunching bayesian optimisation

d9fe13d

a-corni added 2 commits September 20, 2023 11:50

Merge branch 'add_dmm_sequence' of https://github.com/pasqal-io/Pulser …

f5bd697

…into add_dmm_sequence

Merge branch 'add_dmm_sequence' into add_dmm_tuto

0f9e996

HGSilveri reviewed Sep 20, 2023

View reviewed changes

tutorials/advanced_features/Local addressability with DMM.ipynb Show resolved Hide resolved

tutorials/advanced_features/Local addressability with DMM.ipynb Show resolved Hide resolved

tutorials/advanced_features/Local addressability with DMM.ipynb Show resolved Hide resolved

Taking into account review comments

03a3336

a-corni added 2 commits September 20, 2023 16:54

Printing sequence with DMM

89fddae

Adding subscript and indent

76f3660

Defining __str__ for DMM

2c22df0

HGSilveri approved these changes Sep 20, 2023

View reviewed changes

a-corni merged commit 082aa81 into add_dmm_sequence Sep 20, 2023
6 checks passed

a-corni deleted the add_dmm_tuto branch September 20, 2023 16:03

a-corni mentioned this pull request Sep 21, 2023

Adding dmm config and modulation to sequence #564

Merged

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding DMM notebook and Modifying SLM Mask #569

Adding DMM notebook and Modifying SLM Mask #569

a-corni commented Aug 11, 2023 •

edited

Loading

review-notebook-app bot commented Aug 11, 2023

a-corni commented Sep 18, 2023 •

edited

Loading

a-corni commented Sep 19, 2023

HGSilveri left a comment

a-corni commented Sep 20, 2023

HGSilveri commented Sep 20, 2023

a-corni commented Sep 20, 2023

HGSilveri commented Sep 20, 2023

a-corni commented Sep 20, 2023

HGSilveri commented Sep 20, 2023 •

edited

Loading

a-corni commented Sep 20, 2023

a-corni commented Sep 20, 2023 •

edited

Loading

HGSilveri commented Sep 20, 2023

a-corni commented Sep 20, 2023

HGSilveri commented Sep 20, 2023

a-corni commented Sep 20, 2023

HGSilveri left a comment

Adding DMM notebook and Modifying SLM Mask #569

Adding DMM notebook and Modifying SLM Mask #569

Conversation

a-corni commented Aug 11, 2023 • edited Loading

review-notebook-app bot commented Aug 11, 2023

a-corni commented Sep 18, 2023 • edited Loading

a-corni commented Sep 19, 2023

HGSilveri left a comment

Choose a reason for hiding this comment

a-corni commented Sep 20, 2023

HGSilveri commented Sep 20, 2023

a-corni commented Sep 20, 2023

HGSilveri commented Sep 20, 2023

a-corni commented Sep 20, 2023

HGSilveri commented Sep 20, 2023 • edited Loading

a-corni commented Sep 20, 2023

a-corni commented Sep 20, 2023 • edited Loading

HGSilveri commented Sep 20, 2023

a-corni commented Sep 20, 2023

HGSilveri commented Sep 20, 2023

a-corni commented Sep 20, 2023

HGSilveri left a comment

Choose a reason for hiding this comment

a-corni commented Aug 11, 2023 •

edited

Loading

a-corni commented Sep 18, 2023 •

edited

Loading

HGSilveri commented Sep 20, 2023 •

edited

Loading

a-corni commented Sep 20, 2023 •

edited

Loading