[yt-svn] commit/yt: 7 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue May 21 12:00:53 PDT 2013
7 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/8c9d81132480/
Changeset: 8c9d81132480
Branch: yt
User: ngoldbaum
Date: 2013-05-18 21:44:39
Summary: Adding 'km' as a valid registered unit when datasets are loaded.
Affected #: 4 files
diff -r a928d1c5ff2929339a3af07e0b8eb735c3c46bcd -r 8c9d8113248089c22cdfdc9b048fba0c8f7fcb3c yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -165,7 +165,7 @@
def get_smallest_appropriate_unit(self, v):
max_nu = 1e30
good_u = None
- for unit in ['mpc', 'kpc', 'pc', 'au', 'rsun', 'cm']:
+ for unit in ['mpc', 'kpc', 'pc', 'au', 'rsun', 'km', 'cm']:
vv = v*self[unit]
if vv < max_nu and vv > 1.0:
good_u = unit
diff -r a928d1c5ff2929339a3af07e0b8eb735c3c46bcd -r 8c9d8113248089c22cdfdc9b048fba0c8f7fcb3c yt/utilities/definitions.py
--- a/yt/utilities/definitions.py
+++ b/yt/utilities/definitions.py
@@ -27,8 +27,8 @@
from .physical_constants import \
mpc_per_mpc, kpc_per_mpc, pc_per_mpc, au_per_mpc, rsun_per_mpc, \
- miles_per_mpc, cm_per_mpc, sec_per_Gyr, sec_per_Myr, sec_per_year, \
- sec_per_day
+ miles_per_mpc, km_per_mpc, cm_per_mpc, sec_per_Gyr, sec_per_Myr, \
+ sec_per_year, sec_per_day
# The number of levels we expect to have at most
MAXLEVEL=48
@@ -55,6 +55,7 @@
'au' : au_per_mpc,
'rsun' : rsun_per_mpc,
'miles' : miles_per_mpc,
+ 'km' : km_per_mpc,
'cm' : cm_per_mpc}
# How many seconds are in each thing
diff -r a928d1c5ff2929339a3af07e0b8eb735c3c46bcd -r 8c9d8113248089c22cdfdc9b048fba0c8f7fcb3c yt/utilities/physical_constants.py
--- a/yt/utilities/physical_constants.py
+++ b/yt/utilities/physical_constants.py
@@ -40,6 +40,7 @@
mpc_per_au = 4.84813682e-12
mpc_per_rsun = 2.253962e-14
mpc_per_miles = 5.21552871e-20
+mpc_per_km = 3.24077929e-20
mpc_per_cm = 3.24077929e-25
kpc_per_cm = mpc_per_cm / mpc_per_kpc
km_per_pc = 1.3806504e13
@@ -54,6 +55,7 @@
au_per_mpc = 1.0 / mpc_per_au
rsun_per_mpc = 1.0 / mpc_per_rsun
miles_per_mpc = 1.0 / mpc_per_miles
+km_per_mpc = 1.0 / mpc_per_km
cm_per_mpc = 1.0 / mpc_per_cm
cm_per_kpc = 1.0 / kpc_per_cm
cm_per_km = 1.0 / km_per_cm
diff -r a928d1c5ff2929339a3af07e0b8eb735c3c46bcd -r 8c9d8113248089c22cdfdc9b048fba0c8f7fcb3c yt/visualization/plot_modifications.py
--- a/yt/visualization/plot_modifications.py
+++ b/yt/visualization/plot_modifications.py
@@ -472,7 +472,7 @@
def get_smallest_appropriate_unit(v, pf):
max_nu = 1e30
good_u = None
- for unit in ['mpc','kpc','pc','au','rsun','cm']:
+ for unit in ['mpc', 'kpc', 'pc', 'au', 'rsun', 'km', 'cm']:
vv = v*pf[unit]
if vv < max_nu and vv > 1.0:
good_u = unit
https://bitbucket.org/yt_analysis/yt/commits/1d2b99f20936/
Changeset: 1d2b99f20936
Branch: yt
User: ngoldbaum
Date: 2013-05-18 21:46:12
Summary: Adding pretty formatting for some of the length units.
Affected #: 2 files
diff -r 8c9d8113248089c22cdfdc9b048fba0c8f7fcb3c -r 1d2b99f20936aa2f68f9b78014734695677c5042 yt/utilities/definitions.py
--- a/yt/utilities/definitions.py
+++ b/yt/utilities/definitions.py
@@ -58,6 +58,11 @@
'km' : km_per_mpc,
'cm' : cm_per_mpc}
+# Nicely formatted versions of common length units
+formatted_length_unit_names = {'mpc' : 'Mpc',
+ 'au' : 'AU',
+ 'rsun' : 'R_\odot'}
+
# How many seconds are in each thing
sec_conversion = {'Gyr' : sec_per_Gyr,
'Myr' : sec_per_Myr,
diff -r 8c9d8113248089c22cdfdc9b048fba0c8f7fcb3c -r 1d2b99f20936aa2f68f9b78014734695677c5042 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -60,8 +60,8 @@
from yt.utilities.definitions import \
x_dict, x_names, \
y_dict, y_names, \
- axis_names, \
- axis_labels
+ axis_names, axis_labels, \
+ formatted_length_unit_names
from yt.utilities.math_utils import \
ortho_find
from yt.utilities.parallel_tools.parallel_analysis_interface import \
@@ -891,6 +891,8 @@
axes_unit_labels = ['', '']
for i, un in enumerate((unit_x, unit_y)):
+ if un in formatted_length_unit_names:
+ un = formatted_length_unit_names[un]
if un not in ['1', 'u', 'unitary']:
axes_unit_labels[i] = '\/\/('+un+')'
https://bitbucket.org/yt_analysis/yt/commits/d09130929d0f/
Changeset: d09130929d0f
Branch: yt
User: ngoldbaum
Date: 2013-05-18 21:47:00
Summary: Reworking colorbars a bit.
This prevents huge colorbar lick labels when using a linear colorbar.
Affected #: 3 files
diff -r 1d2b99f20936aa2f68f9b78014734695677c5042 -r d09130929d0f870b0e1ea6981c0e84befcbfeab0 yt/visualization/base_plot_types.py
--- a/yt/visualization/base_plot_types.py
+++ b/yt/visualization/base_plot_types.py
@@ -82,3 +82,4 @@
self.image = self.axes.imshow(data, origin='lower', extent=extent,
norm=norm, vmin=self.zmin, aspect=aspect,
vmax=self.zmax, cmap=cmap)
+ self.cb = self.figure.colorbar(self.image, self.cax)
diff -r 1d2b99f20936aa2f68f9b78014734695677c5042 -r d09130929d0f870b0e1ea6981c0e84befcbfeab0 yt/visualization/fixed_resolution.py
--- a/yt/visualization/fixed_resolution.py
+++ b/yt/visualization/fixed_resolution.py
@@ -172,7 +172,7 @@
info['label'] = self.data_source.pf.field_info[item].display_name
if info['label'] is None:
- info['label'] = r'$\rm{'+item+r'}$'
+ info['label'] = r'$\rm{'+item.replace('_','\/')+r'}$'
elif info['label'].find('$') == -1:
info['label'] = info['label'].replace(' ','\/')
info['label'] = r'$\rm{'+info['label']+r'}$'
diff -r 1d2b99f20936aa2f68f9b78014734695677c5042 -r d09130929d0f870b0e1ea6981c0e84befcbfeab0 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -7,7 +7,7 @@
Affiliation: UCSC Astronomy
Homepage: http://yt-project.org/
License:
- Copyright (C) 2010-2011 J. S. Oishi. All Rights Reserved.
+ Copyright (C) 2010-2013 J. S. Oishi., Nathan Goldbaum All Rights Reserved.
This file is part of yt.
@@ -886,9 +886,6 @@
self._colormaps[f], extent, aspect,
zlim, size, fp.get_size())
- self.plots[f].cb = self.plots[f].figure.colorbar(
- self.plots[f].image, cax = self.plots[f].cax)
-
axes_unit_labels = ['', '']
for i, un in enumerate((unit_x, unit_y)):
if un in formatted_length_unit_names:
@@ -1760,6 +1757,10 @@
ImagePlotMPL.__init__(self, fsize, axrect, caxrect, zlim)
self._init_image(data, cbname, cmap, extent, aspect)
self.image.axes.ticklabel_format(scilimits=(-2,3))
+ if cbname == 'linear':
+ self.cb.formatter.set_scientific(True)
+ self.cb.formatter.set_powerlimits((-2,3))
+ self.cb.update_ticks()
def _get_best_layout(self, size, fontsize=18):
aspect = 1.0*size[0]/size[1]
https://bitbucket.org/yt_analysis/yt/commits/22b36ddde34f/
Changeset: 22b36ddde34f
Branch: yt
User: ngoldbaum
Date: 2013-05-18 22:02:23
Summary: Further prettifying default labels.
Affected #: 1 file
diff -r d09130929d0f870b0e1ea6981c0e84befcbfeab0 -r 22b36ddde34fced2b5d56b2b25a7e0803af840fa yt/visualization/fixed_resolution.py
--- a/yt/visualization/fixed_resolution.py
+++ b/yt/visualization/fixed_resolution.py
@@ -172,7 +172,7 @@
info['label'] = self.data_source.pf.field_info[item].display_name
if info['label'] is None:
- info['label'] = r'$\rm{'+item.replace('_','\/')+r'}$'
+ info['label'] = r'$\rm{'+item.replace('_','\/').title()+r'}$'
elif info['label'].find('$') == -1:
info['label'] = info['label'].replace(' ','\/')
info['label'] = r'$\rm{'+info['label']+r'}$'
https://bitbucket.org/yt_analysis/yt/commits/720a547224b8/
Changeset: 720a547224b8
Branch: yt
User: ngoldbaum
Date: 2013-05-19 02:05:57
Summary: Setting the font properties for the colorbar's offset text.
Affected #: 1 file
diff -r 22b36ddde34fced2b5d56b2b25a7e0803af840fa -r 720a547224b8f0a587514ce0bc7d78a524a38043 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -919,7 +919,10 @@
self.plots[f].cb.set_label(colorbar_label, fontproperties=fp)
- for label in self.plots[f].cb.ax.get_yticklabels():
+ for label in (self.plots[f].cb.ax.get_xticklabels() +
+ self.plots[f].cb.ax.get_yticklabels() +
+ [self.plots[f].cb.ax.axes.xaxis.get_offset_text(),
+ self.plots[f].cb.ax.axes.yaxis.get_offset_text()]):
label.set_fontproperties(fp)
self.run_callbacks(f)
https://bitbucket.org/yt_analysis/yt/commits/0645ed7b016a/
Changeset: 0645ed7b016a
Branch: yt
User: ngoldbaum
Date: 2013-05-19 09:16:46
Summary: Testing comparison functions need to assert something.
This means that the plot window answer tests haven't been running correctly :/
Affected #: 1 file
diff -r 720a547224b8f0a587514ce0bc7d78a524a38043 -r 0645ed7b016aac6187249afbb326907e3ee0576e yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -613,7 +613,7 @@
fns = ['old.png', 'new.png']
mpimg.imsave(fns[0], np.loads(zlib.decompress(old_result[0])))
mpimg.imsave(fns[1], np.loads(zlib.decompress(new_result[0])))
- compare_images(fns[0], fns[1], 10**(-self.decimals))
+ assert compare_images(fns[0], fns[1], 10**(-self.decimals)) == None
for fn in fns: os.remove(fn)
def requires_pf(pf_fn, big_data = False):
https://bitbucket.org/yt_analysis/yt/commits/508e6bd26c88/
Changeset: 508e6bd26c88
Branch: yt
User: MatthewTurk
Date: 2013-05-21 21:00:33
Summary: Merged in ngoldbaum/yt (pull request #504)
Fixes for unit handling and plotting.
Affected #: 8 files
diff -r 49b7b6f20d70ffaaf0d0c5e33fac2d63cc7eb489 -r 508e6bd26c885ed74fe3279f5a40dcb77ca95b49 yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -165,7 +165,7 @@
def get_smallest_appropriate_unit(self, v):
max_nu = 1e30
good_u = None
- for unit in ['mpc', 'kpc', 'pc', 'au', 'rsun', 'cm']:
+ for unit in ['mpc', 'kpc', 'pc', 'au', 'rsun', 'km', 'cm']:
vv = v*self[unit]
if vv < max_nu and vv > 1.0:
good_u = unit
diff -r 49b7b6f20d70ffaaf0d0c5e33fac2d63cc7eb489 -r 508e6bd26c885ed74fe3279f5a40dcb77ca95b49 yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -613,7 +613,7 @@
fns = ['old.png', 'new.png']
mpimg.imsave(fns[0], np.loads(zlib.decompress(old_result[0])))
mpimg.imsave(fns[1], np.loads(zlib.decompress(new_result[0])))
- compare_images(fns[0], fns[1], 10**(-self.decimals))
+ assert compare_images(fns[0], fns[1], 10**(-self.decimals)) == None
for fn in fns: os.remove(fn)
def requires_pf(pf_fn, big_data = False):
diff -r 49b7b6f20d70ffaaf0d0c5e33fac2d63cc7eb489 -r 508e6bd26c885ed74fe3279f5a40dcb77ca95b49 yt/utilities/definitions.py
--- a/yt/utilities/definitions.py
+++ b/yt/utilities/definitions.py
@@ -27,8 +27,8 @@
from .physical_constants import \
mpc_per_mpc, kpc_per_mpc, pc_per_mpc, au_per_mpc, rsun_per_mpc, \
- miles_per_mpc, cm_per_mpc, sec_per_Gyr, sec_per_Myr, sec_per_year, \
- sec_per_day
+ miles_per_mpc, km_per_mpc, cm_per_mpc, sec_per_Gyr, sec_per_Myr, \
+ sec_per_year, sec_per_day
# The number of levels we expect to have at most
MAXLEVEL=48
@@ -55,8 +55,14 @@
'au' : au_per_mpc,
'rsun' : rsun_per_mpc,
'miles' : miles_per_mpc,
+ 'km' : km_per_mpc,
'cm' : cm_per_mpc}
+# Nicely formatted versions of common length units
+formatted_length_unit_names = {'mpc' : 'Mpc',
+ 'au' : 'AU',
+ 'rsun' : 'R_\odot'}
+
# How many seconds are in each thing
sec_conversion = {'Gyr' : sec_per_Gyr,
'Myr' : sec_per_Myr,
diff -r 49b7b6f20d70ffaaf0d0c5e33fac2d63cc7eb489 -r 508e6bd26c885ed74fe3279f5a40dcb77ca95b49 yt/utilities/physical_constants.py
--- a/yt/utilities/physical_constants.py
+++ b/yt/utilities/physical_constants.py
@@ -40,6 +40,7 @@
mpc_per_au = 4.84813682e-12
mpc_per_rsun = 2.253962e-14
mpc_per_miles = 5.21552871e-20
+mpc_per_km = 3.24077929e-20
mpc_per_cm = 3.24077929e-25
kpc_per_cm = mpc_per_cm / mpc_per_kpc
km_per_pc = 1.3806504e13
@@ -54,6 +55,7 @@
au_per_mpc = 1.0 / mpc_per_au
rsun_per_mpc = 1.0 / mpc_per_rsun
miles_per_mpc = 1.0 / mpc_per_miles
+km_per_mpc = 1.0 / mpc_per_km
cm_per_mpc = 1.0 / mpc_per_cm
cm_per_kpc = 1.0 / kpc_per_cm
cm_per_km = 1.0 / km_per_cm
diff -r 49b7b6f20d70ffaaf0d0c5e33fac2d63cc7eb489 -r 508e6bd26c885ed74fe3279f5a40dcb77ca95b49 yt/visualization/base_plot_types.py
--- a/yt/visualization/base_plot_types.py
+++ b/yt/visualization/base_plot_types.py
@@ -82,3 +82,4 @@
self.image = self.axes.imshow(data, origin='lower', extent=extent,
norm=norm, vmin=self.zmin, aspect=aspect,
vmax=self.zmax, cmap=cmap)
+ self.cb = self.figure.colorbar(self.image, self.cax)
diff -r 49b7b6f20d70ffaaf0d0c5e33fac2d63cc7eb489 -r 508e6bd26c885ed74fe3279f5a40dcb77ca95b49 yt/visualization/fixed_resolution.py
--- a/yt/visualization/fixed_resolution.py
+++ b/yt/visualization/fixed_resolution.py
@@ -172,7 +172,7 @@
info['label'] = self.data_source.pf.field_info[item].display_name
if info['label'] is None:
- info['label'] = r'$\rm{'+item+r'}$'
+ info['label'] = r'$\rm{'+item.replace('_','\/').title()+r'}$'
elif info['label'].find('$') == -1:
info['label'] = info['label'].replace(' ','\/')
info['label'] = r'$\rm{'+info['label']+r'}$'
diff -r 49b7b6f20d70ffaaf0d0c5e33fac2d63cc7eb489 -r 508e6bd26c885ed74fe3279f5a40dcb77ca95b49 yt/visualization/plot_modifications.py
--- a/yt/visualization/plot_modifications.py
+++ b/yt/visualization/plot_modifications.py
@@ -472,7 +472,7 @@
def get_smallest_appropriate_unit(v, pf):
max_nu = 1e30
good_u = None
- for unit in ['mpc','kpc','pc','au','rsun','cm']:
+ for unit in ['mpc', 'kpc', 'pc', 'au', 'rsun', 'km', 'cm']:
vv = v*pf[unit]
if vv < max_nu and vv > 1.0:
good_u = unit
diff -r 49b7b6f20d70ffaaf0d0c5e33fac2d63cc7eb489 -r 508e6bd26c885ed74fe3279f5a40dcb77ca95b49 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -7,7 +7,7 @@
Affiliation: UCSC Astronomy
Homepage: http://yt-project.org/
License:
- Copyright (C) 2010-2011 J. S. Oishi. All Rights Reserved.
+ Copyright (C) 2010-2013 J. S. Oishi., Nathan Goldbaum All Rights Reserved.
This file is part of yt.
@@ -60,8 +60,8 @@
from yt.utilities.definitions import \
x_dict, x_names, \
y_dict, y_names, \
- axis_names, \
- axis_labels
+ axis_names, axis_labels, \
+ formatted_length_unit_names
from yt.utilities.math_utils import \
ortho_find
from yt.utilities.parallel_tools.parallel_analysis_interface import \
@@ -886,11 +886,10 @@
self._colormaps[f], extent, aspect,
zlim, size, fp.get_size())
- self.plots[f].cb = self.plots[f].figure.colorbar(
- self.plots[f].image, cax = self.plots[f].cax)
-
axes_unit_labels = ['', '']
for i, un in enumerate((unit_x, unit_y)):
+ if un in formatted_length_unit_names:
+ un = formatted_length_unit_names[un]
if un not in ['1', 'u', 'unitary']:
axes_unit_labels[i] = '\/\/('+un+')'
@@ -920,7 +919,10 @@
self.plots[f].cb.set_label(colorbar_label, fontproperties=fp)
- for label in self.plots[f].cb.ax.get_yticklabels():
+ for label in (self.plots[f].cb.ax.get_xticklabels() +
+ self.plots[f].cb.ax.get_yticklabels() +
+ [self.plots[f].cb.ax.axes.xaxis.get_offset_text(),
+ self.plots[f].cb.ax.axes.yaxis.get_offset_text()]):
label.set_fontproperties(fp)
self.run_callbacks(f)
@@ -1758,6 +1760,10 @@
ImagePlotMPL.__init__(self, fsize, axrect, caxrect, zlim)
self._init_image(data, cbname, cmap, extent, aspect)
self.image.axes.ticklabel_format(scilimits=(-2,3))
+ if cbname == 'linear':
+ self.cb.formatter.set_scientific(True)
+ self.cb.formatter.set_powerlimits((-2,3))
+ self.cb.update_ticks()
def _get_best_layout(self, size, fontsize=18):
aspect = 1.0*size[0]/size[1]
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