Skip to content

Commit

Permalink
Merge pull request #81 from Ulm-IQO/bugfix_sequence_generation
Browse files Browse the repository at this point in the history
Bugfix in sequence_generator_logic.py.
  • Loading branch information
timoML authored Nov 17, 2023
2 parents 927d811 + 67bd037 commit 5504ba0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
6 changes: 4 additions & 2 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ docstrings.

### Bugfixes
- Basic data saving in `TimeSeriesReaderLogic` works now.
- Added remote streamer support to `TimeSeriesReaderLogic`.
- Fix missing meta info `generation_method_parameters` that occurred for generated sequences with granularity mismatch.
- Ni Finite Sampling Input module now returns digital input channel values in "clicks/counts" per second and not "clicks/counts" per clock cycle


### New Features
- Added remote streamer support to `TimeSeriesReaderLogic`.
- New `qudi.interface.data_instream_interface.SampleTiming` Enum added to `DataInStreamInterface`
constraints to allow non-uniform sampling mode.
- Pulsed and odmr now add fit parameters to saved meta data.
- New hardware module added that implements the HighFinesse wavemeter as a data instream device, replacing the old (non-functional) wavemeter toolchain.


### Other
- Bumped `qudi-core` package minimum version requirement to v1.4.0
- Bumped `qudi-core` package minimum version requirement to v1.5.0
- Got rid of deprecated `qudi.core.interface` module usage
- Support for Python 3.10

Expand Down
9 changes: 7 additions & 2 deletions src/qudi/logic/pulsed/sequence_generator_logic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1751,9 +1751,14 @@ def sample_pulse_block_ensemble(self, ensemble, offset_bin=0, name_tag=None):
pulse_function={chnl: SamplingFunctions.Idle() for chnl in self.analog_channels},
digital_high={chnl: False for chnl in self.digital_channels})
idle_extension = PulseBlock('idle_extension', element_list=[pb_element])
temp_measurement_info = copy.deepcopy(ensemble.measurement_information)

# appending idle element invalidates meta-info. Restore meta-info here.
temp_generation_parameters = copy.deepcopy(ensemble.generation_method_parameters)
temp_measurement_information = copy.deepcopy(ensemble.measurement_information)
ensemble.append((idle_extension.name, 0))
ensemble.measurement_information = temp_measurement_info

ensemble.measurement_information = temp_measurement_information
ensemble.generation_method_parameters = temp_generation_parameters

self.save_block(idle_extension)
self.save_ensemble(ensemble)
Expand Down

0 comments on commit 5504ba0

Please sign in to comment.