github.com/astropy/SPISEA commits | Ecosyste.ms: OpenCollective

Fixed iteritems for python3

16a107f1f75b6217bc33d02ac381eb9316f2888c authored almost 8 years ago

Added following extinction law objects: Fitzpactrick+09, Damineli+16, De Marchi+16, Schlafly+16

b5098fb16cd0b957febca56b74c268771511e2aa authored almost 8 years ago

Expanded wavelength range of vega star from 5000 - 50000 A to 3000 - 50000 A to allow us to capture DECam g-band.

e7bf09f82b5ca40ffa33c73ab6dbcb9ad4408ec3 authored almost 8 years ago

Added MIST models (Choi+16)

837d08d966fd54f641ff7bdf1790873bfa087d3b authored almost 8 years ago

Added MIST models (Choi+16)

6085fb08a4547bd7daeaf06415c1f349df90af06 authored almost 8 years ago

Two updates: ResolvedClusterDiffRedden now has column in synthetic cluster table that gives final AKs for each star after reddening perturbation; Isochrone generation only includes "isWR" if the input isochrone table has logT_WR column (which is what we use to identify WR stars in the first place); if not in isochrone table, then isWR column is None for all stars, since we dont have that info

ea6c4aeceadce98e77dccbe84476ba7cc436228c authored almost 8 years ago

Two updates: 1) Update ResolvedCluster class so user has option to input what filters they want to consider, as opposed to just taking the filters in the isochrone. If user doesnt define filters, class takes the filters from the input isochrone as before. 2 ) Activated synthetic photometry bug fix ( pysynphot binflux not working properly, so we need to do this by hand ) . Previously the fix was commented out and the binflux way was active.

d1293ea327eb7b15169d80e293572d4dc2677ee1 authored about 8 years ago

Added new class: MergedSiessGenevaPadova. This allows user to access evolution grid made with older models, which spans to logAge=9.78 (the newer grids only go to logAge=7 or 8)

46c5e531ddaa818e6533d5c6036807438b156bc5 authored about 8 years ago

Added code to catch objects with log g below grid values in get_BTSettl_phoenix_atmosphere function. Assignes log g = 2.5, the bottom of the grid, for these stars.

74d3e7e2939a737a678849babd595dd033b1ed34 authored about 8 years ago

Improved generation of multiples by factor of ~5. Strategy was to loop over N_companions rather than each individual star. New function calc_multi does this calculation. Previous code still available under "old" flag in generate_cluster function, currently set to false.

5cec9a8d2cab85e1aa8ba13526cc9dba6aad05ad authored about 8 years ago

Fixed merged

c20a2dcd1cece435dff466dbf7bfdd4e938fcfa9 authored over 8 years ago

Merge branch 'master' of https://github.com/astropy/PopStar

Conflicts:
popstar/imf/imf.py

ec226c7c5348e15fa0538e21486fef3dca8ec43b authored over 8 years ago

Merging with Jessicas updates

7c6379c96efad7c3bade5e95b8cb219cd38973f9 authored over 8 years ago

modified test.

8ef72a7f99e78bc856303a1c5add78790102c079 authored over 8 years ago

Fixed test, merged.

5bf47803abf4bf3bbc6cb55bb106e6a3903479de authored over 8 years ago

Checking stuff in for Matt to debug..

062cc6461ae66de976cb1c0a94eb5822a3ecce06 authored over 8 years ago

Added class ResolvedClusterDiffRedden2, which allows asymmetric dAKs distribution. Seems to work but further checking is needed to ensure that it is really correct.

c7f1d03699cb9a8de35b9a17972b7f4f28ad4bc2 authored over 8 years ago

Two bug fixes: IMF generate cluster mass limits, prim_power hack to deal with case where len(m) = 1 but powers[1] = -1, triggering -1 case.

969ed509d4356d14c016690276e55ca8fd0da85d authored over 8 years ago

Negligible

