misc. bugfixes

qick_lib/qick/VERSION

@@ -1 +1 @@
-0.2.413
+0.2.414

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.

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]

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:

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]