aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.file-metadatabin5854 -> 6194 bytes
-rw-r--r--reproduce/software/bibtex/astrometry-net.tex25
-rw-r--r--reproduce/software/bibtex/astrometrynet.tex20
-rw-r--r--reproduce/software/bibtex/swarp.tex19
-rw-r--r--reproduce/software/config/installation/versions.mk3
-rw-r--r--reproduce/software/make/high-level.mk41
6 files changed, 66 insertions, 42 deletions
diff --git a/.file-metadata b/.file-metadata
index af5792e..95076a8 100644
--- a/.file-metadata
+++ b/.file-metadata
Binary files differ
diff --git a/reproduce/software/bibtex/astrometry-net.tex b/reproduce/software/bibtex/astrometry-net.tex
deleted file mode 100644
index 7e8d0be..0000000
--- a/reproduce/software/bibtex/astrometry-net.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-%% Copyright (C) 2019 Raul Infante-Sainz <infantesainz@gmail.com>
-%%
-%% Copying and distribution of this file, with or without modification,
-%% are permitted in any medium without royalty provided the copyright
-%% notice and this notice are preserved. This file is offered as-is,
-%% without any warranty.
-
-@ARTICLE{astrometrynet2010,
- author = {{Lang}, Dustin and {Hogg}, David W. and {Mierle}, Keir and
- {Blanton}, Michael and {Roweis}, Sam},
- title = "{Astrometry.net: Blind Astrometric Calibration of Arbitrary Astronomical Images}",
- journal = {\aj},
- keywords = {astrometry, catalogs, instrumentation: miscellaneous, methods: data analysis, methods: statistical, techniques: image processing, Astrophysics - Instrumentation and Methods for Astrophysics},
- year = "2010",
- month = "May",
- volume = {139},
- number = {5},
- pages = {1782},
- doi = {10.1088/0004-6256/139/5/1782},
-archivePrefix = {arXiv},
- eprint = {0910.2233},
- primaryClass = {astro-ph.IM},
- adsurl = {https://ui.adsabs.harvard.edu/abs/2010AJ....139.1782L},
- adsnote = {Provided by the SAO/NASA Astrophysics Data System}
-}
diff --git a/reproduce/software/bibtex/astrometrynet.tex b/reproduce/software/bibtex/astrometrynet.tex
new file mode 100644
index 0000000..7bfe4c6
--- /dev/null
+++ b/reproduce/software/bibtex/astrometrynet.tex
@@ -0,0 +1,20 @@
+%% Copyright (C) 2019 Raul Infante-Sainz <infantesainz@gmail.com>
+%%
+%% Copying and distribution of this file, with or without modification,
+%% are permitted in any medium without royalty provided the copyright
+%% notice and this notice are preserved. This file is offered as-is,
+%% without any warranty.
+
+@ARTICLE{astrometrynet,
+ doi = {10.1088/0004-6256/139/5/1782},
+ url = {https://doi.org/10.1088%2F0004-6256%2F139%2F5%2F1782},
+ year = 2010,
+ month = {mar},
+ publisher = {{IOP} Publishing},
+ volume = {139},
+ number = {5},
+ pages = {1782},
+ author = {Dustin Lang and David W. Hogg and Keir Mierle and Michael Blanton and Sam Roweis},
+ title = {{ASTROMETRY}.{NET}: {BLIND} {ASTROMETRIC} {CALIBRATION} {OF} {ARBITRARY} {ASTRONOMICAL} {IMAGES}},
+ journal = {The Astronomical Journal}
+}
diff --git a/reproduce/software/bibtex/swarp.tex b/reproduce/software/bibtex/swarp.tex
new file mode 100644
index 0000000..03111d6
--- /dev/null
+++ b/reproduce/software/bibtex/swarp.tex
@@ -0,0 +1,19 @@
+%% Copyright (C) 2019 Raul Infante-Sainz <infantesainz@gmail.com>
+%%
+%% Copying and distribution of this file, with or without modification,
+%% are permitted in any medium without royalty provided the copyright
+%% notice and this notice are preserved. This file is offered as-is,
+%% without any warranty.
+
+@MISC{swarp,
+ author = {{Bertin}, E.},
+ title = "{SWarp: Resampling and Co-adding FITS Images Together}",
+ keywords = {Software },
+howpublished = {Astrophysics Source Code Library},
+ year = 2010,
+ month = oct,
+archivePrefix = "ascl",
+ eprint = {1010.068},
+ adsurl = {http://cdsads.u-strasbg.fr/abs/2010ascl.soft10068B},
+ adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+}
diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk
index 5f686a8..270eb97 100644
--- a/reproduce/software/config/installation/versions.mk
+++ b/reproduce/software/config/installation/versions.mk
@@ -17,7 +17,7 @@
# <http://www.gnu.org/licenses/>.
# C/C++ programs and libraries.
-astrometry-version = 0.77
+astrometrynet-version = 0.77
atlas-version = 3.10.3
bash-version = 5.0
binutils-version = 2.31.1
@@ -66,6 +66,7 @@ pkgconfig-version = 0.29.2
python-version = 3.7.3
readline-version = 8.0
sed-version = 4.7
+swarp-version = 2.38.0
swig-version = 3.0.12
tar-version = 1.32
unzip-version = 6.0
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index a904cae..144057e 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -51,7 +51,7 @@ ipydir = $(BDIR)/software/installed/version-info/python
# successfully on Mac (only static) and GNU/Linux (shared and static). But,
# since it takes a few hours to build, it is not currently a target.
top-level-libraries = # atlas
-top-level-programs = astrometry-net gnuastro metastore
+top-level-programs = astrometrynet gnuastro metastore swarp
top-level-python = astroquery matplotlib
all: $(foreach p, $(top-level-libraries), $(ilidir)/$(p)) \
$(foreach p, $(top-level-programs), $(ibidir)/$(p)) \
@@ -139,6 +139,7 @@ tarballs = $(foreach t, astrometry.net-$(astrometry-version).tar.gz \
openmpi-$(openmpi-version).tar.gz \
openblas-$(openblas-version).tar.gz \
pixman-$(pixman-version).tar.gz \
+ swarp-$(swarp-version).tar.gz \
swig-$(swig-version).tar.gz \
tiff-$(libtiff-version).tar.gz \
wcslib-$(wcslib-version).tar.bz2 \
@@ -206,6 +207,7 @@ $(tarballs): $(tdir)/%: | $(lockdir)
majorver=$$(echo $(openmpi-version) | sed -e 's/\./ /g' | awk '{printf("%d.%d", $$1, $$2)}')
w=https://download.open-mpi.org/release/open-mpi/v$$majorver/$*
elif [ $$n = pixman ]; then w=https://www.cairographics.org/releases
+ elif [ $$n = swarp ]; then w=https://www.astromatic.net/download/swarp
elif [ $$n = swig ]; then w=https://sourceforge.net/projects/swig/files/swig/swig-$(swig-version)
elif [ $$n = tiff ]; then w=https://download.osgeo.org/libtiff
elif [ $$n = wcslib ]; then w=ftp://ftp.atnf.csiro.au/pub/software/wcslib
@@ -502,28 +504,28 @@ $(ilidir)/wcslib: $(tdir)/wcslib-$(wcslib-version).tar.bz2 \
# Astrometry-net contains a lot of programs. We need to specify the
# installation directory and the Python executable (by default it will look
# for /usr/bin/python)
-$(ibidir)/astrometry-net: $(tdir)/astrometry.net-$(astrometry-version).tar.gz \
- $(ilidir)/cairo \
- $(ilidir)/cfitsio \
- $(ilidir)/gsl \
- $(ilidir)/libjpeg \
- $(ilidir)/libpng \
- $(ibidir)/netpbm \
- $(ipydir)/numpy \
- $(ibidir)/python \
- $(ibidir)/swig \
- $(ilidir)/wcslib
+$(ibidir)/astrometrynet: $(tdir)/astrometry.net-$(astrometrynet-version).tar.gz \
+ $(ilidir)/cairo \
+ $(ilidir)/cfitsio \
+ $(ilidir)/gsl \
+ $(ilidir)/libjpeg \
+ $(ilidir)/libpng \
+ $(ibidir)/netpbm \
+ $(ipydir)/numpy \
+ $(ibidir)/python \
+ $(ibidir)/swig \
+ $(ilidir)/wcslib
cd $(ddir) \
&& if ! tar xf $<; then echo; echo "Tar error"; exit 1; fi \
- && cd astrometry.net-$(astrometry-version) \
+ && cd astrometry.net-$(astrometrynet-version) \
&& make \
&& make py \
&& make extra \
&& make install INSTALL_DIR=$(idir) PYTHON_SCRIPT="$(ibdir)/python" \
&& cd .. \
- && rm -rf astrometry.net-$(astrometry-version) \
- && cp $(dtexdir)/astrometry-net.tex $(ictdir)/ \
- && echo "Astrometry-net $(astrometry-version)" > $@
+ && rm -rf astrometry.net-$(astrometrynet-version) \
+ && cp $(dtexdir)/astrometrynet.tex $(ictdir)/ \
+ && echo "Astrometry.net $(astrometrynet-version) \citep{astrometrynet}" > $@
@@ -710,6 +712,13 @@ $(ibidir)/netpbm: $(tdir)/netpbm-$(netpbm-version).tgz \
&& rm -rf $$unpackdir \
&& echo "Netpbm $(netpbm-version)" > $@
+$(ibidir)/swarp: $(tdir)/swarp-$(swarp-version).tar.gz \
+ $(ilidir)/fftw
+ $(call gbuild, $<, swarp-$(swarp-version), static, \
+ --enable-threads) \
+ && cp $(dtexdir)/swarp.tex $(ictdir)/ \
+ && echo "SWarp $(swarp-version) \citep{swarp}" > $@
+
$(ibidir)/swig: $(tdir)/swig-$(swig-version).tar.gz
# Option --without-pcre was a suggestion once the configure step was
# tried and it failed. It was not recommended but it works!
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 17:40:02 +0000