42a3993d01ce8330bf45adb00126d8e19a89fbcf authored over 8 years ago

Updated documentation with BTSettl stuff

b196ee1fdf08d99ab3f9a312b14b5470c62f4524 authored over 8 years ago

Added merged BTSettl-Phoenix models and appropriate functions. Updated get_merged_atmosphere to use BTSettl-Phoenix merged atmosphere from 3200 K - 3800 K and then BTSettl atmosphere only for T < 3200 K

611dce3b4b1f14b20e0ee49d31462af589908fe6 authored over 8 years ago

Added description of code to process BTSettl_CIFITS2011_2015 atmo models

30db068edd7a2048011ec2b50719563d3e47f40c authored over 8 years ago

Added code to process BTSettl_CIFITS2011_2015 atmo models

2cd02c088f60d7726d0d94816731afc656c61c12 authored over 8 years ago

Added R_v option to Cardelli law; Nishiyama+09 law now contains VISTA filters in definition; Westerlund 1 by-hand law is updated

442a3483ade47848f633be7661d6db955de396e2 authored over 8 years ago

Fixed bug in synthetic photometry: get_filter_info and mag_in_filter now produce integrated fluxes (f_lambda * d_lambda) instead of just f_lambda

1dc6aa937efcb8fc1aacb62f6413a0a6a1918715 authored over 8 years ago

Added error check in get_filter_info function to ensure that vega spectrum full covers the wavelength range of the filter

1eba27b6e99efb6132f702658b19e6b80c0a033a authored over 8 years ago

MAJOR BUG FIX: extended vega spectrum to 5000 Angstroms

bce84e5b2cd9cd848166e0d3840db0a1ad1cbf4f authored over 8 years ago

Parsec class is now readable by synthetic.Isochrone(). Now you can make a synthetic isochrone/cluster using only Parsec. This is valuable becaused merged isochrones only currently go to logAge=8. Parsec isochrones go to logAge=10.12

25f5dbbca68ede1f1c2525f2c19ef50ae7aa6dd1 authored almost 9 years ago

Merge branch 'master' of https://github.com/astropy/PopStar

4221f2cbd3daf9e8da99ae17074e02f060d1a89d authored about 9 years ago

Added mass interpolation to ResolvedCluster. Also added ResolvedClusterDiffRed

6edffa2e853d5ef0103b309179d6ceeab40a1ba3 authored about 9 years ago

IMPORTANT BUG FIX IN IsochronePhot: 139m filter was pulling 127m filter passband

0d233e9e0f080957dce8de637a7a24e5620f1d69 authored about 9 years ago

Finished draft of documentation

aa7248fb043412dca5a83cbe152ed801d98d4cec authored about 9 years ago

Start of documentation describing how to make a cluster

932b9ad8c37aafd70b70c75b1da82c36537bda95 authored about 9 years ago

Updated documentation to include Baraffe+15 models

2497740fbe3f152e8e67d57451ad14b6425801f7 authored about 9 years ago

Adding cluster with differential de-reddening

3bbee69ef6202cd7aa7c7134c375a6726a3c2f8c authored about 9 years ago

Merge branch 'master' of https://github.com/astropy/PopStar

3e2ab95e318e9227369fff5e95a4df5c0cb4bc4f authored about 9 years ago

Added test_synthetic.py

92363c688e5ad7ab01c92a722480f254af9888db authored about 9 years ago

Updated ability to specify rotating/non-rotating models for MergedBaraffePisaEkstromParsec() and MergedPisaEkstromParsec(). Now, whether or not rotating models are used are set by the \"rot\" keyword, which is passed to the __init__ function. If rot = True (which is the default value), will use rotating Ekstrom models. If rot = False, will use non-rotating Ekstrom models.

1861a2dd3d06f66d6b63487bcaf56aa28a695332 authored about 9 years ago

Added time test.

8c93bd3f7f4d9feb81c8ce847a04648760479673 authored about 9 years ago

