Fix (#48)

sandialabs · Dec 18, 2024 · 948319f · 948319f
2 parents 4c4ef57 + b1bdc86
commit 948319f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/src/qickdawg/nvpulsing/getreadoutwindow.py b/src/qickdawg/nvpulsing/getreadoutwindow.py
@@ -40,6 +40,8 @@ def get_readout_window(config, n_time_bins):
     laser_readout_offset_treg = config.laser_readout_offset_treg
     config.mw_pi2_tus = 0
 
+    assert (n_time_bins * config.readout_length_treg) <= config.laser_initialize_treg, "More time bins than laser on time"
+
     for i in range(n_time_bins):
         prog = ReadoutWindow(config)
         if i == 0:

diff --git a/src/qickdawg/nvpulsing/nvaverageprogram.py b/src/qickdawg/nvpulsing/nvaverageprogram.py
@@ -431,8 +431,7 @@ def ttl_readout(self):
         remaining_time = (
             self.cfg.laser_on_treg
             - 2 * self.cfg.readout_integration_treg
-            - self.cfg.readout_reference_start_treg
-            - self.cfg.laser_readout_offset_treg)
+            - self.cfg.readout_reference_start_treg)
 
         self.trigger(
             pins=[self.cfg.laser_gate_pmod],

diff --git a/src/qickdawg/nvpulsing/rabisweep.py b/src/qickdawg/nvpulsing/rabisweep.py
@@ -125,16 +125,16 @@ def initialize(self):
                                  length=self.cfg.mw_start_treg)
 
         # configure the sweep
-        self.mw_length_register = self.new_gen_reg(self.cfg.mw_channel, 
-                                                   name='mw_length', 
+        self.mw_length_register = self.new_gen_reg(self.cfg.mw_channel,
+                                                   name='mw_length',
                                                    init_val=self.cfg.mw_start_treg)
 
-        self.add_sweep(NVQickSweep(self, 
-                                   reg=self.mw_length_register, 
-                                   start=self.cfg.mw_start_treg, 
-                                   stop=self.cfg.mw_end_treg, 
+        self.add_sweep(NVQickSweep(self,
+                                   reg=self.mw_length_register,
+                                   start=self.cfg.mw_start_treg,
+                                   stop=self.cfg.mw_end_treg,
                                    expts=self.cfg.nsweep_points,
-                                   label='mw_length',
+                                   label='length',
                                    mw_channel=self.cfg.mw_channel))
 
         self.synci(400)  # give processor some time to configure pulses

diff --git a/src/qickdawg/nvpulsing/readoutwindow.py b/src/qickdawg/nvpulsing/readoutwindow.py
@@ -136,13 +136,16 @@ def body(self):
             t += self.cfg.laser_initialize_treg           
 
         t += self.cfg.relax_delay_treg
+        self.synci(t)
 
-        if self.cfg.mw_pi2_treg > 0:
+        t = 0
+        if self.cfg.mw_pi2_treg > 4:
             self.pulse(ch=self.cfg.mw_channel, t=t)
             t += self.cfg.mw_pi2_treg
 
-        self.sync_all(self.cfg.mw_readout_delay_treg)
-
+        t += self.cfg.mw_readout_delay_treg
+        self.synci(t)
+        t = 0
         if self.cfg.laser_readout_offset_treg > 3:
             self.trigger_no_off(
                 pins=[self.cfg.laser_gate_pmod],