Merge branch 'master' into dev

CHANGELOG.md

 # Changelog
 All notable changes to Pulselib will be documented in this file.
 
-## \[1.3.5] - 2022-03-@@
+## \[1.3.6] - 2022-03-@@
 ### Added
 - Added argument reset_time to wait()
 
+## \[1.3.5] - 2022-03-29
+### Fixed
+- Error when rendering section with low sample rate extends into segment with high sample rate.
+
 ## \[1.3.4] - 2022-03-23
 ### Improved
 - QuantumSequencer use waveform with low sample rate for long DC compensation pulse.

pulse_lib/keysight/M3202A_uploader.py

@@ -500,7 +500,10 @@ class UploadAggregator:
 
             # create welding region if sample rate increases
             if sample_rate_next != 0 and sample_rate_next > sample_rate:
-                n_pre = round((section.t_end - (seg.t_end - max_pre_start_ns)) * section.sample_rate)
+                # The current section should end before the next segment starts:
+                # - subtract any extension into the next segment
+                # - align boundary with truncation
+                n_pre = int(np.ceil((section.t_end - (seg.t_end - max_pre_start_ns)) * section.sample_rate))
                 section.npt -= n_pre
                 section.align(extend=False)
 

pulse_lib/keysight/qs_uploader.py

@@ -600,7 +600,10 @@ class UploadAggregator:
 
             # create welding region if sample rate increases
             if sample_rate_next != 0 and sample_rate_next > sample_rate:
-                n_pre = round((section.t_end - (seg.t_end - max_pre_start_ns)) * section.sample_rate)
+                # The current section should end before the next segment starts:
+                # - subtract any extension into the next segment
+                # - align boundary with truncation
+                n_pre = int(np.ceil((section.t_end - (seg.t_end - max_pre_start_ns)) * section.sample_rate))
                 section.npt -= n_pre
                 section.align(extend=False)