fixed merge conflicts in test_synthetic - put model_young_cluster_new back in

1d2bb7c49f7c8ed2e83c3502c9c8c60d5eaa9589 authored about 9 years ago

UnresolvedCluster: made spectrum summing more efficient; now works with more massive models.

4d736f9db5e01d645457dbfc748089f6c6bcffd7 authored about 9 years ago

Fixed conflicts: synthetic.py didnt like addition of make_isochrone_grid function, while I deferred to other update of test_synthetic.py over my own

e2d53d6bd42abaedd9fa707976828c1ed234f84f authored about 9 years ago

Minor changes to test_ResolvedCluster() function. Some conflicts, will resolve.

4525f084e9515b86dd7f40243ee84c763024af3e authored about 9 years ago

New function to generate grid of model isochrones. Also changed default evolutionary models to Baraffe-Pisa_Ekstrom-Pisa merge

1d4e9ab46ca929d7bd9d10af33ed2063be73f4e2 authored about 9 years ago

Cleaned up test_synthetic.py after merge.

dde4d5452172a68dc32b6f68f3b7a6732f46b38d authored about 9 years ago

Some cleanup, shift utilities to bottom of synthetic.py, added some documentation

1596b689f9a9938e5d8f3e93276561ef1defdcbc authored about 9 years ago

SIGNIFICANT CHANGES. Added MergedBaraffePisaEkstromParsec class to access the newly-created merged models. ALSO, created a new "rot" keyword input to class.isochrone to allow the user to specify whether they want rotating or unrotating Ekstrom models (default=rotating models). This replaces the MergedPisaEkstromParsec_norot class, since we can now call the non-rotating models in MergedPisaEkstromParsec by calling MergedPisaEkstromParsec.ischrone(rot=False).

b361afe79061f362fc38db89b8c9c31b4cc69bdf authored about 9 years ago

Merge branch 'master' of https://github.com/astropy/PopStar

08f10510210582ba1cd1ba08f7f02547b2f365cf authored about 9 years ago

Added functionality for Baraffe+15 models. Specifically, standalone Baraffe15 class which allows you to interpolate isochrones from evolutionary tracks downloaded online, as well as function to compare Baraffe to Pisa models. TO DO: Still need to add MergedBaraffePisaEkstromParsec class to access merged models

4b894cc056efac6556d1b242a8ae31a5094583b6 authored about 9 years ago

Updated documentation to include Baraffe+15 models

3a88ff4a4bcc919d68365da40aced20bd9b6e23d authored about 9 years ago

merge conflicts resolved

f0be5a4e4071a3398b82ad0d3a68f8f26b8175a1 authored about 9 years ago

minor changes to UnresolvedCluster class attributes

7e3c40abbfcbe2659d729d738e4d738a730a4ed7 authored about 9 years ago

Merge branch 'master' of https://github.com/astropy/PopStar

9cc57707e1dc286f64eaa2a7a61cb8a4712c9650 authored about 9 years ago

Adjusted Wd1 reddening law to final version for paper

9a12413dc6f25cac95f8c2649a00a423b7cf79eb authored about 9 years ago

