[yt-svn] commit/yt: 8 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Feb 17 02:56:30 PST 2014
8 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/2231edf1519f/
Changeset: 2231edf1519f
Branch: yt
User: jzuhone
Date: 2014-01-31 23:41:12
Summary: Missed this
Affected #: 1 file
diff -r 81c9cc76d81746db9a1183a8033fefb0243bee41 -r 2231edf1519f03103c1591a1bba2b0b484623144 yt/analysis_modules/photon_simulator/photon_simulator.py
--- a/yt/analysis_modules/photon_simulator/photon_simulator.py
+++ b/yt/analysis_modules/photon_simulator/photon_simulator.py
@@ -447,7 +447,7 @@
responses : list of strings, optional
The names of the ARF and/or RMF files to convolve the photons with.
convolve_energies : boolean, optional
- If this is set, the photon energies will be convolved with the RMF>
+ If this is set, the photon energies will be convolved with the RMF.
Examples
--------
@@ -533,7 +533,7 @@
else:
if redshift_new is None:
zobs = 0.0
- D_A = dist_new[0]*mpc_conversion["kpc"]/mpc_conversion[dist[1]]
+ D_A = dist_new[0]*mpc_conversion["kpc"]/mpc_conversion[dist_new[1]]
else:
zobs = redshift_new
D_A = self.cosmo.AngularDiameterDistance(0.0,zobs)*1000.
https://bitbucket.org/yt_analysis/yt/commits/9daad3e2f05b/
Changeset: 9daad3e2f05b
Branch: yt
User: jzuhone
Date: 2014-02-01 18:11:01
Summary: Merging
Affected #: 1 file
diff -r 2231edf1519f03103c1591a1bba2b0b484623144 -r 9daad3e2f05bc9629662957002e3094fa9c98de6 yt/visualization/profile_plotter.py
--- a/yt/visualization/profile_plotter.py
+++ b/yt/visualization/profile_plotter.py
@@ -641,6 +641,7 @@
[ax.xaxis.label, ax.yaxis.label, cbax.yaxis.label]
for label in labels:
label.set_color(self._font_color)
+ self._plot_valid = True
def save(self, name=None, mpl_kwargs=None):
r"""
https://bitbucket.org/yt_analysis/yt/commits/c46bb7f0740c/
Changeset: c46bb7f0740c
Branch: yt
User: jzuhone
Date: 2014-02-01 18:20:30
Summary: Matt's suggestions
Affected #: 2 files
diff -r 9daad3e2f05bc9629662957002e3094fa9c98de6 -r c46bb7f0740c92eb5661eb4accd82e9deefc3de6 yt/analysis_modules/photon_simulator/photon_simulator.py
--- a/yt/analysis_modules/photon_simulator/photon_simulator.py
+++ b/yt/analysis_modules/photon_simulator/photon_simulator.py
@@ -490,6 +490,7 @@
parameters = {}
if responses is not None:
+ responses = ensure_list(responses)
parameters["ARF"] = responses[0]
if len(responses) == 2:
parameters["RMF"] = responses[1]
@@ -533,6 +534,10 @@
else:
if redshift_new is None:
zobs = 0.0
+ if dist_new[1] not in mpc_conversion:
+ mylog.error("Please specify dist_new in one of the following units: %s",
+ mpc_conversion.keys())
+ raise KeyError
D_A = dist_new[0]*mpc_conversion["kpc"]/mpc_conversion[dist_new[1]]
else:
zobs = redshift_new
diff -r 9daad3e2f05bc9629662957002e3094fa9c98de6 -r c46bb7f0740c92eb5661eb4accd82e9deefc3de6 yt/analysis_modules/setup.py
--- a/yt/analysis_modules/setup.py
+++ b/yt/analysis_modules/setup.py
@@ -21,6 +21,7 @@
config.add_subpackage("star_analysis")
config.add_subpackage("two_point_functions")
config.add_subpackage("radmc3d_export")
+ config.add_subpackage("sunrise_export")
config.add_subpackage("sunyaev_zeldovich")
config.add_subpackage("particle_trajectories")
config.add_subpackage("photon_simulator")
https://bitbucket.org/yt_analysis/yt/commits/09788fca82db/
Changeset: 09788fca82db
Branch: yt
User: jzuhone
Date: 2014-02-17 03:16:51
Summary: Separate out these imports
Affected #: 1 file
diff -r c46bb7f0740c92eb5661eb4accd82e9deefc3de6 -r 09788fca82db4bfa79c378c8aa0ac5f73357df7e yt/analysis_modules/photon_simulator/spectral_models.py
--- a/yt/analysis_modules/photon_simulator/spectral_models.py
+++ b/yt/analysis_modules/photon_simulator/spectral_models.py
@@ -15,9 +15,18 @@
import os
from yt.funcs import *
import h5py
+
+try:
+ import xspec
+except ImportError:
+ pass
+
try:
import astropy.io.fits as pyfits
- import xspec
+except ImportError:
+ pass
+
+try:
from scipy.integrate import cumtrapz
from scipy import stats
except ImportError:
https://bitbucket.org/yt_analysis/yt/commits/25579116aeb0/
Changeset: 25579116aeb0
Branch: yt
User: jzuhone
Date: 2014-02-17 03:22:23
Summary: Merge
Affected #: 6 files
diff -r 09788fca82db4bfa79c378c8aa0ac5f73357df7e -r 25579116aeb03211563d66beed83473a32865e3e MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,9 @@
-include distribute_setup.py README* CREDITS COPYING.txt CITATION
+include distribute_setup.py README* CREDITS COPYING.txt CITATION nose.cfg
recursive-include yt/gui/reason/html *.html *.png *.ico *.js
-recursive-include yt *.pyx *.pxd *.h README*
-recursive-include yt/utilities/kdtree *.f90 *.v Makefile LICENSE
\ No newline at end of file
+recursive-include yt *.pyx *.pxd *.h README* *.glsl *.cu
+recursive-include yt/utilities/kdtree *.f90 *.v Makefile LICENSE
+recursive-include yt/analysis_modules/halo_finding/rockstar *.py *.pyx
+prune yt/frontends/_skeleton
+prune tests
+graft yt/gui/reason/html/resources
+exclude clean.sh .hgchurn
diff -r 09788fca82db4bfa79c378c8aa0ac5f73357df7e -r 25579116aeb03211563d66beed83473a32865e3e doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -503,10 +503,8 @@
cd $LIB
if [ ! -z `echo $LIB | grep h5py` ]
then
- shift
( ${DEST_DIR}/bin/python2.7 setup.py build --hdf5=${HDF5_DIR} $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
else
- shift
( ${DEST_DIR}/bin/python2.7 setup.py build $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
fi
( ${DEST_DIR}/bin/python2.7 setup.py install 2>&1 ) 1>> ${LOG_FILE} || do_exit
diff -r 09788fca82db4bfa79c378c8aa0ac5f73357df7e -r 25579116aeb03211563d66beed83473a32865e3e yt/analysis_modules/halo_finding/setup.py
--- a/yt/analysis_modules/halo_finding/setup.py
+++ b/yt/analysis_modules/halo_finding/setup.py
@@ -1,9 +1,7 @@
#!/usr/bin/env python
-import setuptools
-import os
-import sys
import os.path
+
def configuration(parent_package='', top_path=None):
from numpy.distutils.misc_util import Configuration
config = Configuration('halo_finding', parent_package, top_path)
@@ -12,6 +10,5 @@
config.add_subpackage("parallel_hop")
if os.path.exists("rockstar.cfg"):
config.add_subpackage("rockstar")
- config.make_config_py() # installs __config__.py
- #config.make_svn_version_py()
+ config.make_config_py() # installs __config__.py
return config
diff -r 09788fca82db4bfa79c378c8aa0ac5f73357df7e -r 25579116aeb03211563d66beed83473a32865e3e yt/analysis_modules/setup.py
--- a/yt/analysis_modules/setup.py
+++ b/yt/analysis_modules/setup.py
@@ -1,12 +1,10 @@
#!/usr/bin/env python
-import setuptools
def configuration(parent_package='', top_path=None):
from numpy.distutils.misc_util import Configuration
config = Configuration('analysis_modules', parent_package, top_path)
config.make_config_py() # installs __config__.py
- #config.make_svn_version_py()
config.add_subpackage("absorption_spectrum")
config.add_subpackage("coordinate_transformation")
config.add_subpackage("cosmological_observation")
@@ -16,6 +14,8 @@
config.add_subpackage("halo_profiler")
config.add_subpackage("hierarchy_subset")
config.add_subpackage("level_sets")
+ config.add_subpackage("particle_trajectories")
+ config.add_subpackage("photon_simulator")
config.add_subpackage("radial_column_density")
config.add_subpackage("spectral_integrator")
config.add_subpackage("star_analysis")
@@ -23,6 +23,8 @@
config.add_subpackage("radmc3d_export")
config.add_subpackage("sunrise_export")
config.add_subpackage("sunyaev_zeldovich")
+ config.add_subpackage("sunrise_export")
+ config.add_subpackage("sunyaev_zeldovich")
config.add_subpackage("particle_trajectories")
config.add_subpackage("photon_simulator")
return config
diff -r 09788fca82db4bfa79c378c8aa0ac5f73357df7e -r 25579116aeb03211563d66beed83473a32865e3e yt/frontends/athena/data_structures.py
--- a/yt/frontends/athena/data_structures.py
+++ b/yt/frontends/athena/data_structures.py
@@ -349,6 +349,8 @@
if len(self.parameters) == 0:
self._parse_parameter_file()
self.conversion_factors = defaultdict(lambda: 1.0)
+ if "EOSType" not in self.parameters:
+ self.parameters["EOSType"] = -1
if self.specified_parameters.has_key("LengthUnits") :
self._setup_getunits_units()
else :
https://bitbucket.org/yt_analysis/yt/commits/a668ec2d99de/
Changeset: a668ec2d99de
Branch: yt
User: jzuhone
Date: 2014-02-17 03:23:45
Summary: Not sure how these got in twice
Affected #: 1 file
diff -r 25579116aeb03211563d66beed83473a32865e3e -r a668ec2d99dea731cef23f0ba128b84390b690d7 yt/analysis_modules/setup.py
--- a/yt/analysis_modules/setup.py
+++ b/yt/analysis_modules/setup.py
@@ -23,8 +23,6 @@
config.add_subpackage("radmc3d_export")
config.add_subpackage("sunrise_export")
config.add_subpackage("sunyaev_zeldovich")
- config.add_subpackage("sunrise_export")
- config.add_subpackage("sunyaev_zeldovich")
config.add_subpackage("particle_trajectories")
config.add_subpackage("photon_simulator")
return config
https://bitbucket.org/yt_analysis/yt/commits/9b0c40fcce46/
Changeset: 9b0c40fcce46
Branch: yt
User: jzuhone
Date: 2014-02-17 03:24:53
Summary: Fixing whitespace
Affected #: 1 file
diff -r a668ec2d99dea731cef23f0ba128b84390b690d7 -r 9b0c40fcce46260bc3375ea426e85d0b7803d323 yt/analysis_modules/setup.py
--- a/yt/analysis_modules/setup.py
+++ b/yt/analysis_modules/setup.py
@@ -22,7 +22,7 @@
config.add_subpackage("two_point_functions")
config.add_subpackage("radmc3d_export")
config.add_subpackage("sunrise_export")
- config.add_subpackage("sunyaev_zeldovich")
+ config.add_subpackage("sunyaev_zeldovich")
config.add_subpackage("particle_trajectories")
config.add_subpackage("photon_simulator")
return config
https://bitbucket.org/yt_analysis/yt/commits/54139e25bd2d/
Changeset: 54139e25bd2d
Branch: yt
User: brittonsmith
Date: 2014-02-17 11:56:23
Summary: Merged in jzuhone/yt-2.x (pull request #707)
Separate out imports in photon simulator
Affected #: 3 files
diff -r f9127d683a4358a69cd34dfeb1d65166bdc0c24a -r 54139e25bd2da4a8351d8cee785712b4e6bfc6be yt/analysis_modules/photon_simulator/spectral_models.py
--- a/yt/analysis_modules/photon_simulator/spectral_models.py
+++ b/yt/analysis_modules/photon_simulator/spectral_models.py
@@ -15,9 +15,18 @@
import os
from yt.funcs import *
import h5py
+
+try:
+ import xspec
+except ImportError:
+ pass
+
try:
import astropy.io.fits as pyfits
- import xspec
+except ImportError:
+ pass
+
+try:
from scipy.integrate import cumtrapz
from scipy import stats
except ImportError:
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list