diff --git a/docs/filters.rst b/docs/filters.rst index 918f27f4..6efb28fc 100644 --- a/docs/filters.rst +++ b/docs/filters.rst @@ -7,16 +7,16 @@ Photometric Filters The user can specify what filters are used for synthetic photometry when defining the :ref:`isochrone_objects`. Each filter is identified by a unique string, and an array of such strings -are passed into the Isochrone call. +are passed into the Isochrone call. For example:: - + # Use the HST WFC3-IR F127M and F153M filters, along with NIRC2 Kp filt_list = ['wfc3,ir,f127m', 'wfc3,ir,f153m', 'nirc2,Kp'] my_iso = synthetic.IsochronePhot(logAge, AKs, dist, metallicity=0, evo_model=evo_model, atm_func=atm_func, red_law=red_law, filters=filt_list) - + These strings follow the format ``,``. Note that there is no space after the comma, and case matters. @@ -40,7 +40,7 @@ Available filters: * JWST * Keck NIRC * Keck NIRC2 -* NACO +* NACO * PanStarrs 1 * Roman Space Telescope * UKIRT @@ -48,11 +48,11 @@ Available filters: * VISTA * ZTF - + Filter Sets ------------ - + **2MASS** `Two-Micron Sky Survey `_ @@ -83,7 +83,7 @@ Example: ``'decam,r'`` **Euclid** -Euclid space telescope `NISP filters `_ +Euclid space telescope `NISP filters `_ and `VIS single filter `_ Filters: VIS, Y, J, H @@ -146,10 +146,10 @@ Example: ``'jg,K'`` JWST NIRCam filters, downloaded from `NIRCam website `_. The filter functions in the nircam_throughputs/modAB_mean/nrc_plus_ote folder is used. -Filters: F070W, F090W, F115W, F140M, F150W, F150W2, F162M, F164N, F182M, F187N, F200W, F210M, F212N, F250M, F277W, F300M, F322W2, F323N, F335M, F356W, F360M, F405N, F410M, F430M, F444W, F460M, F466N, F470N, F480M +Filters: F070W, F090W, F115W, F140M, F150W, F150W2, F162M, F164N, F182M, F187N, F200W, F210M, F212N, F250M, F277W, F300M, F322W2, F323N, F335M, F356W, F360M, F405N, F410M, F430M, F444W, F460M, F466N, F470N, F480M Example: ``'jwst,F356W'`` - + **Keck NIRC** @@ -237,3 +237,11 @@ Example: ``'vista,Y'`` Filters: g, r, i Example: ``'ztf,g'`` + +**IRTF** + +`IRTF NSFCam `_ + +Filters: L + +Example: ``'nsfcam,L'`` diff --git a/filt_func/nsfcam/L.dat b/filt_func/nsfcam/L.dat new file mode 100755 index 00000000..43589640 --- /dev/null +++ b/filt_func/nsfcam/L.dat @@ -0,0 +1,390 @@ +30156.8 0.000962257 +30175 0.00120592 +30193.2 0.00134921 +30211.5 0.00127125 +30229.7 0.00150251 +30248 0.00161243 +30266.3 0.00188732 +30284.7 0.00170279 +30303 0.00204206 +30321.4 0.00192571 +30339.8 0.00215411 +30358.2 0.0022676 +30376.7 0.00244951 +30395.1 0.00242066 +30413.6 0.0025301 +30432.1 0.00248027 +30450.7 0.0023284 +30469.2 0.00224257 +30487.8 0.00251317 +30506.4 0.0024693 +30525 0.00250125 +30543.7 0.00249219 +30562.3 0.00242495 +30581 0.00247026 +30599.8 0.00256109 +30618.5 0.00265122 +30637.3 0.00268054 +30656 0.0026195 +30674.8 0.00252914 +30693.7 0.0025599 +30712.5 0.00271273 +30731.4 0.00289178 +30750.3 0.0028379 +30769.2 0.0027976 +30788.2 0.00280762 +30807.1 0.00294924 +30826.1 0.00277042 +30845.2 0.00315022 +30864.2 0.00310421 +30883.3 0.0032618 +30902.3 0.00327802 +30921.5 0.00363994 +30940.6 0.00354338 +30959.8 0.00367117 +30978.9 0.00364733 +30998.1 0.00382757 +31017.4 0.00397182 +31036.6 0.00422025 +31055.9 0.00454044 +31075.2 0.00470376 +31094.5 0.00489855 +31113.9 0.00507116 +31133.3 0.00551271 +31152.6 0.00583959 +31172.1 0.00608921 +31191.5 0.00644302 +31211 0.00705314 +31230.5 0.00754762 +31250 0.00817514 +31269.5 0.0087316 +31289.1 0.00952125 +31308.7 0.0100901 +31328.3 0.0112662 +31348 0.012145 +31367.6 0.0135512 +31387.3 0.0147848 +31407 0.0162675 +31426.8 0.0178838 +31446.5 0.0200837 +31466.3 0.0222387 +31486.1 0.0248327 +31506 0.0277917 +31525.9 0.0313036 +31545.7 0.0353098 +31565.7 0.0398614 +31585.6 0.0450525 +31605.6 0.0513139 +31625.6 0.0586095 +31645.6 0.0669079 +31665.6 0.0764895 +31685.7 0.0874972 +31705.8 0.100346 +31725.9 0.115176 +31746 0.132822 +31766.2 0.152965 +31786.4 0.176419 +31806.6 0.202869 +31826.9 0.232942 +31847.1 0.26663 +31867.4 0.304328 +31887.8 0.346514 +31908.1 0.39176 +31928.5 0.440715 +31948.9 0.49065 +31969.3 0.54304 +31989.8 0.595515 +32010.2 0.646355 +32030.7 0.69369 +32051.3 0.736929 +32071.8 0.776407 +32092.4 0.810945 +32113 0.840741 +32133.7 0.865207 +32154.3 0.882942 +32175 0.895848 +32195.8 0.907165 +32216.5 0.914134 +32237.3 0.918469 +32258.1 0.918946 +32278.9 0.921683 +32299.7 0.921975 +32320.6 0.922349 +32341.5 0.920204 +32362.5 0.919714 +32383.4 0.918919 +32404.4 0.919387 +32425.4 0.917863 +32446.5 0.919708 +32467.5 0.918676 +32488.6 0.920314 +32509.8 0.921267 +32530.9 0.924305 +32552.1 0.924901 +32573.3 0.92679 +32594.5 0.927062 +32615.8 0.92867 +32637.1 0.930581 +32658.4 0.932568 +32679.7 0.933752 +32701.1 0.934407 +32722.5 0.934966 +32743.9 0.935562 +32765.4 0.935877 +32786.9 0.935577 +32808.4 0.937084 +32829.9 0.935535 +32851.5 0.935269 +32873.1 0.933562 +32894.7 0.934837 +32916.4 0.934186 +32938.1 0.93382 +32959.8 0.930758 +32981.5 0.932153 +33003.3 0.930245 +33025.1 0.931608 +33046.9 0.929196 +33068.8 0.928553 +33090.7 0.927891 +33112.6 0.927366 +33134.5 0.925955 +33156.5 0.925616 +33178.5 0.924155 +33200.5 0.9242 +33222.6 0.924963 +33244.7 0.926667 +33266.8 0.926907 +33288.9 0.927095 +33311.1 0.927768 +33333.3 0.927881 +33355.6 0.927298 +33377.8 0.928207 +33400.1 0.929544 +33422.5 0.92875 +33444.8 0.931329 +33467.2 0.931714 +33489.6 0.933643 +33512.1 0.933482 +33534.5 0.934703 +33557 0.933673 +33579.6 0.936075 +33602.2 0.935964 +33624.7 0.937671 +33647.4 0.937828 +33670 0.93953 +33692.7 0.93949 +33715.4 0.940382 +33738.2 0.939342 +33761 0.939697 +33783.8 0.939215 +33806.6 0.939933 +33829.5 0.939316 +33852.4 0.93844 +33875.3 0.936932 +33898.3 0.937429 +33921.3 0.935991 +33944.3 0.934474 +33967.4 0.93386 +33990.5 0.933919 +34013.6 0.934497 +34036.8 0.932878 +34059.9 0.932388 +34083.2 0.930515 +34106.4 0.930335 +34129.7 0.926779 +34153 0.928042 +34176.3 0.927017 +34199.7 0.927041 +34223.1 0.925245 +34246.6 0.925419 +34270 0.922434 +34293.6 0.922526 +34317.1 0.920628 +34340.7 0.922238 +34364.3 0.922019 +34387.9 0.92312 +34411.6 0.922412 +34435.3 0.922376 +34459 0.922568 +34482.8 0.92339 +34506.6 0.923071 +34530.4 0.922723 +34554.3 0.923598 +34578.1 0.924315 +34602.1 0.92512 +34626 0.925369 +34650 0.926424 +34674.1 0.926304 +34698.1 0.927742 +34722.2 0.927231 +34746.4 0.928697 +34770.5 0.928282 +34794.7 0.928515 +34818.9 0.928225 +34843.2 0.931308 +34867.5 0.93055 +34891.8 0.931965 +34916.2 0.931467 +34940.6 0.933056 +34965 0.931511 +34989.5 0.93317 +35014 0.932156 +35038.5 0.933175 +35063.1 0.93295 +35087.7 0.933402 +35112.4 0.93237 +35137 0.932794 +35161.7 0.933112 +35186.5 0.933091 +35211.3 0.932481 +35236.1 0.931611 +35260.9 0.931829 +35285.8 0.931225 +35310.7 0.931367 +35335.7 0.930309 +35360.7 0.930468 +35385.7 0.928837 +35410.8 0.929125 +35435.9 0.927485 +35461 0.928169 +35486.2 0.926087 +35511.4 0.926735 +35536.6 0.924653 +35561.9 0.925792 +35587.2 0.923333 +35612.5 0.924337 +35637.9 0.922857 +35663.3 0.923206 +35688.8 0.922176 +35714.3 0.922241 +35739.8 0.920767 +35765.4 0.921537 +35791 0.921272 +35816.6 0.921205 +35842.3 0.920734 +35868 0.921399 +35893.8 0.922207 +35919.5 0.922209 +35945.4 0.923026 +35971.2 0.923312 +35997.1 0.924458 +36023.1 0.923587 +36049 0.925046 +36075 0.925553 +36101.1 0.927519 +36127.2 0.927259 +36153.3 0.929243 +36179.5 0.929186 +36205.6 0.931319 +36231.9 0.931036 +36258.2 0.933156 +36284.5 0.932827 +36310.8 0.935527 +36337.2 0.935068 +36363.6 0.936368 +36390.1 0.93617 +36416.6 0.938059 +36443.1 0.938573 +36469.7 0.939709 +36496.4 0.93988 +36523 0.939998 +36549.7 0.94011 +36576.4 0.940587 +36603.2 0.940885 +36630 0.940585 +36656.9 0.939915 +36683.8 0.938672 +36710.7 0.93903 +36737.7 0.937852 +36764.7 0.937917 +36791.8 0.936105 +36818.9 0.936005 +36846 0.933661 +36873.2 0.933678 +36900.4 0.930873 +36927.6 0.931034 +36954.9 0.927961 +36982.2 0.927815 +37009.6 0.92528 +37037 0.925085 +37064.5 0.922289 +37092 0.92209 +37119.5 0.92012 +37147.1 0.919756 +37174.7 0.917933 +37202.4 0.917613 +37230.1 0.916242 +37257.8 0.915813 +37285.6 0.914763 +37313.4 0.914014 +37341.3 0.913402 +37369.2 0.912757 +37397.2 0.911949 +37425.1 0.910474 +37453.2 0.909624 +37481.3 0.906503 +37509.4 0.903579 +37537.5 0.898389 +37565.7 0.893606 +37594 0.884823 +37622.3 0.876159 +37650.6 0.863052 +37679 0.849638 +37707.4 0.830408 +37735.8 0.810358 +37764.4 0.784773 +37792.9 0.757942 +37821.5 0.7256 +37850.1 0.692032 +37878.8 0.654269 +37907.5 0.615479 +37936.3 0.57444 +37965.1 0.533411 +37993.9 0.491468 +38022.8 0.450241 +38051.8 0.410215 +38080.7 0.371899 +38109.8 0.335394 +38138.8 0.301191 +38167.9 0.269683 +38197.1 0.240773 +38226.3 0.214541 +38255.5 0.190484 +38284.8 0.169015 +38314.2 0.149827 +38343.6 0.132494 +38373 0.117145 +38402.5 0.103844 +38432 0.0915825 +38461.5 0.081001 +38491.1 0.071492 +38520.8 0.0633302 +38550.5 0.055959 +38580.2 0.0494764 +38610 0.043674 +38639.9 0.0386024 +38669.8 0.0340512 +38699.7 0.0300536 +38729.7 0.0265405 +38759.7 0.0234788 +38789.8 0.0208454 +38819.9 0.0184088 +38850 0.0161228 +38880.2 0.014158 +38910.5 0.0123668 +38940.8 0.0108354 +38971.2 0.00944018 +39001.6 0.00825095 +39032 0.00721598 +39062.5 0.00630403 +39093 0.00532269 +39123.6 0.00468755 +39154.3 0.00382352 +39185 0.00340962 +39215.7 0.00293064 +39246.5 0.00240946 +39277.3 0.00178313 +39308.2 0.00182629 +39339.1 0.00121212 +39370.1 0.00120258 +39401.1 0.000939846 diff --git a/spisea/filters.py b/spisea/filters.py index 23c029b3..e2a2aee9 100755 --- a/spisea/filters.py +++ b/spisea/filters.py @@ -29,7 +29,7 @@ def get_nirc2_filt(name): while len(idx) != 0: wavelength[idx+1] += 1.0e-8 - + diff = np.diff(wavelength) idx = np.where(diff <= 0)[0] #print( 'Duplicate entry loop' ) @@ -68,7 +68,7 @@ def get_2mass_filt(name): name='2MASS_{0}'.format(name)) return spectrum - + def get_vista_filt(name): """ @@ -79,21 +79,21 @@ def get_vista_filt(name): t = Table.read('{0}/vista/VISTA_Filters_at80K_forETC_{1}.dat'.format(filters_dir, name), format='ascii') except: - raise ValueError('Could not find VISTA filter file {0}/vista/VISTA_Filters_at80K_forETC_{1}.dat'.format(filters_dir, name)) + raise ValueError('Could not find VISTA filter file {0}/vista/VISTA_Filters_at80K_forETC_{1}.dat'.format(filters_dir, name)) # Wavelength must be in angstroms, transmission in fraction wave = t['col1'] * 10 trans = t['col2'] * 0.01 - + # Change any negative numbers to 0, as well as anything shortward # of 0.4 microns or longward of 2.9 microns # (no VISTA filter transmissions beyond these boundaries) bad = np.where( (trans < 0) | (wave < 4000) | (wave > 29000) ) trans[bad] = 0 - + # Now we can define the VISTA filter bandpass objects spectrum = pysynphot.ArrayBandpass(wave, trans, waveunits='angstrom', name='VISTA_{0}'.format(name)) - + return spectrum def get_decam_filt(name): @@ -104,18 +104,18 @@ def get_decam_filt(name): try: t = Table.read('{0}/decam/DECam_filters.txt'.format(filters_dir), format='ascii') t.rename_column('Y', 'y') - + cols = np.array(t.keys()) idx = np.where(cols == name)[0][0] trans = t[cols[idx]] except: - raise ValueError('Could not find DECAM filter {0} in {1}/decam/DECam_filters.txt'.format(name, filters_dir)) + raise ValueError('Could not find DECAM filter {0} in {1}/decam/DECam_filters.txt'.format(name, filters_dir)) # Limit to unmasked regions only mask = np.ma.getmask(trans) good = np.where(mask == False) - + # Convert wavelengths from nm to angstroms, while eliminating masked regions wave = t['wavelength'][good] * 10. trans = trans[good] @@ -126,7 +126,7 @@ def get_decam_filt(name): return spectrum -def get_PS1_filt(name): +def get_PS1_filt(name): """ Define PS1 filter as pysynphot object """ @@ -145,11 +145,11 @@ def get_PS1_filt(name): trans = t[cols[idx]] except: - raise ValueError('Could not find PS1 filter {0} in {1}/ps1'.format(name, filters_dir)) + raise ValueError('Could not find PS1 filter {0} in {1}/ps1'.format(name, filters_dir)) # Convert wavelengths from nm to angstroms wave = t['wave'] * 10. - + spectrum = pysynphot.ArrayBandpass(wave, trans, waveunits='angstrom', name='ps1_{0}'.format(name)) return spectrum @@ -161,7 +161,7 @@ def get_jwst_filt(name): try: t = Table.read('{0}/jwst/{1}.txt'.format(filters_dir, name), format='ascii') except: - raise ValueError('Could not find JWST filter {0} in {1}/jwst'.format(name, filters_dir)) + raise ValueError('Could not find JWST filter {0} in {1}/jwst'.format(name, filters_dir)) # Convert wavelengths to angstroms wave = t['microns'] * 10**4. @@ -170,10 +170,10 @@ def get_jwst_filt(name): # Change any negative numbers to 0 bad = np.where(trans < 0) trans[bad] = 0 - + spectrum = pysynphot.ArrayBandpass(wave, trans, waveunits='angstrom', name='jwst_{0}'.format(name)) - return spectrum + return spectrum def get_Johnson_Glass_filt(name): """ @@ -182,7 +182,7 @@ def get_Johnson_Glass_filt(name): try: t = Table.read('{0}/Johnson_Glass/{1}.txt'.format(filters_dir, name), format='ascii') except: - raise ValueError('Could not find Johnson-Glass filter {0} in {1}/Johnson_Glass'.format(name, filters_dir)) + raise ValueError('Could not find Johnson-Glass filter {0} in {1}/Johnson_Glass'.format(name, filters_dir)) # Convert wavelengths to angstroms wave = t['col1'] * 10. @@ -191,10 +191,10 @@ def get_Johnson_Glass_filt(name): # Change any negative numbers to 0 bad = np.where(trans < 0) trans[bad] = 0 - + spectrum = pysynphot.ArrayBandpass(wave, trans, waveunits='angstrom', name='jg_{0}'.format(name)) - return spectrum + return spectrum def get_nirc1_filt(name): """ @@ -203,12 +203,12 @@ def get_nirc1_filt(name): try: t = Table.read('{0}/nirc1/{1}.txt'.format(filters_dir, name), format='ascii') except: - raise ValueError('Could not find NIRC1 filter {0} in {1}/nirc1'.format(name, filters_dir)) + raise ValueError('Could not find NIRC1 filter {0} in {1}/nirc1'.format(name, filters_dir)) # Convert wavelengths to angstroms wave = t['col1'] * 10**4 trans = t['col2'] - + # Lets fix wavelength array for duplicate values or negative vals; # delete these entries diff = np.diff(wave) @@ -222,14 +222,14 @@ def get_nirc1_filt(name): diff = np.diff(wave) idx = np.where(diff <= 0)[0] - + # Change any negative transmission vals to 0 bad = np.where(trans < 0) trans[bad] = 0 spectrum = pysynphot.ArrayBandpass(wave, trans, waveunits='angstrom', name='nirc1_{0}'.format(name)) - return spectrum + return spectrum def get_ctio_osiris_filt(name): """ @@ -238,7 +238,7 @@ def get_ctio_osiris_filt(name): try: t = Table.read('{0}/CTIO_OSIRIS/{1}.txt'.format(filters_dir, name), format='ascii') except: - raise ValueError('Could not find CTIO/OSIRIS filter {0} in {1}/CTIO_OSIRIS'.format(name, filters_dir)) + raise ValueError('Could not find CTIO/OSIRIS filter {0} in {1}/CTIO_OSIRIS'.format(name, filters_dir)) # Convert wavelengths to angstroms wave = t['col1'] * 10**4 @@ -247,7 +247,7 @@ def get_ctio_osiris_filt(name): # Change any negative numbers to 0 bad = np.where(trans < 0) trans[bad] = 0 - + spectrum = pysynphot.ArrayBandpass(wave, trans, waveunits='angstrom', name='ctio_osiris_{0}'.format(name)) return spectrum @@ -259,7 +259,7 @@ def get_naco_filt(name): try: t = Table.read('{0}/naco/{1}.dat'.format(filters_dir, name), format='ascii') except: - raise ValueError('Could not find NACO filter {0} in {1}/naco'.format(name, filters_dir)) + raise ValueError('Could not find NACO filter {0} in {1}/naco'.format(name, filters_dir)) # Convert wavelengths to angstroms wave = t['col1'] * 10**4 @@ -268,7 +268,7 @@ def get_naco_filt(name): # Change any negative numbers to 0 bad = np.where(trans < 0) trans[bad] = 0 - + spectrum = pysynphot.ArrayBandpass(wave, trans, waveunits='angstrom', name='naco_{0}'.format(name)) return spectrum @@ -282,7 +282,7 @@ def get_ubv_filt(name): except: raise ValueError('Could not find ubv filter {0} in {1}/ubv'.format(name, filters_dir)) - # Convert wavelength from nm to angstroms + # Convert wavelength from nm to angstroms wave = t[t.keys()[0]] * 10. # Convert transmission to ratio (from percent) trans = t[t.keys()[1]] / 100. @@ -336,8 +336,8 @@ def get_keck_osiris_filt(name): def get_gaia_filt(version, name): """ Define Gaia filters as pysynphot object. - To avoid confusion, we will only support - the revised DR2 zeropoints from + To avoid confusion, we will only support + the revised DR2 zeropoints from Evans+18. version: specify dr1, dr2, or dr2_rev @@ -357,7 +357,7 @@ def get_gaia_filt(version, name): path = '{0}/gaia/dr2_rev/'.format(filters_dir) else: raise ValueError('GAIA filter version {0} not understood. Please use dr1, dr2, or dr2_rev'.format(version)) - + # Get the filter info try: t = Table.read('{0}/Gaia_passbands.txt'.format(path), format='ascii') @@ -380,7 +380,7 @@ def get_gaia_filt(version, name): bad = np.where(trans > 90) trans[bad] = 0 except: - raise ValueError('Could not find Gaia filter {0}'.format(name)) + raise ValueError('Could not find Gaia filter {0}'.format(name)) # Convert wavelengths to angstroms (from nm) wave = t['LAMBDA'] * 10 @@ -472,3 +472,21 @@ def get_euclid_filt(name): name='euclid_{0}'.format(name)) return spectrum + +def get_nsfcam_filt(name): + + """ + Define irtf nsfcam filters as pysynphot object + """ + try: + t = Table.read('{0}/nsfcam/{1}.dat'.format(filters_dir, name), format='ascii') + except: + raise ValueError('Could not find nsfcam filter {0} in {1}/nsfcam'.format(name, filters_dir)) + + # Wavelength already in angstrom and and transmission in fraction + wave = t['col1'] + trans = t['col2'] + + spectrum = pysynphot.ArrayBandpass(wave, trans, waveunits='angstrom', name='nsfcam_{0}'.format(name)) + + return spectrum diff --git a/spisea/synthetic.py b/spisea/synthetic.py index e6390844..c672281f 100755 --- a/spisea/synthetic.py +++ b/spisea/synthetic.py @@ -139,8 +139,8 @@ class ResolvedCluster(Cluster): no compact remnants are produced. keep_low_mass_stars: boolean (default False) - If True, the cluster will not cut out stars below the isochrone grid - on initial mass. They are assigned a current mass equal to their initial + If True, the cluster will not cut out stars below the isochrone grid + on initial mass. They are assigned a current mass equal to their initial mass, a phase of 98, and no other evolutionary properties or photometry. If False, stars below the isochrone initial mass limit are cut out. @@ -573,7 +573,7 @@ def _make_companions_table(self, star_systems, compMass): return star_systems, companions - + def _remove_bad_systems(self, star_systems, compMass, keep_low_mass_stars): """ Helper function to remove stars with masses outside the isochrone @@ -1216,9 +1216,9 @@ def __init__(self, logAge, AKs, distance, # Convert into flux observed at Earth (unreddened) star *= (R / self.points.meta["DISTANCE"])**2 # in erg s^-1 cm^-2 A^-1 # Redden the spectrum. This doesn't take much time at all. - red = red_law.reddening(AKs).resample(star.wave) + red = red_law.reddening(AKs).resample(star.wave) star *= red - # Save the final spectrum to our spec_list for later use. + # Save the final spectrum to our spec_list for later use. self.spec_list.append(star) self.make_photometry(rebin=rebin, vega=vega, comp_filters=comp_filters) @@ -1226,7 +1226,7 @@ def __init__(self, logAge, AKs, distance, return def make_photometry(self, rebin=True, vega=vega, comp_filters=None): - """ + """ Make synthetic photometry for the specified filters. This function udpates the self.points table to include new columns with the photometry. @@ -1700,7 +1700,10 @@ def get_filter_info(name, vega=vega, rebin=True): elif name.startswith('euclid'): filt = filters.get_euclid_filt(filterName) - + + elif name.startswith('nsfcam'): + filt = filters.get_nsfcam_filt(filterName) + else: # Otherwise, look for the filter info in the cdbs/mtab and cdbs/comp files try: @@ -1847,7 +1850,8 @@ def get_obs_str(col): 'euclid_VIS':'euclid,VIS', 'euclid_Y':'euclid,Y', 'euclid_J':'euclid,J', - 'euclid_H':'euclid,H'} + 'euclid_H':'euclid,H', + 'nsfcam_L':'nsfcam,L'} obs_str = filt_list[name] @@ -2041,4 +2045,3 @@ def calc_ab_vega_filter_conversion(filt_str): #vega_mag_ab2 = -2.5 * np.log10(numerator2 / denominator2) - 48.6 return vega_mag_ab -