[yt-svn] commit/yt: 4 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed May 7 11:48:32 PDT 2014
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/c38d5aba6be4/
Changeset: c38d5aba6be4
Branch: yt-3.0
User: ngoldbaum
Date: 2014-05-06 21:19:39
Summary: Fixing an issue with the ProfilePlot fractional keyword dropping units.
h/t to Chang-Goo Kim for reporting this on the mailing list.
Affected #: 1 file
diff -r 3d177b90d3d6e1ad2a0e5ff2ae362160c34f3f15 -r c38d5aba6be44098fac7ba06cc5984031a51615c yt/data_objects/profiles.py
--- a/yt/data_objects/profiles.py
+++ b/yt/data_objects/profiles.py
@@ -115,7 +115,7 @@
if fractional:
for field in fields:
- self.field_data[field] /= self.field_data[field].sum()
+ self.field_data[field] /= self.field_data[field].sum().v
def keys(self):
return self.field_data.keys()
@@ -1169,7 +1169,7 @@
obj.add_fields([field for field in fields])
for field in fields:
if fractional:
- obj.field_data[field] /= obj.field_data[field].sum()
+ obj.field_data[field] /= obj.field_data[field].sum().v
for axis, acc in enumerate(accumulation):
if not acc: continue
temp = obj.field_data[field]
https://bitbucket.org/yt_analysis/yt/commits/9b6ad4f2bad8/
Changeset: 9b6ad4f2bad8
Branch: yt-3.0
User: ngoldbaum
Date: 2014-05-06 23:53:23
Summary: Being more careful with labels and units for fractional profiles.
Affected #: 2 files
diff -r c38d5aba6be44098fac7ba06cc5984031a51615c -r 9b6ad4f2bad8d7e21a65eeb585943c22d6fd62f2 yt/data_objects/profiles.py
--- a/yt/data_objects/profiles.py
+++ b/yt/data_objects/profiles.py
@@ -115,7 +115,7 @@
if fractional:
for field in fields:
- self.field_data[field] /= self.field_data[field].sum().v
+ self.field_data[field] /= self.field_data[field].sum()
def keys(self):
return self.field_data.keys()
@@ -853,7 +853,10 @@
if fname is None:
raise KeyError(field)
else:
- return self.field_data[fname].in_units(self.field_units[fname])
+ if self.fractional:
+ return self.field_data[fname]
+ else:
+ return self.field_data[fname].in_units(self.field_units[fname])
def items(self):
return [(k,self[k]) for k in self.field_data.keys()]
@@ -1169,7 +1172,7 @@
obj.add_fields([field for field in fields])
for field in fields:
if fractional:
- obj.field_data[field] /= obj.field_data[field].sum().v
+ obj.field_data[field] /= obj.field_data[field].sum()
for axis, acc in enumerate(accumulation):
if not acc: continue
temp = obj.field_data[field]
diff -r c38d5aba6be44098fac7ba06cc5984031a51615c -r 9b6ad4f2bad8d7e21a65eeb585943c22d6fd62f2 yt/visualization/profile_plotter.py
--- a/yt/visualization/profile_plotter.py
+++ b/yt/visualization/profile_plotter.py
@@ -473,7 +473,7 @@
scales = {True: 'log', False: 'linear'}
return scales[x_log], scales[y_log]
- def _get_field_label(self, field, field_info, field_unit):
+ def _get_field_label(self, field, field_info, field_unit, fractional=False):
field_unit = field_unit.latex_representation()
field_name = field_info.display_name
if isinstance(field, tuple): field = field[1]
@@ -483,7 +483,9 @@
elif field_name.find('$') == -1:
field_name = field_name.replace(' ','\/')
field_name = r'$\rm{'+field_name+r'}$'
- if field_unit is None or field_unit == '':
+ if fractional:
+ label = field_name + r'$\rm{\/Probability\/Density}$'
+ elif field_unit is None or field_unit == '':
label = field_name
else:
label = field_name+r'$\/\/('+field_unit+r')$'
@@ -498,9 +500,10 @@
yfi = pf._get_field_info(*yf)
x_unit = profile.x.units
y_unit = profile.field_units[field_y]
+ fractional = profile.fractional
x_title = self.x_title or self._get_field_label(field_x, xfi, x_unit)
y_title = self.y_title.get(field_y, None) or \
- self._get_field_label(field_y, yfi, y_unit)
+ self._get_field_label(field_y, yfi, y_unit, fractional)
return (x_title, y_title)
@@ -623,13 +626,14 @@
x_unit = profile.x.units
y_unit = profile.y.units
z_unit = profile.field_units[field_z]
+ fractional = profile.fractional
x_title = self.x_title or self._get_field_label(field_x, xfi, x_unit)
y_title = self.y_title or self._get_field_label(field_y, yfi, y_unit)
z_title = self.z_title.get(field_z, None) or \
- self._get_field_label(field_z, zfi, z_unit)
+ self._get_field_label(field_z, zfi, z_unit, fractional)
return (x_title, y_title, z_title)
- def _get_field_label(self, field, field_info, field_unit):
+ def _get_field_label(self, field, field_info, field_unit, fractional=False):
field_unit = field_unit.latex_representation()
field_name = field_info.display_name
if isinstance(field, tuple): field = field[1]
@@ -639,7 +643,9 @@
elif field_name.find('$') == -1:
field_name = field_name.replace(' ','\/')
field_name = r'$\rm{'+field_name+r'}$'
- if field_unit is None or field_unit == '':
+ if fractional:
+ label = field_name + r'$\rm{\/Probability\/Density}$'
+ elif field_unit is None or field_unit is '':
label = field_name
else:
label = field_name+r'$\/\/('+field_unit+r')$'
https://bitbucket.org/yt_analysis/yt/commits/04da40d6a005/
Changeset: 04da40d6a005
Branch: yt-3.0
User: ngoldbaum
Date: 2014-05-07 00:21:11
Summary: ProfileND objects do not necessarily have a fractional attribute.
Affected #: 1 file
diff -r 9b6ad4f2bad8d7e21a65eeb585943c22d6fd62f2 -r 04da40d6a005dc7719ea2c0da0d809500125c521 yt/data_objects/profiles.py
--- a/yt/data_objects/profiles.py
+++ b/yt/data_objects/profiles.py
@@ -853,7 +853,7 @@
if fname is None:
raise KeyError(field)
else:
- if self.fractional:
+ if getattr(self, 'fractional', False):
return self.field_data[fname]
else:
return self.field_data[fname].in_units(self.field_units[fname])
https://bitbucket.org/yt_analysis/yt/commits/bf7a69e38a89/
Changeset: bf7a69e38a89
Branch: yt-3.0
User: MatthewTurk
Date: 2014-05-07 20:48:25
Summary: Merged in ngoldbaum/yt/yt-3.0 (pull request #881)
Fixing an issue with the ProfilePlot fractional keyword dropping units.
Affected #: 2 files
diff -r 759de9f2c46a3a76abad0e515660c3c4d614a68f -r bf7a69e38a890425e12e961bc09e9a534ec0113d yt/data_objects/profiles.py
--- a/yt/data_objects/profiles.py
+++ b/yt/data_objects/profiles.py
@@ -853,7 +853,10 @@
if fname is None:
raise KeyError(field)
else:
- return self.field_data[fname].in_units(self.field_units[fname])
+ if getattr(self, 'fractional', False):
+ return self.field_data[fname]
+ else:
+ return self.field_data[fname].in_units(self.field_units[fname])
def items(self):
return [(k,self[k]) for k in self.field_data.keys()]
diff -r 759de9f2c46a3a76abad0e515660c3c4d614a68f -r bf7a69e38a890425e12e961bc09e9a534ec0113d yt/visualization/profile_plotter.py
--- a/yt/visualization/profile_plotter.py
+++ b/yt/visualization/profile_plotter.py
@@ -473,7 +473,7 @@
scales = {True: 'log', False: 'linear'}
return scales[x_log], scales[y_log]
- def _get_field_label(self, field, field_info, field_unit):
+ def _get_field_label(self, field, field_info, field_unit, fractional=False):
field_unit = field_unit.latex_representation()
field_name = field_info.display_name
if isinstance(field, tuple): field = field[1]
@@ -483,7 +483,9 @@
elif field_name.find('$') == -1:
field_name = field_name.replace(' ','\/')
field_name = r'$\rm{'+field_name+r'}$'
- if field_unit is None or field_unit == '':
+ if fractional:
+ label = field_name + r'$\rm{\/Probability\/Density}$'
+ elif field_unit is None or field_unit == '':
label = field_name
else:
label = field_name+r'$\/\/('+field_unit+r')$'
@@ -498,9 +500,10 @@
yfi = pf._get_field_info(*yf)
x_unit = profile.x.units
y_unit = profile.field_units[field_y]
+ fractional = profile.fractional
x_title = self.x_title or self._get_field_label(field_x, xfi, x_unit)
y_title = self.y_title.get(field_y, None) or \
- self._get_field_label(field_y, yfi, y_unit)
+ self._get_field_label(field_y, yfi, y_unit, fractional)
return (x_title, y_title)
@@ -623,13 +626,14 @@
x_unit = profile.x.units
y_unit = profile.y.units
z_unit = profile.field_units[field_z]
+ fractional = profile.fractional
x_title = self.x_title or self._get_field_label(field_x, xfi, x_unit)
y_title = self.y_title or self._get_field_label(field_y, yfi, y_unit)
z_title = self.z_title.get(field_z, None) or \
- self._get_field_label(field_z, zfi, z_unit)
+ self._get_field_label(field_z, zfi, z_unit, fractional)
return (x_title, y_title, z_title)
- def _get_field_label(self, field, field_info, field_unit):
+ def _get_field_label(self, field, field_info, field_unit, fractional=False):
field_unit = field_unit.latex_representation()
field_name = field_info.display_name
if isinstance(field, tuple): field = field[1]
@@ -639,7 +643,9 @@
elif field_name.find('$') == -1:
field_name = field_name.replace(' ','\/')
field_name = r'$\rm{'+field_name+r'}$'
- if field_unit is None or field_unit == '':
+ if fractional:
+ label = field_name + r'$\rm{\/Probability\/Density}$'
+ elif field_unit is None or field_unit is '':
label = field_name
else:
label = field_name+r'$\/\/('+field_unit+r')$'
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