Move scale/phase/detuning properties into TemplateWaveform

pyquil/quilatom.py

@@ -832,6 +832,15 @@ class TemplateWaveform(QuilAtom):
     duration: float
     """ The duration [seconds] of the waveform. """
 
+    scale: Optional[float] = None
+    """ An optional global scaling factor. """
+
+    phase: Optional[float] = None
+    """ An optional phase shift factor. """
+
+    detuning: Optional[float] = None
+    """ An optional frequency detuning factor. """
+
     def num_samples(self, rate: float) -> int:
         """The number of samples in the reference implementation of the waveform.
 

pyquil/quiltwaveforms.py

@@ -92,15 +92,6 @@ class FlatWaveform(TemplateWaveform):
     iq: Complex
     """ A raw IQ value. """
 
-    scale: Optional[float] = None
-    """ An optional global scaling factor. """
-
-    phase: Optional[float] = None
-    """ An optional phase shift factor. """
-
-    detuning: Optional[float] = None
-    """ An optional frequency detuning factor. """
-
     def out(self) -> str:
         output = "flat("
         output += ", ".join(
@@ -128,15 +119,6 @@ class GaussianWaveform(TemplateWaveform):
     t0: float
     """ The center time coordinate of the Gaussian (seconds). """
 
-    scale: Optional[float] = None
-    """ An optional global scaling factor. """
-
-    phase: Optional[float] = None
-    """ An optional phase shift factor. """
-
-    detuning: Optional[float] = None
-    """ An optional frequency detuning factor. """
-
     def out(self) -> str:
         output = "gaussian("
         output += ", ".join(
@@ -172,15 +154,6 @@ class DragGaussianWaveform(TemplateWaveform):
     alpha: float
     """ Dimensionles DRAG parameter. """
 
-    scale: Optional[float] = None
-    """ An optional global scaling factor. """
-
-    phase: Optional[float] = None
-    """ An optional phase shift factor. """
-
-    detuning: Optional[float] = None
-    """ An optional frequency detuning factor. """
-
     def out(self) -> str:
         output = "drag_gaussian("
         output += ", ".join(
@@ -232,15 +205,6 @@ class HrmGaussianWaveform(TemplateWaveform):
     second_order_hrm_coeff: float
     """ Second order coefficient (see Warren 1984). """
 
-    scale: Optional[float] = None
-    """ An optional global scaling factor. """
-
-    phase: Optional[float] = None
-    """ An optional phase shift factor. """
-
-    detuning: Optional[float] = None
-    """ An optional frequency detuning factor. """
-
     def out(self) -> str:
         output = "hrm_gaussian("
         output += ", ".join(
@@ -289,15 +253,6 @@ class ErfSquareWaveform(TemplateWaveform):
     pad_right: float
     """ Amount of zero-padding to add to the right of the pulse (seconds). """
 
-    scale: Optional[float] = None
-    """ An optional global scaling factor. """
-
-    phase: Optional[float] = None
-    """ An optional phase shift factor. """
-
-    detuning: Optional[float] = None
-    """ An optional frequency detuning factor. """
-
     def out(self) -> str:
         output = "erf_square("
         output += ", ".join(
@@ -331,15 +286,6 @@ def samples(self, rate: float) -> np.ndarray:
 @waveform("boxcar_kernel")
 class BoxcarAveragerKernel(TemplateWaveform):
 
-    scale: Optional[float] = None
-    """ An optional global scaling factor. """
-
-    phase: Optional[float] = None
-    """ An optional phase shift factor. """
-
-    detuning: Optional[float] = None
-    """ An optional frequency detuning factor. """
-
     def out(self) -> str:
         output = "boxcar_kernel("
         output += ", ".join([f"duration: {self.duration}"] + _optional_field_strs(self))