diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 21d104a7..e65bc86f 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -119,14 +119,14 @@ jobs: mv source-distribution/*.tar.gz wheel-*/*.whl dist - name: Publish distribution 📦 to Test PyPI - if: ${{ github.ref != 'refs/tags/v2.2.3' }} + if: ${{ github.ref != 'refs/tags/v2.2.4' }} uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.TEST_PYPI_TOKEN }} repository_url: https://test.pypi.org/legacy/ - name: Publish distribution 📦 to PyPI - if: ${{ github.ref == 'refs/tags/v2.2.3' }} + if: ${{ github.ref == 'refs/tags/v2.2.4' }} uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.PYPI_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index ad1f8ab4..530d91b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12...4.0) project( s2let - VERSION "2.2.3" + VERSION "2.2.4" DESCRIPTION "Fast wavelets on the sphere" HOMEPAGE_URL "http://astro-informatics.github.io/s2let/" LANGUAGES C) diff --git a/cmake/conan_dependencies.cmake b/cmake/conan_dependencies.cmake index b3db292c..543ecbc1 100644 --- a/cmake/conan_dependencies.cmake +++ b/cmake/conan_dependencies.cmake @@ -20,6 +20,6 @@ conan_cmake_install( BUILD missing REMOTE - conan-center + conancenter SETTINGS ${settings}) diff --git a/conanfile.py b/conanfile.py deleted file mode 100644 index 96bf9714..00000000 --- a/conanfile.py +++ /dev/null @@ -1,64 +0,0 @@ -from conans import CMake, ConanFile - - -class S2letConan(ConanFile): - name = "s2let" - version = "2.2.3" - license = "GPL-2.0" - url = "https://github.com/astro-informatics/s2let" - homepage = "https://github.com/astro-informatics/s2let" - description = "Fast wavelet transforms on the sphere" - settings = "os", "arch", "compiler", "build_type" - topics = ("Physics", "Astrophysics", "Radio Interferometry") - options = {"fPIC": [True, False], "with_cfitsio": [True, False]} - default_options = {"fPIC": True, "with_cfitsio": True} - generators = "cmake" - exports_sources = [ - "src/main/c/*", - "src/test/c/*", - "include/s2let/*", - "CMakeLists.txt", - "cmake/*.cmake", - ] - - def configure(self): - if self.settings.compiler == "Visual Studio": - del self.options.fPIC - self.options["so3"].fPIC = self.options.fPIC - if self.options.with_cfitsio: - self.options["cfitsio"].fPIC = self.options.fPIC - self.options["cfitsio"].shared = False - del self.settings.compiler.libcxx - - def requirements(self): - location = "astro-informatics/stable" if self.in_local_cache else "user/testing" - self.requires(f"so3/1.3.1@{location}") - if self.options.with_cfitsio: - self.requires("cfitsio/3.490") - - @property - def cmake(self): - if not hasattr(self, "_cmake"): - self._cmake = CMake(self) - self._cmake.definitions["tests"] = True - self._cmake.definitions["conan_deps"] = True - self._cmake.definitions["python"] = False - self._cmake.definitions["fPIC"] = self.options.fPIC - self._cmake.configure(build_folder="build") - return self._cmake - - def build(self): - from pathlib import Path - - path = Path(self.source_folder) - build = Path(self.source_folder) / "build" - build.mkdir(exist_ok=True) - (path / "conanbuildinfo.cmake").rename(path / "build" / "conanbuildinfo.cmake") - self.cmake.build() - self.cmake.test() - - def package(self): - self.cmake.install() - - def package_info(self): - self.cpp_info.libs = ["s2let"] diff --git a/docs/idl/index.html b/docs/idl/index.html index 6549cf66..958f3d5c 100644 --- a/docs/idl/index.html +++ b/docs/idl/index.html @@ -1,74 +1,122 @@ - -
-+
+
+ This page was created by the IDL library routine
This page was created by the IDL library routine
-mk_html_help
. For more information on
-this routine, refer to the IDL Online Help Navigator
-or type:
-
? mk_html_help
-at the IDL command line prompt.
-Last modified: Tue Sep 22 12:42:56 2015.
- -
- -
+ This page was created by the IDL library routine +This page was created by the IDL library routine + This page was created by the IDL library routine +mk_html_help
. For more information on this routine, refer to + the IDL Online Help Navigator or type: + + + +? mk_html_help+at the IDL command line prompt.
+Last modified: Tue Sep 22 12:42:56 2015.
+ + +
+ +List of Routines
+
S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -109,16 +157,24 @@S2LET_AXISYM_HPX_WAV_ANALYSIS
COMMENTS: Nside of the input map is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_hpx_wav_analysis.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_hpx_wav_analysis.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -155,16 +211,24 @@S2LET_AXISYM_HPX_WAV_SYNTHESIS
COMMENTS: B, L and J_min of the input wavelets are automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_hpx_wav_synthesis.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_hpx_wav_synthesis.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -207,16 +271,24 @@S2LET_AXISYM_MW_WAV_ANALYSIS
COMMENTS: The resolution/bandlimit L of the input map is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_analysis.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_analysis.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -259,16 +331,24 @@S2LET_AXISYM_MW_WAV_ANALYSIS_MULTIRES
COMMENTS: The resolution/bandlimit L of the input map is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_analysis_multires.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_analysis_multires.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -311,16 +391,24 @@S2LET_AXISYM_MW_WAV_ANALYSIS_MULTIRES_REAL
COMMENTS: The resolution/bandlimit L of the input map is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_analysis_multires_real.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_analysis_multires_real.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -363,16 +451,24 @@S2LET_AXISYM_MW_WAV_ANALYSIS_REAL
COMMENTS: The resolution/bandlimit L of the input map is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_analysis_real.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_analysis_real.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -461,16 +557,24 @@S2LET_AXISYM_MW_WAV_SYNTHESIS_MULTIRES
COMMENTS: The wavelet parameters B/J_min are automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_synthesis_multires.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_synthesis_multires.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -510,16 +614,26 @@S2LET_AXISYM_MW_WAV_SYNTHESIS_MULTIRES_REAL
COMMENTS: The wavelet parameters B/J_min are automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_synthesis_multires_real.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_synthesis_multires_real.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -559,16 +673,22 @@S2LET_AXISYM_MW_WAV_SYNTHESIS_REAL
COMMENTS: The wavelet parameters B/J_min are automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_synthesis_real.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_axisym_mw_wav_synthesis_real.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -586,16 +706,22 @@S2LET_DEMO1
wavtype - Wavelet type (1: scale-discretised, 2:needlets, 3: cubic splines) DEFAULT VALUES: B=3, J_min=2, multires=0, wavtype=1 -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_demo1.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_demo1.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -615,16 +741,22 @@S2LET_DEMO2
wavtype - Wavelet type (1: scale-discretised, 2:needlets, 3: cubic splines) DEFAULT VALUES: L=128, B=3, J_min=2, multires=0, wavtype=1 -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_demo2.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_demo2.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -640,16 +772,22 @@S2LET_DYLIB_EXISTS
OUTPUT 1 if found, 0 otherwise -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_dylib_exists.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_dylib_exists.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -662,16 +800,22 @@S2LET_GET_DYLIB
CALLING SEQUENCE: location = s2let_get_dylib() -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_get_dylib.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_get_dylib.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -690,16 +834,22 @@S2LET_GET_MW_BANDLIMIT
OUTPUT L - the resolution/bandlimit -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_get_mw_bandlimit.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_get_mw_bandlimit.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -715,16 +865,22 @@S2LET_GET_WAV_BANDLIMIT
OUTPUT The bandlimit of the j-th wavelet constructed with parameter B -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_get_wav_bandlimit.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_get_wav_bandlimit.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -746,16 +902,22 @@S2LET_HEALPIX2MW
OUTPUT mwmap - The MW map (npix = lmax*(2*lmax-1)) -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_healpix2mw.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_healpix2mw.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -777,16 +939,22 @@S2LET_HPX_ALM2MAP_REAL
OUTPUT f - The Healpix map (npix = 12*nside*nside) -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_hpx_alm2map_real.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_hpx_alm2map_real.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -804,16 +972,22 @@S2LET_HPX_DEMO
wavtype - Wavelet type (1: scale-discretised, 2:needlets, 3: cubic splines) DEFAULT VALUES: L=192, B=7, J_min=2, wavtype=1 -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_hpx_demo.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_hpx_demo.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -831,16 +1005,22 @@S2LET_J_MAX
Compute the maximum wavelet to be used, given a bandlimit L and a wavelet parameter B; -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_j_max.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_j_max.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -863,16 +1043,22 @@S2LET_MW_ALM2MAP
COMMENT: The resolution/bandlimit L is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_alm2map.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_alm2map.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -895,16 +1081,22 @@S2LET_MW_ALM2MAP_REAL
COMMENT: The resolution/bandlimit L is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_alm2map_real.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_alm2map_real.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -928,16 +1120,22 @@S2LET_MW_MAP2ALM_REAL[1]
COMMENT: The resolution nside is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_hpx_map2alm_real.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_hpx_map2alm_real.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -960,16 +1158,22 @@S2LET_MW_MAP2ALM_REAL[2]
COMMENT: The resolution/bandlimit L is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_map2alm.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_map2alm.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -992,16 +1196,22 @@S2LET_MW_MAP2ALM_REAL[3]
COMMENT: The resolution/bandlimit L is automatically detected -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_map2alm_real.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_map2alm_real.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -1023,16 +1233,22 @@S2LET_MW_PIXEL_EDGES
arr - an array containing four numbers: theta1, theta2, phi1 and phi2 which are the locations of the corners of the pixel -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_pixel_edges.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_pixel_edges.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -1048,16 +1264,22 @@S2LET_MW_PLOT_MOLLWEIDE
INPUTS maporfile - filename for the FITS or map read with s2let_read_mw_real_map -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_plot_mollweide.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_plot_mollweide.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -1078,16 +1300,22 @@S2LET_MW_SAMPLING
thetas - The theta coordinates of the nodes phis - The phi coordinates of the nodes -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_sampling.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_sampling.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -1104,16 +1332,22 @@S2LET_MW_WRITE_REAL_MAP
map - input MW map (npix=L*(2*L-1), L is detected) file - filename for the FITS -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_write_real_map.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_write_real_map.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -1132,16 +1366,22 @@S2LET_READ_MW_REAL_MAP
OUTPUT: map - MW map (npix=L*(2*L-1), L is detected) -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_read_real_map.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_mw_read_real_map.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -1160,15 +1400,23 @@S2LET_TEST
wavtype - Wavelet type (1: scale-discretised, 2:needlets, 3: cubic splines) DEFAULT VALUES: L=64, B=3, J_min=2, multires=0, wavtype=1 -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_test.pro)
-
++
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_test.pro) +
+ +S2LET package - Copyright (C) 2012 Boris Leistedt & Jason McEwen @@ -1187,9 +1435,15 @@S2LET_VALID_WAV_PARAMETERS
J_min - First wavelet scale to be used wavtype - Wavelet type (1: scale-discretised, 2:needlets, 3: cubic splines) -
-(See /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_valid_wav_parameters.pro)
-
+ (See + /Users/bl/Dropbox/Wavelets/s2let/src/main/idl/s2let_valid_wav_parameters.pro) +
+ +