support 3FGL

enrico/data.py

@@ -16,7 +16,7 @@
 # Download URLs
 FSSC_URL = 'http://fermi.gsfc.nasa.gov/ssc'
 FSSC_FTP_URL = 'ftp://legacy.gsfc.nasa.gov/fermi/data/lat'
-CATALOG_URL = join(FSSC_URL, 'data/access/lat/2yr_catalog')
+CATALOG_URL = join(FSSC_URL, 'data/access/lat/4yr_catalog')
 DIFFUSE_URL = join(FSSC_URL, 'data/analysis/software/aux')
 WEEKLY_URL = join(FSSC_FTP_URL, 'weekly/photon')
 SPACECRAFT_URL = join(FSSC_FTP_URL, 'mission/spacecraft',
@@ -125,7 +125,7 @@ def download_aux(self):
             filename = join(CATALOG_TEMPLATE_DIR, 'CenALobes.fits')
             if not os.path.isfile(filename):
                 # Now we know that we want to download
-                filename = 'gll_psc_v%s_templates.tgz' % TEMPLATE_VERSION
+                filename = 'LAT_extended_sources_v%s.tgz' % TEMPLATE_VERSION
                 url = join(CATALOG_URL, filename)
                 path = join(CATALOG_DIR, filename)
                 print('Downloading %s' % path)

enrico/environ.py

@@ -18,8 +18,7 @@
 FERMI_DATA_DIR = os.environ.get('FERMI_DATA_DIR', '')
 CATALOG_DIR = os.environ.get('FERMI_CATALOG_DIR', '')
 CATALOG_TEMPLATE_DIR = ''
-if CATALOG_DIR :
-  CATALOG_TEMPLATE_DIR = join(CATALOG_DIR, 'Templates') 
+
 DIFFUSE_DIR = os.environ.get('FERMI_DIFFUSE_DIR', '')
 DOWNLOAD_DIR = os.environ.get('FERMI_DOWNLOAD_DIR', '')
 WEEKLY_DIR = ''
@@ -44,8 +43,11 @@
     DIRS = {}
 
 # File names
-CATALOG_VERSION = '08'
-TEMPLATE_VERSION = '07'
+CATALOG_VERSION = '14'
+TEMPLATE_VERSION = '15'
+if CATALOG_DIR :
+  CATALOG_TEMPLATE_DIR = join(CATALOG_DIR, 'Extended_archive_v%s/Templates'% TEMPLATE_VERSION)
+
 CATALOG = 'gll_psc_v%s.fit' % CATALOG_VERSION
 DIFFUSE_GAL = 'gll_iem_v05_rev1.fit'
 DIFFUSE_ISO_SOURCE = 'iso_source_v05.txt'