Changeset 634

Timestamp:

09/19/08 15:35:13 (2 months ago)

Author:

laidler

Message:

#123: New implementation of extinction in reddening.py module; relies on extinction curves in PYSYN_CDBS/grid/extinction. Will failover to original implementation retained in extinction.py for gal1/smc/lmc/xgal; will temporarily use new implementation of MWAvg extinction law if gal3 is specified, for purposes of commissioning tests.

Files:

• trunk/pysynphot/lib/Cache.py (added)
• trunk/pysynphot/lib/__init__.py (modified) (2 diffs)
• trunk/pysynphot/lib/locations.py (modified) (2 diffs)
• trunk/pysynphot/lib/observationmode.py (modified) (3 diffs)
• trunk/pysynphot/lib/reddening.py (added)
• trunk/pysynphot/lib/spparser.py (modified) (2 diffs)

trunk/pysynphot/lib/__init__.py

@@ -147 +147 @@
-#Complicated spectral elements
-from obsbandpass import ObsBandpass
-extinction
+reddening
-#Observations
-from observation import Observation
@@ -155 +155 @@
-#Get Vega
-from spectrum import Vega
+#Get cache 
+import Cache
-
-def _test():

trunk/pysynphot/lib/locations.py

@@ -1 @@
-
+, glob
-
-
+
+
+
+
+
+
+
+
+
+
+
-#Replace cdbs_roots lookup with an environment variable
-try:
@@ -17 +27 @@
-KUR_TEMPLATE = os.path.join(rootdir,'grid','*')
-
-
+
-VegaFile = os.path.join(specdir,'alpha_lyr_stis_003.fits')
-
+#Reddening Laws
+extdir=os.path.join(rootdir,'grid','extinction')
-
+
+RedLaws={'mwavg':   'milkyway_diffuse_*.fits',
+         'mwdense': 'milkyway_dense_*.fits',
+         'lmcavg':  'lmc_diffuse_*.fits',
+         'lmc30dor':'lmc_30dorshell_*.fits',
+         'smcbar':  'smc_bar_*.fits',
+         'xgalsb':  'xgal_starburst_*.fits'
+           }
+
+for k in RedLaws:
+    try:
+        RedLaws[k]=_refTable(os.path.join(extdir,RedLaws[k]))
+    except IOError:
+        pass
+    
-#Define wavecat file explicitly
-wavecat = os.path.join(specdir,'wavecat.dat')
-
-def getBandFileName(band):
-    return os.path.join(specdir,band.replace(',','_')+'.fits')
-
-def irafconvert(iraffilename):

trunk/pysynphot/lib/observationmode.py

@@ -15 +15 @@
-import planck
-import wavetable
+from locations import _refTable
-
-#Flag to control verbosity
@@ -24 +25 @@
-
-# Component tables are defined here.
-def _refTable(template):
-    names = glob.glob(os.path.join(rootdir,template))
-    names.sort()
-    try:
-        return names[-1]
-    except IndexError:
-        msg= "No files found for %s."%os.path.join('PYSYN_CDBS',template)
-        raise IOError(msg)
-try:
-    GRAPHTABLE = _refTable(os.path.join('mtab','*_tmg.fits'))
@@ -346 +339 @@
-        c1 = float(coefficients[1])
-        c2 = (c1 - c0) / 1999.0    # arbitraily copied from synphot....
+        #In synphot.countrate/calcstep.x, it was NSPEC-1, where
+        #NSPEC was hardcoded to 2000 as the number of bins into
+        #which the wavelength set should be divided by default
-        c3 = c2
-        if len(coefficients) > 2:

trunk/pysynphot/lib/spparser.py

@@ -2 +2 @@
-from spark import GenericASTBuilder, GenericASTMatcher
-import spectrum
-extinction
+reddening
-import observationmode
-import locations
@@ -261 +261 @@
-            elif fname == 'ebmvx':
-                # extinction
-
+
+
-            else:
-                tree.value = "would call %s with the following args: %s" % (fname, repr(args))