Special handling of samples from a DMM channel #565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a-corni
reviewed
Jul 27, 2023
There was a problem hiding this comment.
I have not checked all the tests so far, but it looks good to me, I think it will solve the issues I have with to_nested_dict. I have changed my handling of slm mask in sequence such that when you first config an SLM mask and then declare a XY mode, it deletes the declared DMM from _schedule. This way, it should be compatible with your implementation
Ok, cool. I didn't write any new tests yet, I just put xfails on those we expect to fail for now. I'll try to work on the tests that are independent from your changes this afternoon |
a-corni
approved these changes
Jul 28, 2023
16 tasks
a-corni
added a commit
that referenced
this pull request
Sep 22, 2023
* 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]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To Do:
TrapsinWeightMapSequence