Fix conditionals

Author: thangleiter

filter_functions/numeric.py

@@ -678,11 +678,12 @@ def restore_memory_layout(x): return x.swapaxes(-1, -2)
     # It is quite a bit faster to work with frequencies on the second-to-last axis
     control_matrix_atomic = np.ascontiguousarray(control_matrix_atomic.swapaxes(-1, -2))
 
+    # First time step is simply the first atomic control matrix
     if which == 'correlations':
         control_matrix = np.empty_like(control_matrix_atomic)
         control_matrix[0] = control_matrix_atomic[0]
-    elif which == 'total':
-        # First time step is simply the first atomic control matrix
+    else:
+        # which == 'total'
         control_matrix = control_matrix_atomic[0].copy()
         # A buffer for intermediate terms in the calculation.
         step = np.empty_like(control_matrix)

filter_functions/pulse_sequence.py

@@ -1851,7 +1851,7 @@ def concatenate(
         # control_matrix is the step-wise one.
         control_matrix_atomic_step = control_matrix
         control_matrix_atomic_cumulative = control_matrix_atomic_step.cumsum(axis=0)
-        if which == 'total':
+        if not calc_pulse_correlation_FF:
             # restore the total control matrix for below
             control_matrix = control_matrix_atomic_cumulative[-1]