Default alignment for pulses

BBN-Q · Mar 26, 2018 · 046bb29 · 046bb29
1 parent 8db8fe1
commit 046bb29
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/QGL/PulseSequencer.py b/QGL/PulseSequencer.py
@@ -88,6 +88,8 @@ def __neg__(self):
 
     def __mul__(self, other):
         """ Overload multiplication of Pulses as a "tensor" operator"""
+        if not np.isclose(self.length, other.length):
+            return align_p('center', self, other)
         ptype = promote_type(self, other)
         return self.promote(ptype) * other.promote(ptype)
 
@@ -220,7 +222,7 @@ def __mul__(self, rhs):
             else:
                 result.pulses[k] = v
         result.length = max(self.length, rhs.length)
-        return align('center', result)
+        return result
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):