Dev new

astLib/__init__.py

@@ -3,7 +3,7 @@
 
 (c) 2007-2012 Matt Hilton
 
-(c) 2013-2024 Matt Hilton & Steven Boada
+(c) 2013-2025 Matt Hilton & Steven Boada
 
 U{https://astlib.readthedocs.io}
 
@@ -13,4 +13,4 @@
 """
 
 __all__=['astCalc', 'astCoords', 'astImages', 'astPlots', 'astStats', 'astWCS', 'astSED']
-__version__ = '0.12.0'
+__version__ = '0.13.0'

astLib/astSED.py

@@ -85,7 +85,7 @@ def __init__(self, fileName, normalise = True, inputUnits = 'angstroms', wavelen
         self.transmission=sortedMerged[:, 1]
 
         if normalise == True:
-            self.transmission=self.transmission/np.trapz(self.transmission, self.wavelength)
+            self.transmission=self.transmission/np.trapezoid(self.transmission, self.wavelength)
 
         # Store a ready-to-go interpolation object to speed calculation of fluxes up
         self.interpolator=interpolate.interp1d(self.wavelength, self.transmission, kind='linear')
@@ -152,8 +152,8 @@ def effectiveWavelength(self):
 
         """
 
-        a=np.trapz(self.transmission*self.wavelength, self.wavelength)
-        b=np.trapz(self.transmission/self.wavelength, self.wavelength)
+        a=np.trapezoid(self.transmission*self.wavelength, self.wavelength)
+        b=np.trapezoid(self.transmission/self.wavelength, self.wavelength)
         effWavelength=np.sqrt(a/b)
 
         return effWavelength
@@ -182,7 +182,7 @@ def __init__(self, wavelengthMin, wavelengthMax, normalise = True):
         self.transmission=np.ones(self.wavelength.shape, dtype = float)
 
         if normalise == True:
-            self.transmission=self.transmission/np.trapz(self.transmission, self.wavelength)
+            self.transmission=self.transmission/np.trapezoid(self.transmission, self.wavelength)
 
         # Store a ready-to-go interpolation object to speed calculation of fluxes up
         self.interpolator=interpolate.interp1d(self.wavelength, self.transmission, kind='linear')
@@ -348,7 +348,7 @@ def integrate(self, wavelengthMin = 'min', wavelengthMax = 'max'):
 
         mask=np.logical_and(np.greater(self.wavelength, wavelengthMin), \
                                np.less(self.wavelength, wavelengthMax))
-        flux=np.trapz(self.flux[mask], self.wavelength[mask])
+        flux=np.trapezoid(self.flux[mask], self.wavelength[mask])
 
         return flux
 
@@ -380,9 +380,9 @@ def redshift(self, z):
         self.wavelength=self.wavelength+self.z0wavelength
         self.flux=self.flux+self.z0flux
 
-        z0TotalFlux=np.trapz(self.z0wavelength, self.z0flux)
+        z0TotalFlux=np.trapezoid(self.z0wavelength, self.z0flux)
         self.wavelength=self.wavelength*(1.0+z)
-        zTotalFlux=np.trapz(self.wavelength, self.flux)
+        zTotalFlux=np.trapezoid(self.wavelength, self.flux)
         self.flux=self.flux*(z0TotalFlux/zTotalFlux)
         self.z=z
 
@@ -407,7 +407,7 @@ def normalise(self, minWavelength = 'min', maxWavelength = 'max'):
         sedFluxSlice=self.flux[totalCut]
         sedWavelengthSlice=self.wavelength[totalCut]
 
-        self.flux=self.flux/np.trapz(abs(sedFluxSlice), sedWavelengthSlice)#self.wavelength)
+        self.flux=self.flux/np.trapezoid(abs(sedFluxSlice), sedWavelengthSlice)#self.wavelength)
 
 
     def normaliseToMag(self, ABMag, passband):
@@ -445,8 +445,8 @@ def matchFlux(self, matchSED, minWavelength, maxWavelength):
 
         wavelengthRange=np.arange(minWavelength, maxWavelength, 5.0)
 
-        matchFlux=np.trapz(interpMatch(wavelengthRange), wavelengthRange)
-        selfFlux=np.trapz(interpSelf(wavelengthRange), wavelengthRange)
+        matchFlux=np.trapezoid(interpMatch(wavelengthRange), wavelengthRange)
+        selfFlux=np.trapezoid(interpSelf(wavelengthRange), wavelengthRange)
 
         self.flux=self.flux*(matchFlux/selfFlux)
 
@@ -469,8 +469,8 @@ def calcFlux(self, passband):
         # Use linear interpolation to rebin the passband to the same dimensions as the 
         # part of the SED we're interested in
         sedInBand=passband.interpolator(sedWavelengthSlice)*sedFluxSlice   
-        totalFlux=np.trapz(sedInBand*sedWavelengthSlice, sedWavelengthSlice)
-        totalFlux=totalFlux/np.trapz(passband.interpolator(sedWavelengthSlice)\
+        totalFlux=np.trapezoid(sedInBand*sedWavelengthSlice, sedWavelengthSlice)
+        totalFlux=totalFlux/np.trapezoid(passband.interpolator(sedWavelengthSlice)\
                             *sedWavelengthSlice, sedWavelengthSlice)
 
         return totalFlux      
@@ -679,8 +679,8 @@ def __init__(self, normalise = False):
         self.z=0.0
 
         #if normalise == True:
-            #self.flux=self.flux/np.trapz(self.flux, self.wavelength)
-            #self.z0flux=self.z0flux/np.trapz(self.z0flux, self.z0wavelength)
+            #self.flux=self.flux/np.trapezoid(self.flux, self.wavelength)
+            #self.z0flux=self.z0flux/np.trapezoid(self.z0flux, self.z0wavelength)
 
 #------------------------------------------------------------------------------------------------------------
 class StellarPopulation:

setup.cfg

@@ -21,6 +21,6 @@ classifiers =
 packages = find:
 install_requires =
     astropy >= 3.2
-    numpy >= 1.10, < 2
+    numpy >= 2
     matplotlib >= 3.0
     scipy >= 1.7

setup.py

@@ -58,7 +58,7 @@ def build_extensions(self):
         build_ext.build_extensions(self)
 
 setup(name='astLib',
-    version='0.12.1',
+    version='0.13.0',
     packages=['astLib', 'PyWCSTools'],
     package_data={'astLib': ['data/*']},
     cmdclass={"build_ext": build_PyWCSTools_ext},