updates for MAGIMACS

mommermi · Jun 28, 2018 · 16672d5 · 16672d5
1 parent c084763
commit 16672d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/diagnostics.py b/diagnostics.py
@@ -45,8 +45,8 @@
     sys.exit()
 
 try:
-    from scipy.misc import toimage  # requires Pillow
-    from scipy.misc import imresize  # requires Pillow
+    from scipy.misc import toimage
+    from scipy.misc import imresize
     from scipy.misc import bytescale
 except ImportError:
     print('Modules scipy or pillow not found. Please install with: pip '

diff --git a/setup/telescopes.py b/setup/telescopes.py
@@ -345,38 +345,39 @@
     'object': 'OBJECT',  # object name keyword
     'filter': 'FILTER',  # filter keyword
     'filter_translations': {'Sloan_u': 'u', 'Sloan_g': 'g', 'Sloan_r': 'r',
-                              'Sloan_i': 'i', 'Sloan_z': 'z'},
+                            'Sloan_i': 'i', 'Sloan_z': 'z',
+                            'Bessell_V1': 'V', 'WB4800-7800': None},
     # filtername translation dictionary
     'exptime': 'EXPTIME',  # exposure time keyword (s)
     'airmass': 'AIRMASS',  # airmass keyword
 
 
     # source extractor settings
-    'source_minarea': 20,  # default sextractor source minimum N_pixels
+    'source_minarea': 10,  # default sextractor source minimum N_pixels
     'source_snr': 3,  # default sextractor source snr for registration
     'aprad_default': 8,  # default aperture radius in px
-    'aprad_range': [5, 25],  # [minimum, maximum] aperture radius (px)
+    'aprad_range': [3, 15],  # [minimum, maximum] aperture radius (px)
     'sex-config-file': rootpath+'/setup/magimacs.sex',
     'mask_file': {},
     #                        mask files as a function of x,y binning
 
     # registration settings (Scamp)
     'scamp-config-file': rootpath+'/setup/magimacs.scamp',
-    'reg_max_mag': 19,
+    'reg_max_mag': 21,
     'reg_search_radius': 0.5,  # deg
     'source_tolerance': 'high',
 
     # swarp settings
-    'copy_keywords': ('TELESCOP,INSTRUME,FILTER,EXPTIME,OBJECT,' +
-                      'DATE-OBS,UT-TIME,RA,DEC,AIRMASS,' +
+    'copy_keywords': ('TELESCOP,INSTRUME,FILTER,EXPTIME,OBJECT,CHIP,EXPTYPE,' +
+                      'DATE-OBS,UT-TIME,BINNING,RA,DEC,AIRMASS,' +
                       'SECPIX,TEL_KEYW'),
     #                        keywords to be copied in image
     #                        combination using swarp
     'swarp-config-file': rootpath+'/setup/magimacs.swarp',
 
     # default catalog settings
     'astrometry_catalogs': ['GAIA'],
-    'photometry_catalogs': ['SDSS-R9', 'APASS9', 'PANSTARRS', '2MASS']
+    'photometry_catalogs': ['SDSS-R9', 'PANSTARRS', 'SkyMapper', 'APASS9', '2MASS']
 }