mwdust 1.5__tar.gz → 1.6__tar.gz

{mwdust-1.5 → mwdust-1.6}/HISTORY.txt

@@ -1,3 +1,7 @@
+v1.6 (XXXX-XX-XX)
+==================
+
+
 v1.5 (2023-10-13)
 ==================
 

{mwdust-1.5 → mwdust-1.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: mwdust
-Version: 1.5
+Version: 1.6
 Summary: Dust in the Milky Way
 Home-page: https://github.com/jobovy/mwdust
 Author: Jo Bovy
@@ -24,6 +24,15 @@ Requires-Dist: h5py
 Requires-Dist: tqdm
 Requires-Dist: requests
 Requires-Dist: healpy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 mwdust
 ======
@@ -98,6 +107,9 @@ roughly the following lay-out::
           bayestar2017.h5
        green19/
           bayestar2019.h5
+       zucker25/
+      	  decaps_mean.h5
+          decaps_mean_and_samples.h5
        maps/
           SFD_dust_4096_ngp.fits
           SFD_dust_4096_sgp.fits
@@ -238,6 +250,8 @@ map that you use:
 
 * **mwdust.Green19**: `Green et al. (2019) <https://ui.adsabs.harvard.edu/abs/2019arXiv190502734G>`__ (added by `@jan-rybizki <https://github.com/jan-rybizki>`__)
 
+* **mwdust.Zucker25**: `Zucker et al. (2025) <https://ui.adsabs.harvard.edu/abs/2025arXiv250302657Z>`__
+
 * **mwdust.Combined15**: Combination of 
   
   * `Marshall et al. (2006) <http://adsabs.harvard.edu/abs/2006A%26A...453..635M>`__ (**mwdust.Marshall06**),

{mwdust-1.5 → mwdust-1.6}/README.rst

@@ -79,6 +79,9 @@ roughly the following lay-out::
           bayestar2017.h5
        green19/
           bayestar2019.h5
+       zucker25/
+      	  decaps_mean.h5
+          decaps_mean_and_samples.h5
        maps/
           SFD_dust_4096_ngp.fits
           SFD_dust_4096_sgp.fits
@@ -219,6 +222,8 @@ map that you use:
 
 * **mwdust.Green19**: `Green et al. (2019) <https://ui.adsabs.harvard.edu/abs/2019arXiv190502734G>`__ (added by `@jan-rybizki <https://github.com/jan-rybizki>`__)
 
+* **mwdust.Zucker25**: `Zucker et al. (2025) <https://ui.adsabs.harvard.edu/abs/2025arXiv250302657Z>`__
+
 * **mwdust.Combined15**: Combination of 
   
   * `Marshall et al. (2006) <http://adsabs.harvard.edu/abs/2006A%26A...453..635M>`__ (**mwdust.Marshall06**),

{mwdust-1.5 → mwdust-1.6}/mwdust/DustMap3D.py

@@ -11,9 +11,9 @@ try:
 except ImportError:
     _BOVY_PLOT_LOADED= False
 
-class DustMap3D:
+class DustMap3D(object):
     """top-level class for a 3D dust map; all other dust maps inherit from this"""
-    def __init__(self,filter=None):
+    def __init__(self, filter=None, **download_kwargs):
         """
         NAME:
            __init__
@@ -26,7 +26,8 @@ class DustMap3D:
            2013-11-24 - Started - Bovy (IAS)
         """
         self._filter= filter
-        self.download()  # download the map
+        if hasattr(self, "download"):
+            self.download(**download_kwargs) # download the map
 
     def __call__(self,*args,**kwargs):
         """

{mwdust-1.5 → mwdust-1.6}/mwdust/HierarchicalHealpixMap.py

@@ -14,7 +14,7 @@ _DEGTORAD= numpy.pi/180.
 class HierarchicalHealpixMap(DustMap3D):
     """General class for extinction maps given as a hierarchical HEALPix 
     pixelation (e.g., Green et al. 2015) """
-    def __init__(self,filter=None,sf10=True):
+    def __init__(self,filter=None,sf10=True, **download_kwargs):
         """
         NAME:
            __init__
@@ -28,8 +28,8 @@ class HierarchicalHealpixMap(DustMap3D):
         HISTORY:
            2015-07-28 - Started - Bovy (UofT)
         """
-        DustMap3D.__init__(self,filter=filter)
-        self._sf10= sf10
+        super(HierarchicalHealpixMap, self).__init__(filter=filter, **download_kwargs)
+        self._sf10 = sf10
         return None
 
 
@@ -221,4 +221,4 @@ class HierarchicalHealpixMap(DustMap3D):
                                  format=r'$%g$',
                                  cmap='gist_yarg',
                                  **kwargs)
-        return None
+        return None

{mwdust-1.5 → mwdust-1.6}/mwdust/Marshall06.py

@@ -80,7 +80,7 @@ class Marshall06(DustMap3D):
            2013-12-12 - Started - Bovy (IAS)
         """
         if isinstance(l,numpy.ndarray) or isinstance(b,numpy.ndarray):
-            raise NotImplementedError("array input for l and b for Drimmel dust map not implemented")
+            raise NotImplementedError("array input for l and b for Marshall06 dust map not implemented")
         lbIndx= self._lbIndx(l,b)
         if self._intps[lbIndx] != 0:
             out= self._intps[lbIndx](d)

mwdust-1.6/mwdust/Zucker25.py

@@ -0,0 +1,107 @@
+###############################################################################
+#
+#   DECaPS25: extinction model from Zucker et al. (2025)
+#
+###############################################################################
+import os, os.path
+import numpy
+import h5py
+from mwdust.util.download import dust_dir, downloader
+from mwdust.HierarchicalHealpixMap import HierarchicalHealpixMap
+
+_DEGTORAD = numpy.pi/180.
+_decapsdir = os.path.join(dust_dir, 'zucker25')
+
+class Zucker25(HierarchicalHealpixMap):
+    """DECaPS 3D dust-reddening map (Zucker et al. 2025)"""
+    def __init__(self, filter=None, sf10=True, load_samples=False, interpk=1):
+        """
+        NAME:
+           __init__
+        PURPOSE:
+           Initialize the DECaPS (2025) dust map
+        INPUT:
+           filter= filter to return the extinction in
+           sf10= (True) if True, use the Schlafly & Finkbeiner calibrations
+           load_samples= (False) if True, also load the samples
+           interpk= (1) interpolation order
+        OUTPUT:
+           object
+        HISTORY:
+           2025-10-01 - Adopted
+        """
+        HierarchicalHealpixMap.__init__(self, filter=filter, sf10=sf10, samples=load_samples)
+        if not os.path.isdir(_decapsdir):
+            os.mkdir(_decapsdir)
+        fname = 'decaps_mean_and_samples.h5' if load_samples else 'decaps_mean.h5'
+        fpath = os.path.join(_decapsdir, fname)
+        if not os.path.exists(fpath):
+            self.download(samples=load_samples)
+        self._f = h5py.File(fpath, 'r')
+        self._best_fit = self._f['/mean'][:, 0, :]
+        p = self._f['/pixel_info']
+        hpx = p['healpix_index'][:]
+        nside_attr = int(p.attrs['nside'])
+        pix_dtype = numpy.dtype([('healpix_index', hpx.dtype), ('nside', numpy.int64)])
+        self._pix_info = numpy.empty(hpx.shape[0], dtype=pix_dtype)
+        self._pix_info['healpix_index'] = hpx
+        self._pix_info['nside'] = nside_attr
+        dm = numpy.array(p.attrs['DM_bin_edges'], dtype=numpy.float64)
+        if dm.shape[0] != self._best_fit.shape[1]:
+            raise RuntimeError("DM_bin_edges length does not match radial dimension")
+        self._distmods = dm
+        if load_samples:
+            if 'samples' not in self._f:
+                raise RuntimeError("Requested load_samples=True, but 'samples' dataset not found.")
+            self._samples_dset = self._f['/samples']
+        else:
+            self._samples_dset = None
+        self._minnside = numpy.amin(self._pix_info['nside'])
+        self._maxnside = numpy.amax(self._pix_info['nside'])
+        nlevels = int(numpy.log2(self._maxnside // self._minnside)) + 1
+        self._nsides = [self._maxnside // 2**ii for ii in range(nlevels)]
+        self._indexArray = numpy.arange(len(self._pix_info['healpix_index']))
+        self._intps = numpy.zeros(len(self._pix_info['healpix_index']), dtype='object')
+        self._interpk = interpk
+        return None
+
+    def substitute_sample(self, samplenum):
+        """
+        NAME:
+           substitute_sample
+        PURPOSE:
+           substitute a sample for the best fit to get the extinction from a sample with the same tools; need to have setup the instance with load_samples=True
+        INPUT:
+           samplenum - sample's index to load
+        OUTPUT:
+           (none; just resets the instance to use the sample rather than the best fit)
+        HISTORY:
+           2025-10-01 - Adopted
+        """
+        if self._samples_dset is None:
+            raise RuntimeError('No samples present in DECaPS file')
+        self._best_fit = self._samples_dset[:, samplenum, :]
+        self._intps = numpy.zeros(len(self._pix_info['healpix_index']), dtype='object')
+        return None
+
+    @classmethod
+    def download(cls, samples=False, test=False):
+        subdir = os.path.join(dust_dir, "decaps25")
+        if not os.path.exists(subdir):
+            os.mkdir(subdir)
+        if samples:
+            target = os.path.join(subdir, "decaps_mean_and_samples.h5")
+            url = "https://dataverse.harvard.edu/api/access/datafile/11840498"
+        else:
+            target = os.path.join(subdir, "decaps_mean.h5")
+            url = "https://dataverse.harvard.edu/api/access/datafile/11838924"
+        if not os.path.exists(target):
+            downloader(url, target, cls.__name__, test=test)
+        return None
+
+    def __del__(self):
+        try:
+            if hasattr(self, "_f") and self._f:
+                self._f.close()
+        except Exception:
+            pass

{mwdust-1.5 → mwdust-1.6}/mwdust/__init__.py

@@ -7,18 +7,21 @@ from mwdust.Green17 import Green17
 from mwdust.Green19 import Green19
 from mwdust.Combined15 import Combined15
 from mwdust.Combined19 import Combined19
+from mwdust.Zucker25 import Zucker25
 from mwdust.Zero import Zero
 
-__version__ = "1.5"
+__version__ = "1.6"
 
 
 def download_all(test=False):
     SFD.download(test=test)
     Marshall06.download(test=test)
     Drimmel03.download(test=test)
-    Sale14.download(test=test)
+    if not test:
+        Sale14.download(test=test)
     Green15.download(test=test)
     Green17.download(test=test)
     Green19.download(test=test)
     Combined15.download(test=test)
     Combined19.download(test=test)
+    Zucker25.download(test=test)

{mwdust-1.5 → mwdust-1.6}/mwdust/util/fortranfile.py

@@ -138,9 +138,10 @@ class FortranFile(file):
             data += read_data
 
     def _read_check(self):
-        return numpy.fromstring(self._read_exactly(self._header_length),
-                                dtype=self.ENDIAN+self.HEADER_PREC
-                               )[0]
+        return numpy.frombuffer(
+            self._read_exactly(self._header_length),
+            dtype=self.ENDIAN + self.HEADER_PREC,
+        )[0]
 
     def _write_check(self, number_of_bytes):
         """Write the header for the given number of bytes"""
@@ -205,7 +206,7 @@ class FortranFile(file):
             raise ValueError('Not an appropriate precision')
             
         data_str = self.readRecord()
-        return numpy.fromstring(data_str, dtype=self.ENDIAN+prec)
+        return numpy.frombuffer(data_str, dtype=self.ENDIAN + prec)
 
     def writeReals(self, reals, prec='f'):
         """Write an array of floats in given precision
@@ -240,7 +241,7 @@ class FortranFile(file):
             raise ValueError('Not an appropriate precision')
             
         data_str = self.readRecord()
-        return numpy.fromstring(data_str, dtype=self.ENDIAN+prec)
+        return numpy.frombuffer(data_str, dtype=self.ENDIAN + prec)
 
     def writeInts(self, ints, prec='i'):
         """Write an array of integers in given precision

{mwdust-1.5 → mwdust-1.6}/mwdust/util/healpix.py

@@ -1,5 +1,5 @@
 import sys
-import distutils.sysconfig as sysconfig
+import sysconfig
 import ctypes
 import ctypes.util
 from numpy.ctypeslib import ndpointer
@@ -7,7 +7,7 @@ import numpy as np
 from pathlib import Path
 
 # healpy number to represent bad numbers
-UNSEEN = -1.6375e+30
+UNSEEN = -1.6375e30
 
 # Find and load the library
 _lib = None
@@ -37,13 +37,18 @@ if _lib is None:
 def check_nside(nside, nest=False):
     """
     Utility function
-    
+
     Check if healpix map with nside is valid in general
     """
     # nside can only be a power of 2 for nest, but generally less than 2**29
     nside_arr = np.array(nside).astype(np.int64)
     is_ok = True
-    if np.all(np.logical_and(np.logical_and(nside == nside_arr, np.all(np.less(0, nside))), nside_arr <= 2**29)):
+    if np.all(
+        np.logical_and(
+            np.logical_and(nside == nside_arr, np.all(np.less(0, nside))),
+            nside_arr <= 2**29,
+        )
+    ):
         if nest:
             is_ok = (nside_arr & (nside_arr - 1)) == 0
     else:
@@ -55,7 +60,7 @@ def check_nside(nside, nest=False):
 def check_npix(npix):
     """
     Utility function
-    
+
     Check if total pixel number of a healpix map are valid in general
     """
     # check if npix is a valid value for healpix map size
@@ -67,7 +72,7 @@ def check_npix(npix):
 def check_ipix_nside(ipix, nside):
     """
     Utility function
-    
+
     Check if pixel number(s) are valid in a healpix map with nside
     """
     # check if all ipix are valid for a healpix map size
@@ -144,7 +149,7 @@ def ang2pix(nside, theta, phi, nest=False, lonlat=False):
     else:
         ang2pix_c = _lib.ang2pix_nest
     ndarrayFlags = ("C_CONTIGUOUS", "WRITEABLE")
-    
+
     ang2pix_c.argtypes = [
         ctypes.c_long,
         ndpointer(dtype=np.float64, flags=ndarrayFlags),
@@ -182,7 +187,7 @@ def ang2vec(theta, phi, lonlat=False):
         Angular coordinates to unit 3-vector direction
     INPUT:
         theta - colatitude
-        phi - longitude 
+        phi - longitude
         lonlat - input in longitude and latitude (deg)?
     OUTPUT:
         x, y, z - unit 3-vector direction
@@ -196,7 +201,7 @@ def ang2vec(theta, phi, lonlat=False):
 
     ang2vec_c = _lib.ang2vec
     ndarrayFlags = ("C_CONTIGUOUS", "WRITEABLE")
-    
+
     ang2vec_c.argtypes = [
         ndpointer(dtype=np.float64, flags=ndarrayFlags),
         ndpointer(dtype=np.float64, flags=ndarrayFlags),
@@ -213,7 +218,7 @@ def ang2vec(theta, phi, lonlat=False):
         phi.astype(np.float64, order="C", copy=False),
         ctypes.c_long(nstars),
     )
-    result = np.fromiter(res, dtype=np.float64, count=nstars*3)
+    result = np.fromiter(res, dtype=np.float64, count=nstars * 3)
     result = result.reshape(nstars, 3)
 
     # Reset input arrays
@@ -224,6 +229,7 @@ def ang2vec(theta, phi, lonlat=False):
 
     return result
 
+
 def pix2vec(nside, ipix, nest=False):
     """
     NAME:
@@ -266,7 +272,7 @@ def pix2vec(nside, ipix, nest=False):
         npix,
         ipix.astype(np.int64, order="C", copy=False),
     )
-    result = np.fromiter(res, dtype=np.float64, count=npix*3)
+    result = np.fromiter(res, dtype=np.float64, count=npix * 3)
     result = result.reshape(npix, 3)
 
     # Reset input arrays
@@ -320,7 +326,7 @@ def pix2ang(nside, ipix, nest=False, lonlat=False):
         npix,
         ipix.astype(np.int64, order="C", copy=False),
     )
-    result = np.fromiter(res, dtype=np.float64, count=npix*2)
+    result = np.fromiter(res, dtype=np.float64, count=npix * 2)
     result = result.reshape(npix, 2)
 
     # Reset input arrays
@@ -348,7 +354,7 @@ def nside2pixarea(nside):
     HISTORY:
         2023-03-01 - Written - Henry Leung (Toronto)
     """
-    return np.pi / (3 * nside ** 2)
+    return np.pi / (3 * nside**2)
 
 
 def nside2npix(nside):
@@ -367,7 +373,15 @@ def nside2npix(nside):
     return 12 * nside * nside
 
 
-def ud_grade(map_in, nside_plot, pess=False, order_in="RING", order_out=None, power=None, dtype=None):
+def ud_grade(
+    map_in,
+    nside_plot,
+    pess=False,
+    order_in="RING",
+    order_out=None,
+    power=None,
+    dtype=None,
+):
     """
     NAME:
         dust_vals_disk
@@ -383,29 +397,33 @@ def ud_grade(map_in, nside_plot, pess=False, order_in="RING", order_out=None, po
     """
     # check if arguements are implemented
     if order_in != "NEST" or (order_out is not None and order_out != "NEST"):
-        raise NotImplementedError("order_in and order_out for RING scheme is not implemented for now")
+        raise NotImplementedError(
+            "order_in and order_out for RING scheme is not implemented for now"
+        )
     if power is not None:
         raise NotImplementedError("power is not implemented for now")
     if pess is not False:
         raise NotImplementedError("pess=True is not implemented for now")
     if dtype is not False:
-        raise NotImplementedError("dtype is implemented for now, output map always has the same dtype as input map")
+        raise NotImplementedError(
+            "dtype is implemented for now, output map always has the same dtype as input map"
+        )
     check_nside(nside_plot, nest=order_in != "RING")
     map_in = np.asarray(map_in)
 
     num_of_map = len(np.atleast_2d(map_in))
     if num_of_map != 1:
         raise ValueError("This function only support one map at each time")
-    
+
     nside_in = npix2nside(len(map_in))
     npix_in = nside2npix(nside_in)
     npix_out = nside2npix(nside_in)
 
-    if nside_plot > nside_in: # upgrade
+    if nside_plot > nside_in:  # upgrade
         rat2 = npix_out // npix_in
         fact = np.ones(rat2, dtype=map_in.dtype)
         map_out = np.outer(map_in, fact).reshape(npix_out)
-    elif nside_plot < nside_in: # degrade
+    elif nside_plot < nside_in:  # degrade
         rat2 = npix_in // npix_out
         mr = map_in.reshape(npix_out, rat2)
         goods = ~(np.isclose(mr, UNSEEN) | (~np.isfinite(mr)) | (~np.isnan(mr)))
@@ -418,5 +436,5 @@ def ud_grade(map_in, nside_plot, pess=False, order_in="RING", order_out=None, po
             pass
     else:
         map_out = map_in
-        
-    return map_out
+
+    return map_out

mwdust-1.6/mwdust/util/read_SFD.py

@@ -0,0 +1,129 @@
+import sys
+import sysconfig
+import ctypes
+import ctypes.util
+from numpy.ctypeslib import ndpointer
+import os, os.path
+from pathlib import Path
+import numpy
+import platform
+import tqdm
+from mwdust.util.download import dust_dir
+
+WIN32 = platform.system() == "Windows"
+# Find and load the library
+_lib = None
+_libname = ctypes.util.find_library("sfd_c")
+PY3 = sys.version > "3"
+if PY3:  # pragma: no cover
+    _ext_suffix = sysconfig.get_config_var("EXT_SUFFIX")
+else:
+    _ext_suffix = sysconfig.get_config_var("SO")
+if _libname:
+    _lib = ctypes.CDLL(_libname)
+if _lib is None:
+    # Add top-level mwdust repository directory for pip install (-e) .,
+    # just becomes site-packages for regular install
+    paths = sys.path
+    paths.append(str(Path(__file__).parent.parent.parent.absolute()))
+    for path in [Path(p) for p in paths]:
+        if not path.is_dir():
+            continue
+        try:
+            _lib = ctypes.CDLL(str(path / f"sfd_c{_ext_suffix}"))
+        except OSError:
+            _lib = None
+        else:
+            break
+if _lib is None:
+    raise IOError("SFD/C module not found")
+
+# MAP path names
+ebvFileN = os.path.join(dust_dir, "maps", "SFD_dust_4096_ngp.fits")
+ebvFileS = os.path.join(dust_dir, "maps", "SFD_dust_4096_sgp.fits")
+
+
+def read_SFD_EBV(glon, glat, interp=True, noloop=False, verbose=False, pbar=True):
+    """
+    NAME:
+       read_SFD_EBV
+    PURPOSE:
+       read an E(B-V) value from the Schlegel, Finkbeiner, & Davis (1998) maps
+    INPUT:
+       glon - Galactic longitude (deg), can be an array
+       glat - Galactic latitude (deg), can be an array
+       interp= (True) if True, interpolate using the nearest pixels
+       noloop= (False) if True, don't loop through the glons
+       verbose= (False) if True, be verbose
+       pbar= (True) if True, show progress bar
+    OUTPUT:
+       array of E(B-V) from Schlegel, Finkbeiner, & Davis (1998)
+    HISTORY:
+       2013-11-23 - Written - Bovy (IAS)
+    """
+    # Parse input
+    if isinstance(glon, (int, float, numpy.float32, numpy.float64)):
+        glon = numpy.array([glon])
+    if isinstance(glat, (int, float, numpy.float32, numpy.float64)):
+        glat = numpy.array([glat])
+
+    nstar = len(glon)
+    if nstar > 1 and pbar:
+        pbar = tqdm.tqdm(total=nstar, leave=False)
+        pbar_func_ctype = ctypes.CFUNCTYPE(None)
+        pbar_c = pbar_func_ctype(pbar.update)
+    else:  # pragma: no cover
+        pbar_c = None
+
+    # Set up the C code
+    ndarrayFlags = ("C_CONTIGUOUS", "WRITEABLE")
+    evalFunc = _lib.lambert_getval
+    evalFunc.argtypes = [
+        ctypes.c_char_p,
+        ctypes.c_char_p,
+        ctypes.c_long,
+        ndpointer(dtype=numpy.float32, flags=ndarrayFlags),
+        ndpointer(dtype=numpy.float32, flags=ndarrayFlags),
+        ctypes.c_int,
+        ctypes.c_int,
+        ctypes.c_int,
+        ndpointer(dtype=numpy.int32, flags=ndarrayFlags),
+        ctypes.c_void_p,
+    ]
+    evalFunc.restype = ctypes.POINTER(ctypes.c_float)
+
+    # Array requirements, first store old order
+    f_cont = [glon.flags["F_CONTIGUOUS"], glat.flags["F_CONTIGUOUS"]]
+    glon = numpy.require(glon, dtype=numpy.float64, requirements=["C", "W"])
+    glat = numpy.require(glat, dtype=numpy.float64, requirements=["C", "W"])
+    err = numpy.require(0, dtype=numpy.int32, requirements=["C", "W"])
+
+    # Check that the filename isn't too long for the SFD code
+    if len(ebvFileN.encode("ascii")) >= 120 or len(ebvFileS.encode("ascii")) >= 120:
+        raise RuntimeError(
+            f"The path of the file that contains the SFD dust maps is too long ({len(ebvFileN.encode('ascii'))}); please shorten the path of DUST_DIR"
+        )
+
+    res = evalFunc(
+        ctypes.c_char_p(ebvFileN.encode("ascii")),
+        ctypes.c_char_p(ebvFileS.encode("ascii")),
+        ctypes.c_long(nstar),
+        glon.astype(numpy.float32, order="C", copy=False),
+        glat.astype(numpy.float32, order="C", copy=False),
+        ctypes.c_int(interp),
+        ctypes.c_int(noloop),
+        ctypes.c_int(verbose),
+        err,
+        pbar_c,
+    )
+    if numpy.any(err == -10):
+        raise KeyboardInterrupt("Interrupted by CTRL-C (SIGINT)")
+    result = numpy.fromiter(res, dtype=float, count=nstar)
+
+    # Reset input arrays
+    if f_cont[0]:
+        glon = numpy.asfortranarray(glon)
+    if f_cont[1]:
+        glat = numpy.asfortranarray(glat)
+
+    return result

{mwdust-1.5 → mwdust-1.6}/mwdust.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: mwdust
-Version: 1.5
+Version: 1.6
 Summary: Dust in the Milky Way
 Home-page: https://github.com/jobovy/mwdust
 Author: Jo Bovy
@@ -24,6 +24,15 @@ Requires-Dist: h5py
 Requires-Dist: tqdm
 Requires-Dist: requests
 Requires-Dist: healpy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 mwdust
 ======
@@ -98,6 +107,9 @@ roughly the following lay-out::
           bayestar2017.h5
        green19/
           bayestar2019.h5
+       zucker25/
+      	  decaps_mean.h5
+          decaps_mean_and_samples.h5
        maps/
           SFD_dust_4096_ngp.fits
           SFD_dust_4096_sgp.fits
@@ -238,6 +250,8 @@ map that you use:
 
 * **mwdust.Green19**: `Green et al. (2019) <https://ui.adsabs.harvard.edu/abs/2019arXiv190502734G>`__ (added by `@jan-rybizki <https://github.com/jan-rybizki>`__)
 
+* **mwdust.Zucker25**: `Zucker et al. (2025) <https://ui.adsabs.harvard.edu/abs/2025arXiv250302657Z>`__
+
 * **mwdust.Combined15**: Combination of 
   
   * `Marshall et al. (2006) <http://adsabs.harvard.edu/abs/2006A%26A...453..635M>`__ (**mwdust.Marshall06**),

{mwdust-1.5 → mwdust-1.6}/mwdust.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ mwdust/Marshall06.py
 mwdust/SFD.py
 mwdust/Sale14.py
 mwdust/Zero.py
+mwdust/Zucker25.py
 mwdust/__init__.py
 mwdust.egg-info/PKG-INFO
 mwdust.egg-info/SOURCES.txt

{mwdust-1.5 → mwdust-1.6}/setup.py

@@ -48,7 +48,7 @@ install_requires= ['numpy','scipy','matplotlib','astropy','h5py','tqdm', 'reques
 if not WIN32:
     install_requires.append('healpy')
 setup(name='mwdust',
-      version='1.5',
+      version='1.6',
       description='Dust in the Milky Way',
       author='Jo Bovy',
       author_email='bovy@astro.utoronto.ca',

mwdust-1.6/tests/test_sfd.py

@@ -0,0 +1,64 @@
+import pathlib
+import numpy
+from numpy.random import default_rng
+
+rng = default_rng()
+
+
+def test_distance_independent():
+    # Test that the SFD extinction is indepdendent of distance
+    # for a given line of sight.
+    from mwdust import SFD
+
+    sfd = SFD()
+    glons = rng.uniform(0.0, 360.0, size=20)
+    glats = rng.uniform(-90.0, 90.0, size=20)
+    dists = rng.uniform(0.1, 10.0, size=5)
+    ebvs = numpy.array(
+        [
+            [sfd(glons[ii], glats[ii], dists[jj]) for ii in range(len(glons))]
+            for jj in range(len(dists))
+        ]
+    ).T
+    assert numpy.all(
+        numpy.fabs(ebvs - ebvs[0]) < 10.0**-10.0
+    ), "SFD extinction is not independent of distance for a given line of sight"
+    return None
+
+
+def test_against_known_values():
+    # Test that the SFD extinction without interpolation agrees with a table of known values
+    # These were computed using mwdust on an M1 mac, so this test is really
+    # of consistency between other OSs and architectures
+    from mwdust import SFD
+
+    sfd = SFD(interp=False)
+    known = numpy.loadtxt(
+        pathlib.Path(__file__).parent / "sfd_benchmark.dat", delimiter=","
+    )
+    glons = known.T[0]
+    glats = known.T[1]
+    ebvs = known.T[2]
+    assert numpy.all(
+        ebvs - [sfd(glon, glat, 1.0)[0] for glon, glat in zip(glons, glats)]
+        < 10.0**-7.0
+    ), f"SFD extinction without interpolation does not agree with known values, with max difference {numpy.amax(numpy.fabs(ebvs-numpy.array([sfd(glon,glat,1.)[0] for glon,glat in zip(glons,glats)])))}"
+
+    # Test that the SFD extinction with interpolation agrees with a table of known values
+    # These were computed using mwdust on a linux server, same cavert above
+    from mwdust import SFD
+
+    sfd = SFD()
+    # specifically contains lb = (30, 3), a previously known inconsistency between Linux and Windows
+    known = numpy.loadtxt(
+        pathlib.Path(__file__).parent / "sfd_mwdust12_linux_benchmark.dat",
+        delimiter=",",
+    )
+    glons = known.T[0]
+    glats = known.T[1]
+    ebvs = known.T[2]
+    assert numpy.all(
+        ebvs - [sfd(glon, glat, 1.0)[0] for glon, glat in zip(glons, glats)]
+        < 10.0**-7.0
+    ), f"SFD extinction does not agree with known values, with max difference {numpy.amax(numpy.fabs(ebvs-numpy.array([sfd(glon,glat,1.)[0] for glon,glat in zip(glons,glats)])))}"
+    return None

mwdust-1.5/mwdust/util/read_SFD.py

@@ -1,123 +0,0 @@
-import sys
-import distutils.sysconfig as sysconfig
-import ctypes
-import ctypes.util
-from numpy.ctypeslib import ndpointer
-import os, os.path
-from pathlib import Path
-import numpy
-import platform
-import tqdm
-from mwdust.util.download import dust_dir
-
-WIN32= platform.system() == 'Windows'
-#Find and load the library
-_lib = None
-_libname = ctypes.util.find_library('sfd_c')
-PY3= sys.version > '3'
-if PY3: #pragma: no cover
-    _ext_suffix= sysconfig.get_config_var('EXT_SUFFIX')
-else:
-    _ext_suffix= sysconfig.get_config_var('SO')
-if _libname:
-    _lib = ctypes.CDLL(_libname)
-if _lib is None:
-    # Add top-level mwdust repository directory for pip install (-e) .,
-    # just becomes site-packages for regular install
-    paths = sys.path
-    paths.append(str(Path(__file__).parent.parent.parent.absolute()))
-    for path in [Path(p) for p in paths]:
-        if not path.is_dir():
-            continue
-        try:
-            _lib = ctypes.CDLL(str(path / f"sfd_c{_ext_suffix}"))
-        except OSError:
-            _lib = None
-        else:
-            break
-if _lib is None:
-    raise IOError('SFD/C module not found')
-
-#MAP path names
-ebvFileN= os.path.join(dust_dir,'maps','SFD_dust_4096_ngp.fits')
-ebvFileS= os.path.join(dust_dir,'maps','SFD_dust_4096_sgp.fits')
-
-def read_SFD_EBV(glon,glat,interp=True,noloop=False,verbose=False,pbar=True):
-    """
-    NAME:
-       read_SFD_EBV
-    PURPOSE:
-       read an E(B-V) value from the Schlegel, Finkbeiner, & Davis (1998) maps
-    INPUT:
-       glon - Galactic longitude (deg), can be an array
-       glat - Galactic latitude (deg), can be an array
-       interp= (True) if True, interpolate using the nearest pixels
-       noloop= (False) if True, don't loop through the glons
-       verbose= (False) if True, be verbose
-       pbar= (True) if True, show progress bar
-    OUTPUT:
-       array of E(B-V) from Schlegel, Finkbeiner, & Davis (1998)
-    HISTORY:
-       2013-11-23 - Written - Bovy (IAS)
-    """
-    #Parse input
-    if isinstance(glon,(int,float,numpy.float32,numpy.float64)):
-        glon= numpy.array([glon])
-    if isinstance(glat,(int,float,numpy.float32,numpy.float64)):
-        glat= numpy.array([glat])
-
-    nstar = len(glon)
-    if nstar > 1 and pbar:
-        pbar= tqdm.tqdm(total=nstar, leave=False)
-        pbar_func_ctype= ctypes.CFUNCTYPE(None)
-        pbar_c= pbar_func_ctype(pbar.update)
-    else: # pragma: no cover
-        pbar_c= None
-
-    #Set up the C code
-    ndarrayFlags= ('C_CONTIGUOUS','WRITEABLE')
-    evalFunc= _lib.lambert_getval
-    evalFunc.argtypes= [ctypes.c_char_p,
-                        ctypes.c_char_p,
-                        ctypes.c_long,
-                        ndpointer(dtype=numpy.float32,flags=ndarrayFlags),
-                        ndpointer(dtype=numpy.float32,flags=ndarrayFlags),
-                        ctypes.c_int,
-                        ctypes.c_int,
-                        ctypes.c_int, 
-                        ndpointer(dtype=numpy.int32,flags=ndarrayFlags),
-                        ctypes.c_void_p]
-    evalFunc.restype= ctypes.POINTER(ctypes.c_float)
-
-    #Array requirements, first store old order
-    f_cont= [glon.flags['F_CONTIGUOUS'],
-             glat.flags['F_CONTIGUOUS']]
-    glon= numpy.require(glon,dtype=numpy.float64,requirements=['C','W'])
-    glat= numpy.require(glat,dtype=numpy.float64,requirements=['C','W'])
-    err= numpy.require(0,dtype=numpy.int32,requirements=['C','W'])
-
-    # Check that the filename isn't too long for the SFD code
-    if len(ebvFileN.encode('ascii')) >= 120 \
-            or len(ebvFileS.encode('ascii')) >= 120:
-        raise RuntimeError(f"The path of the file that contains the SFD dust maps is too long ({len(ebvFileN.encode('ascii'))}); please shorten the path of DUST_DIR")
-
-    res= evalFunc(ctypes.c_char_p(ebvFileN.encode('ascii')),
-                     ctypes.c_char_p(ebvFileS.encode('ascii')),
-                     ctypes.c_long(nstar),
-                     glon.astype(numpy.float32,order='C',copy=False),
-                     glat.astype(numpy.float32,order='C',copy=False),
-                     ctypes.c_int(interp),
-                     ctypes.c_int(noloop),
-                     ctypes.c_int(verbose), 
-                     err,
-                     pbar_c
-                     )
-    if numpy.any(err == -10):
-        raise KeyboardInterrupt("Interrupted by CTRL-C (SIGINT)")
-    result= numpy.fromiter(res,dtype=float,count=nstar)
-
-    #Reset input arrays
-    if f_cont[0]: glon= numpy.asfortranarray(glon)
-    if f_cont[1]: glat= numpy.asfortranarray(glat)
-
-    return result

mwdust-1.5/tests/test_sfd.py

@@ -1,47 +0,0 @@
-import pathlib
-import numpy
-from numpy.random import default_rng
-rng= default_rng()
-
-def test_distance_independent():
-    # Test that the SFD extinction is indepdendent of distance 
-    # for a given line of sight.
-    from mwdust import SFD
-    sfd= SFD()
-    glons= rng.uniform(0.,360.,size=20)
-    glats= rng.uniform(-90.,90.,size=20)
-    dists= rng.uniform(0.1,10.,size=5)
-    ebvs= numpy.array([[sfd(glons[ii],glats[ii],dists[jj]) \
-                            for ii in range(len(glons))]
-                            for jj in range(len(dists))]).T     
-    assert numpy.all(numpy.fabs(ebvs-ebvs[0]) < 10.**-10.), \
-        'SFD extinction is not independent of distance for a given line of sight'
-    return None
-
-def test_against_known_values():
-    # Test that the SFD extinction without interpolation agrees with a table of known values
-    # These were computed using mwdust on an M1 mac, so this test is really
-    # of consistency between other OSs and architectures
-    from mwdust import SFD
-    sfd= SFD(interp=False)
-    known= numpy.loadtxt(pathlib.Path(__file__).parent / 'sfd_benchmark.dat',delimiter=',')
-    glons= known.T[0]
-    glats= known.T[1]
-    ebvs= known.T[2]
-    assert numpy.all(ebvs-[sfd(glon,glat,1.)[0]
-                            for glon,glat in zip(glons,glats)] < 10.**-8.), \
-        'SFD extinction without interpolation does not agree with known values'
-
-    # Test that the SFD extinction with interpolation agrees with a table of known values
-    # These were computed using mwdust on a linux server, same cavert above
-    from mwdust import SFD
-    sfd= SFD()
-    # specifically contains lb = (30, 3), a previously known inconsistency between Linux and Windows
-    known= numpy.loadtxt(pathlib.Path(__file__).parent / 'sfd_mwdust12_linux_benchmark.dat',delimiter=',')
-    glons= known.T[0]
-    glats= known.T[1]
-    ebvs= known.T[2]
-    assert numpy.all(ebvs-[sfd(glon,glat,1.)[0]
-                            for glon,glat in zip(glons,glats)] < 10.**-8.), \
-        'SFD extinction does not agree with known values'
-    return None