Undo stupid stuff

Author: thangleiter

filter_functions/gradient.py

@@ -62,9 +62,6 @@
 from .basis import Basis
 from .types import Coefficients, Operator
 
-if False:
-    from .pulse_sequence import PulseSequence
-
 __all__ = ['calculate_derivative_of_control_matrix_from_scratch',
            'calculate_filter_function_derivative', 'infidelity_derivative']
 
@@ -552,7 +549,7 @@ def calculate_filter_function_derivative(ctrlmat: ndarray, ctrlmat_deriv: ndarra
 
 
 def infidelity_derivative(
-        pulse: PulseSequence,
+        pulse: 'PulseSequence',
         spectrum: Coefficients,
         omega: Coefficients,
         control_identifiers: Optional[Sequence[str]] = None,

filter_functions/numeric.py

@@ -80,9 +80,6 @@
 from .basis import Basis
 from .types import Coefficients, Operator
 
-if False:
-    from .pulse_sequence import PulseSequence
-
 __all__ = ['calculate_control_matrix_from_atomic', 'calculate_control_matrix_from_scratch',
            'calculate_control_matrix_periodic', 'calculate_cumulant_function',
            'calculate_decay_amplitudes', 'calculate_filter_function', 'calculate_frequency_shifts',
@@ -918,7 +915,7 @@ def calculate_control_matrix_periodic(phases: ndarray, control_matrix: ndarray,
 
 @util.parse_optional_parameters(which=('total', 'correlations'))
 def calculate_cumulant_function(
-        pulse: PulseSequence,
+        pulse: 'PulseSequence',
         spectrum: Optional[ndarray] = None,
         omega: Optional[Coefficients] = None,
         n_oper_identifiers: Optional[Sequence[str]] = None,
@@ -1124,7 +1121,7 @@ def calculate_cumulant_function(
 
 @util.parse_optional_parameters(which=('total', 'correlations'))
 def calculate_decay_amplitudes(
-        pulse: PulseSequence,
+        pulse: 'PulseSequence',
         spectrum: ndarray,
         omega: Coefficients,
         n_oper_identifiers: Optional[Sequence[str]] = None,
@@ -1269,7 +1266,7 @@ def calculate_decay_amplitudes(
 
 
 def calculate_frequency_shifts(
-        pulse: PulseSequence,
+        pulse: 'PulseSequence',
         spectrum: ndarray,
         omega: Coefficients,
         n_oper_identifiers: Optional[Sequence[str]] = None,
@@ -1696,7 +1693,7 @@ def diagonalize(hamiltonian: ndarray, dt: Coefficients) -> Tuple[ndarray]:
 
 
 def error_transfer_matrix(
-        pulse: Optional[PulseSequence] = None,
+        pulse: Optional['PulseSequence'] = None,
         spectrum: Optional[ndarray] = None,
         omega: Optional[Coefficients] = None,
         n_oper_identifiers: Optional[Sequence[str]] = None,
@@ -1821,7 +1818,7 @@ def error_transfer_matrix(
 
 @util.parse_optional_parameters(which=('total', 'correlations'))
 def infidelity(
-        pulse: PulseSequence,
+        pulse: 'PulseSequence',
         spectrum: Union[Coefficients, Callable],
         omega: Union[Coefficients, Dict[str, Union[int, str]]],
         n_oper_identifiers: Optional[Sequence[str]] = None,

filter_functions/plotting.py

@@ -58,9 +58,6 @@
 from .types import (Axes, Coefficients, Colormap, Cycler, Figure, FigureAxes, FigureAxesLegend,
                     FigureGrid, Grid, Operator, State)
 
-if False:
-    from .pulse_sequence import PulseSequence
-
 __all__ = ['plot_cumulant_function', 'plot_infidelity_convergence', 'plot_filter_function',
            'plot_pulse_correlation_filter_function', 'plot_pulse_train']
 
@@ -156,7 +153,7 @@ def get_states_from_prop(U: Sequence[Operator], psi0: Optional[State] = None) ->
 
 
 def plot_bloch_vector_evolution(
-        pulse: PulseSequence,
+        pulse: 'PulseSequence',
         psi0: Optional[State] = None,
         b: Optional[qt.Bloch] = None,
         n_samples: Optional[int] = None,
@@ -273,7 +270,7 @@ def plot_bloch_vector_evolution(
 
 
 def plot_pulse_train(
-        pulse: PulseSequence,
+        pulse: 'PulseSequence',
         c_oper_identifiers: Optional[Sequence[int]] = None,
         fig: Optional[Figure] = None,
         axes: Optional[Axes] = None,
@@ -360,7 +357,7 @@ def plot_pulse_train(
 
 
 def plot_filter_function(
-        pulse: PulseSequence,
+        pulse: 'PulseSequence',
         omega: Optional[Coefficients] = None,
         n_oper_identifiers: Optional[Sequence[int]] = None,
         fig: Optional[Figure] = None,
@@ -492,7 +489,7 @@ def plot_filter_function(
 
 
 def plot_pulse_correlation_filter_function(
-        pulse: PulseSequence,
+        pulse: 'PulseSequence',
         n_oper_identifiers: Optional[Sequence[int]] = None,
         fig: Optional[Figure] = None,
         xscale: str = 'log',
@@ -684,7 +681,7 @@ def plot_infidelity_convergence(n_samples: Sequence[int], infids: Sequence[float
 
 @util.parse_optional_parameters(colorscale=('linear', 'log'))
 def plot_cumulant_function(
-        pulse: Optional[PulseSequence] = None,
+        pulse: Optional['PulseSequence'] = None,
         spectrum: Optional[ndarray] = None,
         omega: Optional[Coefficients] = None,
         cumulant_function: Optional[ndarray] = None,

filter_functions/util.py

@@ -79,9 +79,6 @@
 
 from .types import Operator, State
 
-if False:
-    from .pulse_sequence import PulseSequence
-
 try:
     import ipynbname
     _NOTEBOOK_NAME = ipynbname.name()
@@ -1001,7 +998,7 @@ def dot_HS(U: Operator, V: Operator, eps: Optional[float] = None) -> Union[float
 
 
 @parse_optional_parameters(spacing=('log', 'linear'))
-def get_sample_frequencies(pulse: PulseSequence, n_samples: int = 300, spacing: str = 'log',
+def get_sample_frequencies(pulse: 'PulseSequence', n_samples: int = 300, spacing: str = 'log',
                            include_quasistatic: bool = False, omega_min: Optional[float] = None,
                            omega_max: Optional[float] = None) -> ndarray:
     r"""Get *n_samples* sample frequencies spaced 'linear' or 'log'.