Changeset 618

Timestamp:

09/16/08 09:28:24 (2 months ago)

Author:

laidler

Message:

#149: Removed tapering from spectrum.py:.resample() methods

Files:

• trunk/pysynphot/lib/spectrum.py (modified) (3 diffs)

trunk/pysynphot/lib/spectrum.py

@@ -312 +312 @@
-        hdu.writeto(filename)
-
-           
-
-                                                 
-    def integrate(self,fluxunits='photlam'):
+        #Extract the flux in the desired units
-        u=self.fluxunits
-        self.convert(fluxunits)
-
-        wave,flux=self.getArrays()
-        self.convert(u)
-
+#then do the integration
-        return self.trapezoidIntegration(wave,flux)
-    
@@ -547 +545 @@
-            newasc = False
-
-        ## First need to pad the ends of the spectrum with zeros
-        tapered = self.taper()
-
-        ## Use numpy interpolation function
-tapered._wavetable[0]<tapered
+self._wavetable[0]<self
-            oldasc = True
-tapered
-tapered
+self
+self
-        else:
-            oldasc = False
-tapered
-tapered
+self
+self
-            ans = rev[::-1]
-
@@ -1008 +1003 @@
-            newasc = False
-
-        #First need to pad the ends with zeros(?)
-        tapered=self.taper()
-        ## Use numpy interpolation function
-tapered._wavetable[0]<tapered
+self._wavetable[0]<self
-            oldasc = True
-tapered
-tapered
+self
+self
-        else:
-            oldasc = False
-tapered
-tapered
+self
+self
-            ans = rev[::-1]
-