diff --git a/configure.ac b/configure.ac index 8f6995c..1461752 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: 12/03/2018 +# Last modified: 20/03/2018 # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) define([AC_CACHE_SAVE],) # This is your standard AstrOmatic source code... -AC_INIT(SCAMP, 2.6.6, [astromatic@astromatic.net], +AC_INIT(SCAMP, 2.6.7, [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 6f40cae..c8751f6 100644 --- a/doc/src/conf.py +++ b/doc/src/conf.py @@ -67,9 +67,9 @@ # built documents. # # The short X.Y version. -version = '2.6.5' +version = '2.6.6' # The full version, including alpha/beta/rc tags. -release = '2.6.5' +release = '2.6.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/src/astrefcat.c b/src/astrefcat.c index 0af8fac..01b338a 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: 20/02/2018 +* Last modified: 20/03/2018 * *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ @@ -172,6 +172,13 @@ astrefstruct astrefcats[] = {"G", ""}, 1, 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",""}, + {"umag", "gmag", "rmag", "imag", "zmag", ""}, + {"g", "r", "i", "z", "y", ""}, + 5, 2}, + {""} }; @@ -198,7 +205,7 @@ INPUT Catalog name, OUTPUT Pointer to the reference field. NOTES Global preferences are used. AUTHOR E. Bertin (IAP) -VERSION 20/02/2018 +VERSION 20/03/2018 */ fieldstruct *get_astreffield(astrefenum refcat, double *wcspos, int lng, int lat, int naxis, double maxradius) @@ -754,6 +761,26 @@ fieldstruct *get_astreffield(astrefenum refcat, double *wcspos, magerr[0] = 1.0857 * fluxerr / flux; break; + case ASTREFCAT_PANSTARRS1: + if (atoi(cols[cindex++]) & 4 == 0) // Test PS1 reliability + continue; + alpha = atof(cols[cindex++]); + delta = atof(cols[cindex++]); + poserr[lng] = atof(cols[cindex++])*ARCSEC/DEG; + poserr[lat] = atof(cols[cindex++])*ARCSEC/DEG; + epoch = 2000.0 + (atof(cols[cindex++]) - (JD2000 - 2400000.5))/365.25; + for (b=0; b. * -* Last modified: 14/09/2016 +* Last modified: 20/03/2018 * *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ @@ -58,8 +58,8 @@ typedef enum {ASTREFCAT_NONE, ASTREFCAT_FILE, ASTREFCAT_2MASS, ASTREFCAT_DENIS3, ASTREFCAT_UCAC4, ASTREFCAT_URAT1, ASTREFCAT_SDSSR9, ASTREFCAT_NOMAD1, ASTREFCAT_PPMX, ASTREFCAT_CMC15, ASTREFCAT_TYCHO2, - ASTREFCAT_IGSL, ASTREFCAT_ALLWISE, ASTREFCAT_GAIADR1} - astrefenum; + ASTREFCAT_IGSL, ASTREFCAT_ALLWISE, ASTREFCAT_GAIADR1, + ASTREFCAT_PANSTARRS1} astrefenum; typedef struct { diff --git a/src/preflist.h b/src/preflist.h index 62f8af4..e72c184 100644 --- a/src/preflist.h +++ b/src/preflist.h @@ -7,7 +7,7 @@ * * This file part of: SCAMP * -* Copyright: (C) 2002-2017 IAP/CNRS/UPMC +* Copyright: (C) 2002-2018 IAP/CNRS/UPMC * * 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: 18/07/2017 +* Last modified: 20/03/2018 * *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ @@ -67,7 +67,7 @@ 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", "NOMAD-1", "PPMX", "CMC-15", "TYCHO-2", - "IGSL", "ALLWISE", "GAIA-DR1", ""}}, + "IGSL", "ALLWISE", "GAIA-DR1", "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}, @@ -227,7 +227,7 @@ 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,IGSL,", -" # GAIA-DR1 or ALLWISE", +" # GAIA-DR1,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",