From 906d63fe7ec7ae479f7ef3342a92685b0cf3eaa3 Mon Sep 17 00:00:00 2001 From: Sho Uemura Date: Fri, 5 Jun 2026 19:04:44 -0500 Subject: [PATCH 1/5] fix bug affecting testing firmwares --- qick_lib/qick/rfboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qick_lib/qick/rfboard.py b/qick_lib/qick/rfboard.py index 00f888cb..d0fa1422 100644 --- a/qick_lib/qick/rfboard.py +++ b/qick_lib/qick/rfboard.py @@ -243,7 +243,7 @@ def add(self, self.phase_reg = phase self.addr_reg = addr self.gain_reg = int(gain*self.gen.MAXV) - self.nsamp_reg = int(np.round(nsamp/self.gen.NDDS)) + self.nsamp_reg = int(np.round(nsamp/self.gen.SAMPS_PER_CLK)) self.outsel_reg = {"product": 0, "dds":1, "envelope":2}[outsel] self.mode_reg = {"nsamp": 0, "periodic":1}[mode] self.stdysel_reg = {"last": 0, "zero":1}[stdysel] From 2f95faedac8716c911eb6058ebbc2573f34e0ee2 Mon Sep 17 00:00:00 2001 From: Sho Uemura Date: Fri, 5 Jun 2026 19:05:14 -0500 Subject: [PATCH 2/5] fix typo introduced in #367 --- qick_lib/qick/qick.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qick_lib/qick/qick.py b/qick_lib/qick/qick.py index 38fa6232..c8117d3f 100644 --- a/qick_lib/qick/qick.py +++ b/qick_lib/qick/qick.py @@ -568,7 +568,7 @@ def set_mixer_freq(self, blockname, f, blocktype='dac', phase_reset=True, force= def get_mixer_freq(self, blockname, blocktype='dac'): try: - return self.mixer_dict[blocktype+'s'][blockname] + return self.mixer_dict[blocktype][blockname] except KeyError: blk_mixer = self._get_block(blocktype, blockname).MixerSettings if blk_mixer['MixerType'] != xrfdc.MIXER_TYPE_FINE: From 53e8413936cb644baadc75109e6ca8ad7b71d3d8 Mon Sep 17 00:00:00 2001 From: Sho Uemura Date: Fri, 5 Jun 2026 19:07:20 -0500 Subject: [PATCH 3/5] fix reps_innermost bug --- qick_lib/qick/asm_v2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qick_lib/qick/asm_v2.py b/qick_lib/qick/asm_v2.py index c5564a09..d9b5893a 100644 --- a/qick_lib/qick/asm_v2.py +++ b/qick_lib/qick/asm_v2.py @@ -2753,7 +2753,8 @@ def compile(self): super().compile() # use the loop list to set up the data shape - self.setup_acquire(counter_addr=self.COUNTER_ADDR, loop_dims=[x[1] for x in self.loops], avg_level=0) + avg_level = len(self.loops)-1 if self.reps_innermost else 0 + self.setup_acquire(counter_addr=self.COUNTER_ADDR, loop_dims=[x[1] for x in self.loops], avg_level=avg_level) def add_loop(self, name, count, exec_before=None, exec_after=None): """Add a loop level to the program. From 4d05e94eb38be1667f199b846b42f5a81d352e09 Mon Sep 17 00:00:00 2001 From: Sho Uemura Date: Fri, 5 Jun 2026 19:07:59 -0500 Subject: [PATCH 4/5] fix averager_program raw data bug from #342 --- qick_lib/qick/averager_program.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qick_lib/qick/averager_program.py b/qick_lib/qick/averager_program.py index 9e81b2c8..680699db 100644 --- a/qick_lib/qick/averager_program.py +++ b/qick_lib/qick/averager_program.py @@ -107,7 +107,7 @@ def acquire(self, soc, readouts_per_experiment=None, save_experiments=None, load def _process_accumulated(self, acc_buf): buf = super()._process_accumulated(acc_buf) - raw = [d.reshape((-1,2)) for d in buf] + raw = [d.reshape((-1,2)) for d in acc_buf] # reformat the data into separate I and Q arrays # save results to class in case you want to look at it later or for analysis self.di_buf = [d[:,0] for d in raw] @@ -314,7 +314,7 @@ def acquire(self, soc, readouts_per_experiment=None, save_experiments=None, load def _process_accumulated(self, acc_buf): buf = super()._process_accumulated(acc_buf) - raw = [d.reshape((-1,2)) for d in buf] + raw = [d.reshape((-1,2)) for d in acc_buf] # reformat the data into separate I and Q arrays # save results to class in case you want to look at it later or for analysis self.di_buf = [d[:,0] for d in raw] @@ -617,7 +617,7 @@ def acquire(self, soc, readouts_per_experiment=None, save_experiments: List = No def _process_accumulated(self, acc_buf): buf = super()._process_accumulated(acc_buf) - raw = [d.reshape((-1,2)) for d in buf] + raw = [d.reshape((-1,2)) for d in acc_buf] # reformat the data into separate I and Q arrays # save results to class in case you want to look at it later or for analysis self.di_buf = [d[:,0] for d in raw] From 967971de6916a1fd0eb8e8b24a82d1b273462416 Mon Sep 17 00:00:00 2001 From: "QICK actions [bot]" <129547417+qickbot@users.noreply.github.com> Date: Sat, 6 Jun 2026 00:23:40 +0000 Subject: [PATCH 5/5] update version --- qick_lib/qick/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qick_lib/qick/VERSION b/qick_lib/qick/VERSION index 07267c51..526b05dd 100644 --- a/qick_lib/qick/VERSION +++ b/qick_lib/qick/VERSION @@ -1 +1 @@ -0.2.413 +0.2.414