From 43e06dcad1e00fabda37f7405c5a2c29031cb516 Mon Sep 17 00:00:00 2001 From: Emmanuel Bertin Date: Thu, 3 Dec 2020 18:54:34 +0100 Subject: [PATCH 1/6] Added support for the Gaia-EDR3 astrometric reference catalog (still without proper motions). Pushed version number to 2.10.0. --- configure.ac | 4 ++-- doc/src/conf.py | 6 +++--- src/astrefcat.c | 12 ++++++++++-- src/astrefcat.h | 7 ++++--- src/preflist.h | 9 +++++---- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 821d3a4..f6b684f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # You should have received a copy of the GNU General Public License # along with SCAMP. If not, see . # -# Last modified: 19/08/2020 +# Last modified: 01/12/2020 # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) define([AC_CACHE_SAVE],) # This is your standard AstrOmatic source code... -AC_INIT(SCAMP, 2.9.3, [astromatic@astromatic.net], +AC_INIT(SCAMP, 2.10.0, [astromatic@astromatic.net], scamp, [http://astromatic.net/software/scamp]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(autoconf) diff --git a/doc/src/conf.py b/doc/src/conf.py index 2ea1d5b..71ced3c 100644 --- a/doc/src/conf.py +++ b/doc/src/conf.py @@ -67,9 +67,9 @@ # built documents. # # The short X.Y version. -version = '2.9.3' +version = '2.10.0' # The full version, including alpha/beta/rc tags. -release = '2.9.3' +release = '2.10.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -81,7 +81,7 @@ # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: # -today = 'Thu Aug 20 2020' +today = 'Thu Dec 03 2020' # # Else, today_fmt is used as the format for a strftime call. # diff --git a/src/astrefcat.c b/src/astrefcat.c index a58affa..d125ca8 100644 --- a/src/astrefcat.c +++ b/src/astrefcat.c @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with SCAMP. If not, see . * -* Last modified: 28/06/2020 +* Last modified: 01/12/2020 * *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ @@ -194,6 +194,13 @@ astrefstruct astrefcats[] = {"G", "BP", "RP", ""}, 3, 0}, + {"GAIA-EDR3", "I/350/gaiaedr3", {"Dup", "RA_ICRS","DE_ICRS","e_RA_ICRS","e_DE_ICRS", + "Epoch","pmRA","pmDE","e_pmRA","e_pmDE", + "Gmag","e_Gmag","BPmag","e_BPmag","RPmag","e_RPmag",""}, + {"Gmag", "BPmag","RPmag",""}, + {"G", "BP", "RP", ""}, + 3, 0}, + {"PANSTARRS-1", "II/349", {"Qual", "RAJ2000","DEJ2000","e_RAJ2000","e_DEJ2000", "Epoch", "gmag","e_gmag","rmag","e_rmag","imag","e_imag", "zmag","e_zmag","ymag","e_ymag",""}, @@ -227,7 +234,7 @@ INPUT Catalog name, OUTPUT Pointer to the reference field. NOTES Global preferences are used. AUTHOR E. Bertin (IAP) -VERSION 02/05/2018 +VERSION 01/12/2020 */ fieldstruct *get_astreffield(astrefenum refcat, double *wcspos, int lng, int lat, int naxis, double maxradius) @@ -802,6 +809,7 @@ fieldstruct *get_astreffield(astrefenum refcat, double *wcspos, break; case ASTREFCAT_GAIADR2: + case ASTREFCAT_GAIAEDR3: /*-------- Reject duplicated sources */ sflag = cols[cindex++]; /* diff --git a/src/astrefcat.h b/src/astrefcat.h index 936f44b..a45974d 100644 --- a/src/astrefcat.h +++ b/src/astrefcat.h @@ -7,7 +7,7 @@ * * This file part of: SCAMP * -* Copyright: (C) 2002-2018 IAP/CNRS/UPMC +* Copyright: (C) 2002-2020 IAP/CNRS/SorbonneU * * License: GNU General Public License * @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with SCAMP. If not, see . * -* Last modified: 02/05/2018 +* Last modified: 01/12/2020 * *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ @@ -59,7 +59,8 @@ typedef enum {ASTREFCAT_NONE, ASTREFCAT_FILE, ASTREFCAT_URAT1, ASTREFCAT_SDSSR9, ASTREFCAT_SDSSR12, ASTREFCAT_NOMAD1, ASTREFCAT_PPMX, ASTREFCAT_CMC15, ASTREFCAT_TYCHO2, ASTREFCAT_IGSL, ASTREFCAT_ALLWISE, - ASTREFCAT_GAIADR1, ASTREFCAT_GAIADR2, ASTREFCAT_PANSTARRS1 + ASTREFCAT_GAIADR1, ASTREFCAT_GAIADR2, ASTREFCAT_GAIAEDR3, + ASTREFCAT_PANSTARRS1 } astrefenum; typedef struct diff --git a/src/preflist.h b/src/preflist.h index afc49e7..12f832f 100644 --- a/src/preflist.h +++ b/src/preflist.h @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with SCAMP. If not, see . * -* Last modified: 29/06/2020 +* Last modified: 01/12/2020 * *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ @@ -67,7 +67,8 @@ pkeystruct key[] = {"ASTREF_CATALOG", P_KEY, &prefs.astrefcat, 0,0, 0.0,0.0, {"NONE", "FILE", "USNO-A2", "USNO-B1", "GSC-2.3", "2MASS", "DENIS-3", "UCAC-4", "URAT-1", "SDSS-R9", "SDSS-R12", "NOMAD-1", "PPMX", "CMC-15", - "TYCHO-2", "IGSL", "ALLWISE", "GAIA-DR1", "GAIA-DR2", "PANSTARRS-1", ""}}, + "TYCHO-2", "IGSL", "ALLWISE", "GAIA-DR1", "GAIA-DR2", "GAIA-EDR3", + "PANSTARRS-1", ""}}, {"ASTREF_WEIGHT", P_FLOAT, &prefs.astref_weight, 0,0, 1e-6,1e6}, {"ASTREFCAT_NAME", P_STRINGLIST, prefs.astref_name, 0,0,0.0,0.0, {""}, 0, MAXNGROUP, &prefs.nastref_name}, @@ -231,8 +232,8 @@ char *default_prefs[] = "ASTREF_CATALOG 2MASS # NONE,FILE,USNO-A2,USNO-B1,GSC-2.3,", " # TYCHO-2,UCAC-4,URAT-1,NOMAD-1,PPMX,", " # CMC-15,2MASS,DENIS-3,SDSS-R9,SDSS-R12,", -" # IGSL,GAIA-DR1,GAIA-DR2,PANSTARRS-1,", -" # or ALLWISE", +" # IGSL,GAIA-DR1,GAIA-DR2,GAIA-EDR3,", +" # PANSTARRS-1, or ALLWISE", "ASTREF_BAND DEFAULT # Photom. band for astr.ref.magnitudes", " # or DEFAULT, BLUEST, or REDDEST", "*ASTREFCAT_NAME astrefcat.cat # Local astrometric reference catalogs", From 259664f086b0c2d1f89c59975febaa0a17780670 Mon Sep 17 00:00:00 2001 From: Emmanuel Bertin Date: Wed, 10 Feb 2021 22:20:53 +0100 Subject: [PATCH 2/6] Fixed regression in command line parsing that would prevent negative numbers in the first arguments. --- doc/src/conf.py | 2 +- src/main.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/src/conf.py b/doc/src/conf.py index 71ced3c..9695b8b 100644 --- a/doc/src/conf.py +++ b/doc/src/conf.py @@ -81,7 +81,7 @@ # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: # -today = 'Thu Dec 03 2020' +today = 'Wed Feb 10 2021' # # Else, today_fmt is used as the format for a strftime call. # diff --git a/src/main.c b/src/main.c index 7ea9e7e..4ff5dd4 100644 --- a/src/main.c +++ b/src/main.c @@ -7,7 +7,7 @@ * * This file part of: SCAMP * -* Copyright: (C) 2002-2020 IAP/CNRS/SorbonneU +* Copyright: (C) 2002-2021 IAP/CNRS/SorbonneU * * License: GNU General Public License * @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with SCAMP. If not, see . * -* Last modified: 27/04/2020 +* Last modified: 10/02/2021 * *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ @@ -136,7 +136,8 @@ for (a=1; a Date: Mon, 22 Mar 2021 21:45:08 +0100 Subject: [PATCH 3/6] Add fedora build via github actions. --- .github/workflows/fedora/build.sh | 15 +++++++++++++++ .github/workflows/fedora_latest.yml | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 .github/workflows/fedora/build.sh create mode 100644 .github/workflows/fedora_latest.yml diff --git a/.github/workflows/fedora/build.sh b/.github/workflows/fedora/build.sh new file mode 100644 index 0000000..45367a1 --- /dev/null +++ b/.github/workflows/fedora/build.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +dnf install -y gcc make autoconf automake libtool +dnf install -y atlas-devel fftw-devel plplot-devel curl-devel + +USER=root +export USER + +cd "$WORK_DIR" + +./autogen.sh +./configure +make diff --git a/.github/workflows/fedora_latest.yml b/.github/workflows/fedora_latest.yml new file mode 100644 index 0000000..b94d5c7 --- /dev/null +++ b/.github/workflows/fedora_latest.yml @@ -0,0 +1,21 @@ +name: Fedora build + +on: + push: + paths-ignore: + - 'doc/**' + pull_request: + paths-ignore: + - 'doc/**' + +jobs: + + fedora_build: + runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')" + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Build + run: docker run --privileged=true -e CI -e WORK_DIR="$PWD" -v $PWD:$PWD -v /var/run/docker.sock:/var/run/docker.sock fedora:latest /bin/bash $PWD/.github/workflows/fedora/build.sh From 9a14dc43484e3674da098a8f01f62fc73a59ac55 Mon Sep 17 00:00:00 2001 From: Chiara Marmo Date: Mon, 22 Mar 2021 22:30:08 +0100 Subject: [PATCH 4/6] Run the tests. --- .github/workflows/fedora/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/fedora/build.sh b/.github/workflows/fedora/build.sh index 45367a1..7a49672 100644 --- a/.github/workflows/fedora/build.sh +++ b/.github/workflows/fedora/build.sh @@ -13,3 +13,6 @@ cd "$WORK_DIR" ./autogen.sh ./configure make + +# run the tests +make check From 9d53170a34f7d3d70be0dbcb51685b0d5243c2d9 Mon Sep 17 00:00:00 2001 From: Chiara Marmo Date: Mon, 22 Mar 2021 22:38:58 +0100 Subject: [PATCH 5/6] Install test python dependencies. --- .github/workflows/fedora/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/fedora/build.sh b/.github/workflows/fedora/build.sh index 7a49672..e010fd6 100644 --- a/.github/workflows/fedora/build.sh +++ b/.github/workflows/fedora/build.sh @@ -5,6 +5,9 @@ set -e dnf install -y gcc make autoconf automake libtool dnf install -y atlas-devel fftw-devel plplot-devel curl-devel +# test dependencies +dnf install -y python3-numpy.x86_64 python3-astropy.x86_64 + USER=root export USER From 5dbf06bf1b32b562da4918495573be03c76520c0 Mon Sep 17 00:00:00 2001 From: Chiara Marmo Date: Tue, 23 Mar 2021 08:56:04 +0100 Subject: [PATCH 6/6] Add temp test output to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 624f09f..8d62433 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ /tests/test_crossid_single_catalog /tests/test_crossid_single_catalog_moving /tests/*.o +/tests/*.trs /tests/Makefile /tests/Makefile.in /tests/*.log