Skip to content

Commit 352c70f

Browse files
author
Emmanuel Bertin
committed
Added PanSTARRS-1 astrometric reference catalog.
1 parent 891fa8c commit 352c70f

File tree

5 files changed

+41
-14
lines changed

5 files changed

+41
-14
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# You should have received a copy of the GNU General Public License
2323
# along with SCAMP. If not, see <http://www.gnu.org/licenses/>.
2424
#
25-
# Last modified: 12/03/2018
25+
# Last modified: 20/03/2018
2626
#
2727
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
2828

@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],)
3131
define([AC_CACHE_SAVE],)
3232

3333
# This is your standard AstrOmatic source code...
34-
AC_INIT(SCAMP, 2.6.6, [[email protected]],
34+
AC_INIT(SCAMP, 2.6.7, [[email protected]],
3535
scamp, [http://astromatic.net/software/scamp])
3636
AC_CONFIG_MACRO_DIR([m4])
3737
AC_CONFIG_AUX_DIR(autoconf)

doc/src/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
# built documents.
6868
#
6969
# The short X.Y version.
70-
version = '2.6.5'
70+
version = '2.6.6'
7171
# The full version, including alpha/beta/rc tags.
72-
release = '2.6.5'
72+
release = '2.6.6'
7373

7474
# The language for content autogenerated by Sphinx. Refer to documentation
7575
# for a list of supported languages.

src/astrefcat.c

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* You should have received a copy of the GNU General Public License
2323
* along with SCAMP. If not, see <http://www.gnu.org/licenses/>.
2424
*
25-
* Last modified: 20/02/2018
25+
* Last modified: 20/03/2018
2626
*
2727
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
2828

@@ -172,6 +172,13 @@ astrefstruct astrefcats[] =
172172
{"G", ""},
173173
1, 0},
174174

175+
{"PANSTARRS-1", "II/349", {"Qual", "RAJ2000","DEJ2000","e_RAJ2000","e_DEJ2000",
176+
"Epoch", "gmag","e_gmag","rmag","e_rmag","imag","e_imag",
177+
"zmag","e_zmag","ymag","e_ymag",""},
178+
{"umag", "gmag", "rmag", "imag", "zmag", ""},
179+
{"g", "r", "i", "z", "y", ""},
180+
5, 2},
181+
175182
{""}
176183
};
177184

@@ -198,7 +205,7 @@ INPUT Catalog name,
198205
OUTPUT Pointer to the reference field.
199206
NOTES Global preferences are used.
200207
AUTHOR E. Bertin (IAP)
201-
VERSION 20/02/2018
208+
VERSION 20/03/2018
202209
*/
203210
fieldstruct *get_astreffield(astrefenum refcat, double *wcspos,
204211
int lng, int lat, int naxis, double maxradius)
@@ -754,6 +761,26 @@ fieldstruct *get_astreffield(astrefenum refcat, double *wcspos,
754761
magerr[0] = 1.0857 * fluxerr / flux;
755762
break;
756763

764+
case ASTREFCAT_PANSTARRS1:
765+
if (atoi(cols[cindex++]) & 4 == 0) // Test PS1 reliability
766+
continue;
767+
alpha = atof(cols[cindex++]);
768+
delta = atof(cols[cindex++]);
769+
poserr[lng] = atof(cols[cindex++])*ARCSEC/DEG;
770+
poserr[lat] = atof(cols[cindex++])*ARCSEC/DEG;
771+
epoch = 2000.0 + (atof(cols[cindex++]) - (JD2000 - 2400000.5))/365.25;
772+
for (b=0; b<nband; b++) {
773+
smag = cols[cindex++];
774+
smagerr = cols[cindex++];
775+
if (smag[2] <= ' ')
776+
mag[b] = magerr[b] = 99.0;
777+
else {
778+
mag[b] = atof(smag);
779+
magerr[b] = smagerr[2] <= ' '? atof(smagerr): DEFAULT_MAGERR;
780+
}
781+
}
782+
break;
783+
757784
case ASTREFCAT_NONE:
758785
default:
759786
break;

src/astrefcat.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* This file part of: SCAMP
99
*
10-
* Copyright: (C) 2002-2016 IAP/CNRS/UPMC
10+
* Copyright: (C) 2002-2018 IAP/CNRS/UPMC
1111
*
1212
* License: GNU General Public License
1313
*
@@ -22,7 +22,7 @@
2222
* You should have received a copy of the GNU General Public License
2323
* along with SCAMP. If not, see <http://www.gnu.org/licenses/>.
2424
*
25-
* Last modified: 14/09/2016
25+
* Last modified: 20/03/2018
2626
*
2727
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
2828

@@ -58,8 +58,8 @@ typedef enum {ASTREFCAT_NONE, ASTREFCAT_FILE,
5858
ASTREFCAT_2MASS, ASTREFCAT_DENIS3, ASTREFCAT_UCAC4,
5959
ASTREFCAT_URAT1, ASTREFCAT_SDSSR9, ASTREFCAT_NOMAD1,
6060
ASTREFCAT_PPMX, ASTREFCAT_CMC15, ASTREFCAT_TYCHO2,
61-
ASTREFCAT_IGSL, ASTREFCAT_ALLWISE, ASTREFCAT_GAIADR1}
62-
astrefenum;
61+
ASTREFCAT_IGSL, ASTREFCAT_ALLWISE, ASTREFCAT_GAIADR1,
62+
ASTREFCAT_PANSTARRS1} astrefenum;
6363

6464
typedef struct
6565
{

src/preflist.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* This file part of: SCAMP
99
*
10-
* Copyright: (C) 2002-2017 IAP/CNRS/UPMC
10+
* Copyright: (C) 2002-2018 IAP/CNRS/UPMC
1111
*
1212
* License: GNU General Public License
1313
*
@@ -22,7 +22,7 @@
2222
* You should have received a copy of the GNU General Public License
2323
* along with SCAMP. If not, see <http://www.gnu.org/licenses/>.
2424
*
25-
* Last modified: 18/07/2017
25+
* Last modified: 20/03/2018
2626
*
2727
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
2828

@@ -67,7 +67,7 @@ pkeystruct key[] =
6767
{"ASTREF_CATALOG", P_KEY, &prefs.astrefcat, 0,0, 0.0,0.0,
6868
{"NONE", "FILE", "USNO-A2", "USNO-B1", "GSC-2.3", "2MASS", "DENIS-3",
6969
"UCAC-4", "URAT-1", "SDSS-R9", "NOMAD-1", "PPMX", "CMC-15", "TYCHO-2",
70-
"IGSL", "ALLWISE", "GAIA-DR1", ""}},
70+
"IGSL", "ALLWISE", "GAIA-DR1", "PANSTARRS-1", ""}},
7171
{"ASTREF_WEIGHT", P_FLOAT, &prefs.astref_weight, 0,0, 1e-6,1e6},
7272
{"ASTREFCAT_NAME", P_STRINGLIST, prefs.astref_name, 0,0,0.0,0.0,
7373
{""}, 0, MAXNGROUP, &prefs.nastref_name},
@@ -227,7 +227,7 @@ char *default_prefs[] =
227227
"ASTREF_CATALOG 2MASS # NONE,FILE,USNO-A2,USNO-B1,GSC-2.3,",
228228
" # TYCHO-2,UCAC-4,URAT-1,NOMAD-1,PPMX,",
229229
" # CMC-15,2MASS,DENIS-3,SDSS-R9,IGSL,",
230-
" # GAIA-DR1 or ALLWISE",
230+
" # GAIA-DR1,PANSTARRS-1 or ALLWISE",
231231
"ASTREF_BAND DEFAULT # Photom. band for astr.ref.magnitudes",
232232
" # or DEFAULT, BLUEST, or REDDEST",
233233
"*ASTREFCAT_NAME astrefcat.cat # Local astrometric reference catalogs",

0 commit comments

Comments
 (0)