Small tweaks (changed L filter name to Lp

a4e4b9cf4faddc3226efedeac073fed9fada3ce1 authored about 9 years ago

working unresolved and resolved clusters

ec2fe1c1d39e14c051b202bf4f74ac1f0ffba949 authored about 9 years ago

Now have a working ResolvedCluster and test.

c9897c375bf5d228d810acb9f2213c34433d9699 authored about 9 years ago

Multiple bug fixes; UnresolvedCluster class in synthetic.py now runs without error (though results have not been vetted yet).

09c6666eb7cbe145d9a6b0a4c4ef1781edab6034 authored about 9 years ago

Tested isochrone objects (which depends on evolution and atmospheres). New test case. Working so far.

9c21d91c1b09010d26563bae0038e66d6bac85ba authored about 9 years ago

Merged with spec-unresolvedgit status! Hooray! Evolution model names have also change (WARNING)!

c50a1a85908ee69796364bec57819f20d82ca525 authored about 9 years ago

Merge branch 'spec-unresolved' of https://github.com/astropy/PopStar into spec-unresolved

a86a074e0b0d13870b1c1cc9d85aa705f27e7602 authored about 9 years ago

Draft edits to synthetic.UnresolvedCluster, synthetic.Isochrone, in prep for merging.

98f5920b351c201ce7e68fb1a1f1a5a6c59ade90 authored about 9 years ago

Updating documentation and setup for new template files.

02700924c83de5922d9574cb400e4c4cfe8c88d2 authored about 9 years ago

Merge branch 'master' of https://github.com/astropy/PopStar

e4ce58b49e9d76311aedb27798d7984ca4ec47ac authored about 9 years ago

Updated all pacakge files to latest template for an astropy affiliated package.

dc8e7c032bd632aca90a22db960500d2b3eee076 authored about 9 years ago

Removed old binary properties functions. They are now all in multiplicity.py

88ad9aef261d06c22d3ab080a5496153631d5289 authored about 9 years ago

Added POPSTAR_MODELS environment variable. This should point to the directory that **contains** evolution/. Don't include evolution in the path itself. This gives us more flexibility in the future.

c63944911a29975342a487ffbd6130f97cc5d799 authored about 9 years ago

get_merged_atmosphere now used a merged atmosphere between 5000 - 5500K

8de5718722da0917a55ae17feb4051ac558a6b4e authored about 9 years ago

Added section about default models used in isochrone

8ae3f078cb4b13b06ab9eac3145927d98986f59d authored about 9 years ago

Added section about defaul models used in isochrone

a647aeac53298fc7538023b76818a8698a28c85f authored about 9 years ago

Fixed imf call in synthetic.py to use generateCluster

818e581b1ea9342e302ee9e2f24fb68dbce0cdea authored about 9 years ago

Rough first draft of converting synthetic.py to object-oriented. Code is not ready to execute.

1fa6e40985b98717f7bb432f75ddb1a84c3b793d authored about 9 years ago

First commit: Documentation on how to download and format the evolution models for use in popstar. Also record of the references/parameters adopted for each set of atmospheric models, at least the ones I was invovled in (Matt)

f8e3e11394904153f871323e24a139ab925cb084 authored about 9 years ago

First commit: Documentation on how to download and format the atmospheric models for cdbs. Also record of the references/parameters adopted for each set of atmospheric models, at least the ones I was invovled in (Matt)

495bfc22ac28f6f1c5b5dddc6d827deb01a7ec81 authored about 9 years ago

Converted evolution.py to work with fits tables instead of text files, for speed improvement. Added a utility script, dat_to_fits.py, in the utils folder, to convert the .dat evoluion model text files to fits tables.

a6eae2ffeb875182732a6ec4c9c17bffb0ae5ae3 authored about 9 years ago

Added all functions needed in order to take downloaded isochrones and reformat/interpolate them. Most of these functions were added under their appropriate classes (Ekstrom+12 codes under the EkstromStellarEvolution class, for example), but the Pisa interpolation functions I have as standalone functions at the moment. Note that in current state, Pisa interpolation (get_orig_pisa_isochrones) requires popstar/util/objects.py --> class DataHolder(). Eventually I would imagine we want to get rid of this, which should be doable but would just take time.

027bbb570a3a41210c0c254a7c1476bf8441a410 authored about 9 years ago

Updated comment to make_PHOENIXv16_catalog

525255ee6116c17a57ac6ae11583a9cc8ba20c7a authored about 9 years ago

Update README.rst

Updated installation notes and changed status on evolution models

057571fcbed6a28901482814c715e699dfd85ca8 authored about 9 years ago

Making synthetic.py into object-oriented goodness.

1bbd9180631a0630ee9284b70f5b89ad6e9690fb authored about 9 years ago

Fixed IMF and multiplicity. CHANGE IN INTERFACE (generateCluster -> generate_cluster)

3411a267fb9a3b4046641ab186b389991627b2ea authored about 9 years ago

Added evolutionary model selection to synthetic.py, including synthetic.evModel_select to allow for switching between models. Also copied over changes to imf.py from the master. Fixed a bug in a model path in evolution.py.

9a2fd961a2c72a17137ff47b45972343bdb30085 authored about 9 years ago

Testing.

2739042065c202ad5fe18ad80f5f9e5608cd153e authored about 9 years ago

Testing.

ab907950a4cbada21766dca836edfd5af5730023 authored about 9 years ago

Testing.

b9a3c5a29e5e3106d143c2531e4e45baaf6d5ac5 authored about 9 years ago

Adding bullets.

642db2d2deb0f49f868d294b8cc0a7cc3f8379e3 authored about 9 years ago

Fixed bug in IMF with variable name change. Added README documentation for INSTALL.

f2818b00422ffdd7bad9251986487efaf5c6d988 authored about 9 years ago

Fixed bug in get_filter_info, for nirc2 filters. Was expecting output filter to be the spectrum, not a tuple with [spectrum, vega_flux, vega_mag].

ea95241eebfc1db235fcfecdb5cd2f558f2189b3 authored over 9 years ago

Conversion bug issues fixed: mismatched variable names (i.e., self._m_limits_high vs. self.mLimitsHigh), imf_norm_cl --> imf_norm_cl_wk04, typo in imf_norm_cl_wk04 (mix --> max), added imf_int_xi function from jlu/imf/imf.py (it is called several times in different functions here), in imf_norm_cl_wk04 allowed Mmax to be None, like Mmin. Code was written to expect this.

9955c228d008e09a725727bcd94fe5cabfcf7183 authored over 9 years ago

added class MergedPisaEkstromParsec_norot for the merged Pisa-Ekstrom-Parsec models with the non-rotating Ekstrom models

cdb665694d8456aea1b8c09735ba6e560baa14c8 authored over 9 years ago

Added multiplicity default value of 0 to imf.py. Otherwise code will crash on import. RE-EVALUATE LATEER

18e54a2a65d860f10e2b9b04eef22036bba9b3e8 authored over 9 years ago

Added data holder objects.

cab719cf95ee0c9d6e78e9bc3915e3d1d4acea40 authored over 9 years ago

Remove jlu_python dependencies from synthetic.py

f22bbd812b7d327158d9c6302d297b241d6f4e6f authored over 9 years ago

Merge branch 'master' of https://github.com/astropy/PopStar

f24169d662bde3bdcc27266034ca4d50558f07eb authored over 9 years ago

Fixed file format issue in pisa isochrone().

2bb9751a7777360a0ccf29ff92e3119a009b61e4 authored over 9 years ago

Added model_young_cluster_new capability. Now code can generate a synthetic cluster using load_isochrone and make_observed_isochrone_hst. NOTE: can definitely be improved...makes isochrone for each specific distance, rather than generating from just one distance and shifting to desired distance

3b388f77593700afb0da143b4ead6ff8459f476f authored over 9 years ago

Changed mass sampling rate on load_isochrone to 3, instead of 2. No other changes

513cc48c066915bd9e569229f4d7767014053938 authored over 9 years ago

Small spacing changes, inconsequential

519dfe76d1f99e203b83a50965b27ea0b345b2da authored over 9 years ago

Updated with CMFGEN grid info

e1d94ebf45fe50ae8015e3adfa8167f54f36f86d authored over 9 years ago

Derived new reddening law for Wd1

06f35f8908dab80af58140f04df6011ea6ac7d74 authored over 9 years ago

Added header to store reddening law used.

162b96eec4aad6e6f2128f4a7766aa379dc69220 authored over 9 years ago