From b9b31d37846d0aa16a2c51fcd697478f78395b1f Mon Sep 17 00:00:00 2001 From: Adam Ginsburg Date: Tue, 10 Jul 2012 08:57:51 -0600 Subject: [PATCH 1/2] all of the changes from branch ukidss_and_magpis_and_besancon --- astrodata/magpis/magpis.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/astrodata/magpis/magpis.py b/astrodata/magpis/magpis.py index 0533271abc..517dff6f2f 100644 --- a/astrodata/magpis/magpis.py +++ b/astrodata/magpis/magpis.py @@ -40,7 +40,7 @@ def get_magpis_image_gal(glon, glat, survey='bolocam', size=1.0, verbose=False, savename=None, save=True, - overwrite=False): + overwrite=False, directory='./'): """ Get an image at a specified glon/glat. Size can be specified WARNING: MAGPIS has a maxmimum image size of about 2048x2048 @@ -64,6 +64,8 @@ def get_magpis_image_gal(glon, glat, survey='bolocam', size=1.0, Save FITS file? overwrite : bool Overwrite if file already exists? + directory : string + Directory to store file in. Defaults to './'. Examples -------- @@ -101,7 +103,9 @@ def get_magpis_image_gal(glon, glat, survey='bolocam', size=1.0, if save: if savename is None: savename = "G%08.4f%+09.4f_%s.fits" % (glon,glat,survey) - fitsfile.writeto(savename, clobber=overwrite) + if directory[-1] != '/': + directory += '/' + fitsfile.writeto(directory+savename, clobber=overwrite) return fitsfile From 852d961c07278708bbb3495b072518031c6954e6 Mon Sep 17 00:00:00 2001 From: Adam Ginsburg Date: Tue, 10 Jul 2012 08:57:51 -0600 Subject: [PATCH 2/2] all of the changes from branch ukidss_and_magpis_and_besancon --- astroquery/magpis/magpis.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/astroquery/magpis/magpis.py b/astroquery/magpis/magpis.py index 45dd263941..550e8020d6 100644 --- a/astroquery/magpis/magpis.py +++ b/astroquery/magpis/magpis.py @@ -40,7 +40,7 @@ def get_magpis_image_gal(glon, glat, survey='bolocam', size=1.0, verbose=False, savename=None, save=True, - overwrite=False): + overwrite=False, directory='./'): """ Get an image at a specified glon/glat. Size can be specified WARNING: MAGPIS has a maxmimum image size of about 2048x2048 @@ -64,6 +64,8 @@ def get_magpis_image_gal(glon, glat, survey='bolocam', size=1.0, Save FITS file? overwrite : bool Overwrite if file already exists? + directory : string + Directory to store file in. Defaults to './'. Examples -------- @@ -101,7 +103,9 @@ def get_magpis_image_gal(glon, glat, survey='bolocam', size=1.0, if save: if savename is None: savename = "G%08.4f%+09.4f_%s.fits" % (glon,glat,survey) - fitsfile.writeto(savename, clobber=overwrite) + if directory[-1] != '/': + directory += '/' + fitsfile.writeto(directory+savename, clobber=overwrite) return fitsfile