Fix up __mul__ logic in SpectralElement

spacetelescope · Oct 12, 2017 · 79e4c61 · 79e4c61
1 parent 600b4d8
commit 79e4c61
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pysynphot/spectrum.py b/pysynphot/spectrum.py
@@ -1750,17 +1750,17 @@ def __mul__(self, other):
         if isinstance(other, SpectralElement):
             return CompositeSpectralElement(self, other)
 
-        if isinstance(other, SourceSpectrum):
-            return CompositeSourceSpectrum(self, other, 'multiply')
+        elif isinstance(other, SourceSpectrum):
+            return other.__mul__(self)
 
         # Multiplying by a constant is the same as multiplying by a
         # UniformTransmission object
-        if isinstance(other, (int, float)):
+        elif isinstance(other, (int, float)):
             return CompositeSpectralElement(self, UniformTransmission(other))
 
         else:
-            print("SpectralElements can only be multiplied by other " +
-                  "SpectralElements or SourceSpectrum objects")
+            raise TypeError("SpectralElements can only be multiplied by other "
+                            "SpectralElements or SourceSpectrum objects")
 
     def __rmul__(self, other):
         return self.__mul__(other)