Minor Changes

Author: HKaras

pyepr/dataset.py

@@ -436,7 +436,7 @@ def downconvert_dataset(dataset, filter_type='boxcar',IF=None,reduce=True,sampli
 
 
     if filter_type == 'boxcar':
-        filter_width = kwargs.get('filter_width',20)
+        filter_width = int(round(kwargs.get('filter_width',20)))
         funct = lambda data: np.convolve(data,np.ones(filter_width),mode='same')
         dc_first=True
     elif isinstance(filter_type, ad_pulses.Pulse): # match filter to a epr Pulse

pyepr/sequences.py

@@ -218,9 +218,11 @@ def _estimate_time(self) -> float:
         """
         self._buildPhaseCycle()
         acqs = self.averages.value * self.shots.value * self.pcyc_dets.shape[0]
+        
+        reptime = np.mean(val_in_us(self.reptime))
         if hasattr(self,'evo_params'):
             acqs *= np.prod([np.prod(param.dim) for param in self.evo_params])        
-        time = acqs * self.reptime.value * 1e-6
+        time = acqs * reptime * 1e-6
 
         self.time = Parameter(name="time", value=f"{(time // 3600):.0f}:{(time % 3600) // 60:.0f}:{(time % 60):.0f}", unit="HH:MM:SS",
         description="Estimated sequence run time")
@@ -428,6 +430,9 @@ def __str__(self):
                 if type(param.value) is str:
                     seq_param_string += "{:<10} {:<12} {:<10} {:<30} \n".format(
                         param.name, param.value, unit, param.description)
+                elif param.value is None:
+                    seq_param_string += "{:<10} {:<12} {:<10} {:<30} \n".format(
+                        param.name, "None", unit, param.description)
                 else:
                     seq_param_string += "{:<10} {:<12.5g} {:<10} {:<30} \n".format(
                         param.name, param.value, unit, param.description)
@@ -945,9 +950,9 @@ def __init__(self, *, B, freq, Bwidth, reptime, averages, shots, **kwargs) -> No
             shots=shots, **kwargs)
         self.name = "FieldSweepSequence"
 
-
+        dim = Bwidth // kwargs.get('step',1)
         self.B = Parameter(
-            "B", value=B, start = -Bwidth/2, step=1, dim=Bwidth, unit="Gauss", description="Field sweep width"
+            "B", value=B, start = -Bwidth/2, step=kwargs.get('step',1), dim=dim, unit="Gauss", description="Field sweep width"
         )
 
         self.evolution([self.B])