[yt-svn] commit/yt: 10 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Sep 23 12:14:02 PDT 2014
10 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/2737f3c369e1/
Changeset: 2737f3c369e1
Branch: yt
User: brittonsmith
Date: 2014-09-08 11:08:36+00:00
Summary: Removing manual addition of units to profile data as it's no longer needed.
Affected #: 1 file
diff -r c8042b5d05d064f8e5c38f03dd58a680a52036f3 -r 2737f3c369e12fde2449430f402a36bde9cc551b yt/analysis_modules/halo_analysis/halo_callbacks.py
--- a/yt/analysis_modules/halo_analysis/halo_callbacks.py
+++ b/yt/analysis_modules/halo_analysis/halo_callbacks.py
@@ -218,11 +218,6 @@
weight_field=weight_field)
my_profile.add_fields(ensure_list(y_fields))
- # temporary fix since profiles do not have units at the moment
- for field in my_profile.field_data:
- my_profile.field_data[field] = dds.arr(my_profile[field],
- dds.field_info[field].units)
-
# accumulate, if necessary
if accumulation:
used = my_profile.used
https://bitbucket.org/yt_analysis/yt/commits/ec0e66ec4ea0/
Changeset: ec0e66ec4ea0
Branch: yt
User: brittonsmith
Date: 2014-09-08 14:47:48+00:00
Summary: Generalizing profile callback to 1, 2, or 3D using create_profile and adding support for keeping and saving profile variance.
Affected #: 1 file
diff -r 2737f3c369e12fde2449430f402a36bde9cc551b -r ec0e66ec4ea02eff4fb625df65369993e0611994 yt/analysis_modules/halo_analysis/halo_callbacks.py
--- a/yt/analysis_modules/halo_analysis/halo_callbacks.py
+++ b/yt/analysis_modules/halo_analysis/halo_callbacks.py
@@ -18,7 +18,7 @@
import os
from yt.data_objects.profiles import \
- Profile1D
+ create_profile
from yt.units.yt_array import \
YTArray, YTQuantity
from yt.utilities.exceptions import \
@@ -148,11 +148,11 @@
add_callback("sphere_bulk_velocity", sphere_bulk_velocity)
-def profile(halo, x_field, y_fields, x_bins=32, x_range=None, x_log=True,
- weight_field="cell_mass", accumulation=False, storage="profiles",
- output_dir="."):
+def profile(halo, bin_fields, profile_fields, n_bins=32, extrema=None, logs=None,
+ weight_field="cell_mass", accumulation=False, fractional=False,
+ storage="profiles", output_dir="."):
r"""
- Create 1d profiles.
+ Create 1, 2, or 3D profiles of a halo.
Store profile data in a dictionary associated with the halo object.
@@ -160,26 +160,37 @@
----------
halo : Halo object
The Halo object to be provided by the HaloCatalog.
- x_field : string
- The binning field for the profile.
- y_fields : string or list of strings
+ bin_fields : list of strings
+ The binning fields for the profile.
+ profile_fields : string or list of strings
The fields to be propython
filed.
- x_bins : int
- The number of bins in the profile.
- Default: 32
- x_range : (float, float)
- The range of the x_field. If None, the extrema are used.
- Default: None
- x_log : bool
- Flag for logarithmmic binning.
- Default: True
+ n_bins : int or list of ints
+ The number of bins in each dimension. If None, 32 bins for
+ each bin are used for each bin field.
+ Default: 32.
+ extrema : dict of min, max tuples
+ Minimum and maximum values of the bin_fields for the profiles.
+ The keys correspond to the field names. Defaults to the extrema
+ of the bin_fields of the dataset. If a units dict is provided, extrema
+ are understood to be in the units specified in the dictionary.
+ logs : dict of boolean values
+ Whether or not to log the bin_fields for the profiles.
+ The keys correspond to the field names. Defaults to the take_log
+ attribute of the field.
weight_field : string
Weight field for profiling.
Default : "cell_mass"
- accumulation : bool
- If True, profile data is a cumulative sum.
- Default : False
+ accumulation : bool or list of bools
+ If True, the profile values for a bin n are the cumulative sum of
+ all the values from bin 0 to n. If -True, the sum is reversed so
+ that the value for bin n is the cumulative sum from bin N (total bins)
+ to n. If the profile is 2D or 3D, a list of values can be given to
+ control the summation in each dimension independently.
+ Default: False.
+ fractional : If True the profile values are divided by the sum of all
+ the profile data such that the profile represents a probability
+ distribution function.
storage : string
Name of the dictionary to store profiles.
Default: "profiles"
@@ -210,32 +221,18 @@
output_dir = storage
output_dir = os.path.join(halo.halo_catalog.output_dir, output_dir)
- if x_range is None:
- x_range = list(halo.data_object.quantities.extrema(x_field, non_zero=True))
-
- my_profile = Profile1D(halo.data_object, x_field, x_bins,
- x_range[0], x_range[1], x_log,
- weight_field=weight_field)
- my_profile.add_fields(ensure_list(y_fields))
-
- # accumulate, if necessary
- if accumulation:
- used = my_profile.used
- for field in my_profile.field_data:
- if weight_field is None:
- my_profile.field_data[field][used] = \
- np.cumsum(my_profile.field_data[field][used])
- else:
- my_weight = my_profile.weight
- my_profile.field_data[field][used] = \
- np.cumsum(my_profile.field_data[field][used] * my_weight[used]) / \
- np.cumsum(my_weight[used])
+ bin_fields = ensure_list(bin_fields)
+ my_profile = create_profile(halo.data_object, bin_fields, profile_fields, n_bins=n_bins,
+ extrema=extrema, logs=logs, weight_field=weight_field,
+ accumulation=accumulation, fractional=fractional)
- # create storage dictionary
prof_store = dict([(field, my_profile[field]) \
for field in my_profile.field_data])
prof_store[my_profile.x_field] = my_profile.x
-
+ if len(bin_fields) > 1:
+ prof_store[my_profile.y_field] = my_profile.y
+ if len(bin_fields) > 2:
+ prof_store[my_profile.z_field] = my_profile.z
if hasattr(halo, storage):
halo_store = getattr(halo, storage)
if "used" in halo_store:
@@ -245,6 +242,17 @@
setattr(halo, storage, halo_store)
halo_store.update(prof_store)
+ if hasattr(my_profile, "variance"):
+ variance_store = dict([(field, my_profile.variance[field]) \
+ for field in my_profile.variance])
+ variance_storage = "%s_variance" % storage
+ if hasattr(halo, variance_storage):
+ halo_variance_store = getattr(halo, variance_storage)
+ else:
+ halo_variance_store = {}
+ setattr(halo, variance_storage, halo_variance_store)
+ halo_variance_store.update(variance_store)
+
add_callback("profile", profile)
@parallel_root_only
@@ -289,11 +297,16 @@
# Don't write code units because we might not know those later.
if isinstance(my_profile[field], YTArray):
my_profile[field].convert_to_cgs()
- dataset = out_file.create_dataset(str(field), data=my_profile[field])
- units = ""
- if isinstance(my_profile[field], YTArray):
- units = str(my_profile[field].units)
- dataset.attrs["units"] = units
+ _yt_array_hdf5(out_file, str(field), my_profile[field])
+ variance_storage = "%s_variance" % storage
+ if hasattr(halo, variance_storage):
+ my_profile = getattr(halo, variance_storage)
+ variance_group = out_file.create_group("variance")
+ for field in my_profile:
+ # Don't write code units because we might not know those later.
+ if isinstance(my_profile[field], YTArray):
+ my_profile[field].convert_to_cgs()
+ _yt_array_hdf5(variance_group, str(field), my_profile[field])
out_file.close()
add_callback("save_profiles", save_profiles)
@@ -493,3 +506,10 @@
delattr(halo, attribute)
add_callback("delete_attribute", delete_attribute)
+
+def _yt_array_hdf5(fh, fieldname, data):
+ dataset = fh.create_dataset(fieldname, data=data)
+ units = ""
+ if isinstance(data, YTArray):
+ units = str(data.units)
+ dataset.attrs["units"] = units
https://bitbucket.org/yt_analysis/yt/commits/315db5ce0165/
Changeset: 315db5ce0165
Branch: yt
User: brittonsmith
Date: 2014-09-08 20:32:15+00:00
Summary: Moving profile output into a group.
Affected #: 1 file
diff -r ec0e66ec4ea02eff4fb625df65369993e0611994 -r 315db5ce01654245652962e6a0c1fa52a68c5687 yt/analysis_modules/halo_analysis/halo_callbacks.py
--- a/yt/analysis_modules/halo_analysis/halo_callbacks.py
+++ b/yt/analysis_modules/halo_analysis/halo_callbacks.py
@@ -293,11 +293,12 @@
out_file = h5py.File(output_file, "w")
my_profile = getattr(halo, storage)
+ profile_group = out_file.create_group("profiles")
for field in my_profile:
# Don't write code units because we might not know those later.
if isinstance(my_profile[field], YTArray):
my_profile[field].convert_to_cgs()
- _yt_array_hdf5(out_file, str(field), my_profile[field])
+ _yt_array_hdf5(profile_group, str(field), my_profile[field])
variance_storage = "%s_variance" % storage
if hasattr(halo, variance_storage):
my_profile = getattr(halo, variance_storage)
https://bitbucket.org/yt_analysis/yt/commits/782ef11a6bc7/
Changeset: 782ef11a6bc7
Branch: yt
User: brittonsmith
Date: 2014-09-08 21:06:22+00:00
Summary: Updating save profile callback.
Affected #: 1 file
diff -r 315db5ce01654245652962e6a0c1fa52a68c5687 -r 782ef11a6bc7b7917f48a42a3ddf676116b9d611 yt/analysis_modules/halo_analysis/halo_callbacks.py
--- a/yt/analysis_modules/halo_analysis/halo_callbacks.py
+++ b/yt/analysis_modules/halo_analysis/halo_callbacks.py
@@ -350,19 +350,32 @@
(halo.quantities["particle_identifier"], output_file))
out_file = h5py.File(output_file, "r")
+ if fields is None:
+ profile_fields = out_file["profiles"].keys()
+ else:
+ profile_fields = fields
my_profile = {}
- if fields is None:
- fields = out_file.keys()
- for field in fields:
- if field not in out_file:
+ my_group = out_file["profiles"]
+ for field in profile_fields:
+ if field not in my_group:
raise RuntimeError("%s field not present in %s." % (field, output_file))
- units = ""
- if "units" in out_file[field].attrs:
- units = out_file[field].attrs["units"]
- if units == "dimensionless": units = ""
- my_profile[field] = halo.halo_catalog.halos_ds.arr(out_file[field].value, units)
+ my_profile[field] = _hdf5_yt_array(my_group, field,
+ ds=halo.halo_catalog.halos_ds)
+ setattr(halo, storage, my_profile)
+
+ if "variance" in out_file:
+ my_variance = {}
+ my_group = out_file["variance"]
+ if fields is None:
+ profile_fields = my_group.keys()
+ for field in profile_fields:
+ if field not in my_group:
+ raise RuntimeError("%s field not present in %s." % (field, output_file))
+ my_variance[field] = _hdf5_yt_array(my_group, field,
+ ds=halo.halo_catalog.halos_ds)
+ setattr(halo, "%s_variance" % storage, my_variance)
+
out_file.close()
- setattr(halo, storage, my_profile)
add_callback("load_profiles", load_profiles)
@@ -514,3 +527,14 @@
if isinstance(data, YTArray):
units = str(data.units)
dataset.attrs["units"] = units
+
+def _hdf5_yt_array(fh, fieldname, ds=None):
+ if ds is None:
+ new_arr = YTArray
+ else:
+ new_arr = ds.arr
+ units = ""
+ if "units" in fh[fieldname].attrs:
+ units = fh[fieldname].attrs["units"]
+ if units == "dimensionless": units = ""
+ return new_arr(fh[fieldname].value, units)
https://bitbucket.org/yt_analysis/yt/commits/4e2251dd724f/
Changeset: 4e2251dd724f
Branch: yt
User: brittonsmith
Date: 2014-09-08 21:08:40+00:00
Summary: Changin a variable.
Affected #: 1 file
diff -r 782ef11a6bc7b7917f48a42a3ddf676116b9d611 -r 4e2251dd724f04974c2b5f0af6590580c121b636 yt/analysis_modules/halo_analysis/halo_callbacks.py
--- a/yt/analysis_modules/halo_analysis/halo_callbacks.py
+++ b/yt/analysis_modules/halo_analysis/halo_callbacks.py
@@ -291,9 +291,9 @@
mylog.info("Saving halo %d profile data to %s." %
(halo.quantities["particle_identifier"], output_file))
- out_file = h5py.File(output_file, "w")
+ fh = h5py.File(output_file, "w")
my_profile = getattr(halo, storage)
- profile_group = out_file.create_group("profiles")
+ profile_group = fh.create_group("profiles")
for field in my_profile:
# Don't write code units because we might not know those later.
if isinstance(my_profile[field], YTArray):
@@ -302,13 +302,13 @@
variance_storage = "%s_variance" % storage
if hasattr(halo, variance_storage):
my_profile = getattr(halo, variance_storage)
- variance_group = out_file.create_group("variance")
+ variance_group = fh.create_group("variance")
for field in my_profile:
# Don't write code units because we might not know those later.
if isinstance(my_profile[field], YTArray):
my_profile[field].convert_to_cgs()
_yt_array_hdf5(variance_group, str(field), my_profile[field])
- out_file.close()
+ fh.close()
add_callback("save_profiles", save_profiles)
@@ -349,13 +349,13 @@
mylog.info("Loading halo %d profile data from %s." %
(halo.quantities["particle_identifier"], output_file))
- out_file = h5py.File(output_file, "r")
+ fh = h5py.File(output_file, "r")
if fields is None:
- profile_fields = out_file["profiles"].keys()
+ profile_fields = fh["profiles"].keys()
else:
profile_fields = fields
my_profile = {}
- my_group = out_file["profiles"]
+ my_group = fh["profiles"]
for field in profile_fields:
if field not in my_group:
raise RuntimeError("%s field not present in %s." % (field, output_file))
@@ -363,9 +363,9 @@
ds=halo.halo_catalog.halos_ds)
setattr(halo, storage, my_profile)
- if "variance" in out_file:
+ if "variance" in fh:
my_variance = {}
- my_group = out_file["variance"]
+ my_group = fh["variance"]
if fields is None:
profile_fields = my_group.keys()
for field in profile_fields:
@@ -375,7 +375,7 @@
ds=halo.halo_catalog.halos_ds)
setattr(halo, "%s_variance" % storage, my_variance)
- out_file.close()
+ fh.close()
add_callback("load_profiles", load_profiles)
https://bitbucket.org/yt_analysis/yt/commits/7e756510a91a/
Changeset: 7e756510a91a
Branch: yt
User: brittonsmith
Date: 2014-09-12 14:50:26+00:00
Summary: Adding iterative_center_of_mass callback.
Affected #: 1 file
diff -r 4e2251dd724f04974c2b5f0af6590580c121b636 -r 7e756510a91a41caa4ec6c40e1e21895512fde3e yt/analysis_modules/halo_analysis/halo_callbacks.py
--- a/yt/analysis_modules/halo_analysis/halo_callbacks.py
+++ b/yt/analysis_modules/halo_analysis/halo_callbacks.py
@@ -521,6 +521,59 @@
add_callback("delete_attribute", delete_attribute)
+def iterative_center_of_mass(halo, radius_field="virial_radius", inner_ratio=0.1, step_ratio=0.9,
+ units="pc"):
+ r"""
+ Adjust halo position by iteratively recalculating the center of mass while
+ decreasing the radius.
+
+ Parameters
+ ----------
+ halo : Halo object
+ The Halo object to be provided by the HaloCatalog.
+ radius_field : string
+ The halo quantity to be used as the radius for the sphere.
+ Default: "virial_radius"
+ inner_ratio : float
+ The ratio of the smallest sphere radius used for calculating the center of
+ mass to the initial radius. The sphere radius is reduced and center of mass
+ recalculated until the sphere has reached this size.
+ Default: 0.1
+ step_ratio : float
+ The multiplicative factor used to reduce the radius of the sphere after the
+ center of mass is calculated.
+ Default: 0.9
+ units : str
+ The units for printing out the distance between the initial and final centers.
+ Default : "pc"
+
+ """
+ if inner_ratio <= 0.0 or inner_ratio >= 1.0:
+ raise RuntimeError("iterative_center_of_mass: inner_ratio must be between 0 and 1.")
+ if step_ratio <= 0.0 or step_ratio >= 1.0:
+ raise RuntimeError("iterative_center_of_mass: step_ratio must be between 0 and 1.")
+
+ center_orig = halo.halo_catalog.data_ds.arr([halo.quantities["particle_position_%s" % axis]
+ for axis in "xyz"])
+ sphere = halo.halo_catalog.data_ds.sphere(center_orig, halo.quantities[radius_field])
+
+ while sphere.radius > inner_ratio * halo.quantities[radius_field]:
+ new_center = sphere.quantities.center_of_mass(use_gas=True, use_particles=True)
+ sphere = sphere.ds.sphere(new_center, step_ratio * sphere.radius)
+
+ distance = periodic_distance(center_orig.in_units("code_length").to_ndarray(),
+ new_center.in_units("code_length").to_ndarray())
+ distance = halo.halo_catalog.data_ds.quan(distance, "code_length")
+ mylog.info("Recentering halo %d %f %s away." %
+ (halo.quantities["particle_identifier"],
+ distance.in_units(units), units))
+
+ for i, axis in enumerate("xyz"):
+ halo.quantities["particle_position_%s" % axis] = sphere.center[i]
+ del sphere
+
+add_callback("iterative_center_of_mass", iterative_center_of_mass)
+
def _yt_array_hdf5(fh, fieldname, data):
dataset = fh.create_dataset(fieldname, data=data)
units = ""
https://bitbucket.org/yt_analysis/yt/commits/6679b30a86c2/
Changeset: 6679b30a86c2
Branch: yt
User: brittonsmith
Date: 2014-09-15 15:15:19+00:00
Summary: Updating and ordering halo analysis reference docs.
Affected #: 1 file
diff -r 7e756510a91a41caa4ec6c40e1e21895512fde3e -r 6679b30a86c2f83d26178e37688caf035b7662a6 doc/source/reference/api/api.rst
--- a/doc/source/reference/api/api.rst
+++ b/doc/source/reference/api/api.rst
@@ -407,6 +407,8 @@
~yt.data_objects.profiles.Profile3D
~yt.data_objects.profiles.create_profile
+.. _halo_analysis_ref:
+
Halo Analysis
^^^^^^^^^^^^^
@@ -419,21 +421,22 @@
~yt.analysis_modules.halo_analysis.halo_catalog.HaloCatalog
~yt.analysis_modules.halo_analysis.halo_finding_methods.HaloFindingMethod
~yt.analysis_modules.halo_analysis.halo_callbacks.HaloCallback
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.delete_attribute
~yt.analysis_modules.halo_analysis.halo_callbacks.halo_sphere
- ~yt.analysis_modules.halo_analysis.halo_callbacks.sphere_field_max_recenter
- ~yt.analysis_modules.halo_analysis.halo_callbacks.sphere_bulk_velocity
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.iterative_center_of_mass
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.load_profiles
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.phase_plot
~yt.analysis_modules.halo_analysis.halo_callbacks.profile
~yt.analysis_modules.halo_analysis.halo_callbacks.save_profiles
- ~yt.analysis_modules.halo_analysis.halo_callbacks.load_profiles
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.sphere_bulk_velocity
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.sphere_field_max_recenter
~yt.analysis_modules.halo_analysis.halo_callbacks.virial_quantities
- ~yt.analysis_modules.halo_analysis.halo_callbacks.phase_plot
- ~yt.analysis_modules.halo_analysis.halo_callbacks.delete_attribute
~yt.analysis_modules.halo_analysis.halo_filters.HaloFilter
+ ~yt.analysis_modules.halo_analysis.halo_filters.not_subhalo
~yt.analysis_modules.halo_analysis.halo_filters.quantity_value
- ~yt.analysis_modules.halo_analysis.halo_filters.not_subhalo
~yt.analysis_modules.halo_analysis.halo_quantities.HaloQuantity
+ ~yt.analysis_modules.halo_analysis.halo_quantities.bulk_velocity
~yt.analysis_modules.halo_analysis.halo_quantities.center_of_mass
- ~yt.analysis_modules.halo_analysis.halo_quantities.bulk_velocity
Halo Finding
^^^^^^^^^^^^
https://bitbucket.org/yt_analysis/yt/commits/abca359ff3b9/
Changeset: abca359ff3b9
Branch: yt
User: brittonsmith
Date: 2014-09-15 15:35:21+00:00
Summary: Updating docs and recipe.
Affected #: 2 files
diff -r 6679b30a86c2f83d26178e37688caf035b7662a6 -r abca359ff3b919f7855bafbcdec0a4d2ad2e1f55 doc/source/analyzing/analysis_modules/halo_catalogs.rst
--- a/doc/source/analyzing/analysis_modules/halo_catalogs.rst
+++ b/doc/source/analyzing/analysis_modules/halo_catalogs.rst
@@ -72,6 +72,8 @@
* Quantities
* Callbacks
+A list of all available filters, quantities, and callbacks can be found in
+:ref:`halo_analysis_ref`.
All interaction with this analysis can be performed by importing from
halo_analysis.
@@ -161,6 +163,18 @@
# ... Later on in your script
hc.add_quantity("my_quantity")
+This quantity will then be accessible for functions called later via the
+*quantities* dictionary that is associated with the halo object.
+
+.. code-block:: python
+
+ def my_new_function(halo):
+ print halo.quantities["my_quantity"]
+ add_callback("print_quantity", my_new_function)
+
+ # ... Anywhere after "my_quantity" has been called
+ hc.add_callback("print_quantity")
+
Callbacks
^^^^^^^^^
@@ -178,10 +192,10 @@
hc.add_callback("sphere", factor=2.0)
Currently available callbacks are located in
-``yt/analysis_modules/halo_analysis/halo_callbacks.py``. New callbacks may
+``yt/analysis_modules/halo_analysis/halo_callbacks.py``. New callbacks may
be added by using the syntax shown below. If you think that your
callback may be of use to the general community, add it to
-halo_callbacks.py and issue a pull request
+halo_callbacks.py and issue a pull request.
An example of defining your own callback:
diff -r 6679b30a86c2f83d26178e37688caf035b7662a6 -r abca359ff3b919f7855bafbcdec0a4d2ad2e1f55 doc/source/cookbook/halo_profiler.py
--- a/doc/source/cookbook/halo_profiler.py
+++ b/doc/source/cookbook/halo_profiler.py
@@ -18,21 +18,22 @@
# use the sphere to calculate radial profiles of gas density
# weighted by cell volume in terms of the virial radius
-hc.add_callback("profile", x_field="radius",
- y_fields=[("gas", "overdensity")],
+hc.add_callback("profile", [("index", "radius")],
+ [("gas", "overdensity")],
weight_field="cell_volume",
accumulation=False,
storage="virial_quantities_profiles")
-hc.add_callback("virial_quantities", ["radius"],
+hc.add_callback("virial_quantities", [("index", "radius")],
profile_storage="virial_quantities_profiles")
hc.add_callback('delete_attribute', 'virial_quantities_profiles')
field_params = dict(virial_radius=('quantity', 'radius_200'))
hc.add_callback('sphere', radius_field='radius_200', factor=5,
field_parameters=field_params)
-hc.add_callback('profile', 'virial_radius', [('gas', 'temperature')],
+hc.add_callback('profile', ['virial_radius'],
+ [('gas', 'temperature')],
storage='virial_profiles',
weight_field='cell_mass',
accumulation=False, output_dir='profiles')
https://bitbucket.org/yt_analysis/yt/commits/c7615301017b/
Changeset: c7615301017b
Branch: yt
User: brittonsmith
Date: 2014-09-19 11:31:49+00:00
Summary: Using _determine_fields in virial quantities callback to allow users to give the shortened field names.
Affected #: 2 files
diff -r abca359ff3b919f7855bafbcdec0a4d2ad2e1f55 -r c7615301017b0ed767801b8d8dd70069122ca48c doc/source/cookbook/halo_profiler.py
--- a/doc/source/cookbook/halo_profiler.py
+++ b/doc/source/cookbook/halo_profiler.py
@@ -18,14 +18,14 @@
# use the sphere to calculate radial profiles of gas density
# weighted by cell volume in terms of the virial radius
-hc.add_callback("profile", [("index", "radius")],
+hc.add_callback("profile", ["radius"],
[("gas", "overdensity")],
weight_field="cell_volume",
accumulation=False,
storage="virial_quantities_profiles")
-hc.add_callback("virial_quantities", [("index", "radius")],
+hc.add_callback("virial_quantities", ["radius"],
profile_storage="virial_quantities_profiles")
hc.add_callback('delete_attribute', 'virial_quantities_profiles')
diff -r abca359ff3b919f7855bafbcdec0a4d2ad2e1f55 -r c7615301017b0ed767801b8d8dd70069122ca48c yt/analysis_modules/halo_analysis/halo_callbacks.py
--- a/yt/analysis_modules/halo_analysis/halo_callbacks.py
+++ b/yt/analysis_modules/halo_analysis/halo_callbacks.py
@@ -405,6 +405,8 @@
halo.quantities["particle_identifier"])
fields = ensure_list(fields)
+ fields = [halo.halo_catalog.data_source._determine_fields(field)[0]
+ for field in fields]
dds = halo.halo_catalog.data_ds
profile_data = getattr(halo, profile_storage)
https://bitbucket.org/yt_analysis/yt/commits/c193ac5077d2/
Changeset: c193ac5077d2
Branch: yt
User: ngoldbaum
Date: 2014-09-23 19:13:53+00:00
Summary: Merged in brittonsmith/yt (pull request #1207)
[BREAKSAPI] Halo Profiling Updates
Affected #: 4 files
diff -r 030d707551f658a9af158a949356aad11c3a8988 -r c193ac5077d28b99051393659da11c0e74125b6d doc/source/analyzing/analysis_modules/halo_catalogs.rst
--- a/doc/source/analyzing/analysis_modules/halo_catalogs.rst
+++ b/doc/source/analyzing/analysis_modules/halo_catalogs.rst
@@ -72,6 +72,8 @@
* Quantities
* Callbacks
+A list of all available filters, quantities, and callbacks can be found in
+:ref:`halo_analysis_ref`.
All interaction with this analysis can be performed by importing from
halo_analysis.
@@ -161,6 +163,18 @@
# ... Later on in your script
hc.add_quantity("my_quantity")
+This quantity will then be accessible for functions called later via the
+*quantities* dictionary that is associated with the halo object.
+
+.. code-block:: python
+
+ def my_new_function(halo):
+ print halo.quantities["my_quantity"]
+ add_callback("print_quantity", my_new_function)
+
+ # ... Anywhere after "my_quantity" has been called
+ hc.add_callback("print_quantity")
+
Callbacks
^^^^^^^^^
@@ -178,10 +192,10 @@
hc.add_callback("sphere", factor=2.0)
Currently available callbacks are located in
-``yt/analysis_modules/halo_analysis/halo_callbacks.py``. New callbacks may
+``yt/analysis_modules/halo_analysis/halo_callbacks.py``. New callbacks may
be added by using the syntax shown below. If you think that your
callback may be of use to the general community, add it to
-halo_callbacks.py and issue a pull request
+halo_callbacks.py and issue a pull request.
An example of defining your own callback:
diff -r 030d707551f658a9af158a949356aad11c3a8988 -r c193ac5077d28b99051393659da11c0e74125b6d doc/source/cookbook/halo_profiler.py
--- a/doc/source/cookbook/halo_profiler.py
+++ b/doc/source/cookbook/halo_profiler.py
@@ -18,8 +18,8 @@
# use the sphere to calculate radial profiles of gas density
# weighted by cell volume in terms of the virial radius
-hc.add_callback("profile", x_field="radius",
- y_fields=[("gas", "overdensity")],
+hc.add_callback("profile", ["radius"],
+ [("gas", "overdensity")],
weight_field="cell_volume",
accumulation=False,
storage="virial_quantities_profiles")
@@ -32,7 +32,8 @@
field_params = dict(virial_radius=('quantity', 'radius_200'))
hc.add_callback('sphere', radius_field='radius_200', factor=5,
field_parameters=field_params)
-hc.add_callback('profile', 'virial_radius', [('gas', 'temperature')],
+hc.add_callback('profile', ['virial_radius'],
+ [('gas', 'temperature')],
storage='virial_profiles',
weight_field='cell_mass',
accumulation=False, output_dir='profiles')
diff -r 030d707551f658a9af158a949356aad11c3a8988 -r c193ac5077d28b99051393659da11c0e74125b6d doc/source/reference/api/api.rst
--- a/doc/source/reference/api/api.rst
+++ b/doc/source/reference/api/api.rst
@@ -407,6 +407,8 @@
~yt.data_objects.profiles.Profile3D
~yt.data_objects.profiles.create_profile
+.. _halo_analysis_ref:
+
Halo Analysis
^^^^^^^^^^^^^
@@ -419,21 +421,22 @@
~yt.analysis_modules.halo_analysis.halo_catalog.HaloCatalog
~yt.analysis_modules.halo_analysis.halo_finding_methods.HaloFindingMethod
~yt.analysis_modules.halo_analysis.halo_callbacks.HaloCallback
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.delete_attribute
~yt.analysis_modules.halo_analysis.halo_callbacks.halo_sphere
- ~yt.analysis_modules.halo_analysis.halo_callbacks.sphere_field_max_recenter
- ~yt.analysis_modules.halo_analysis.halo_callbacks.sphere_bulk_velocity
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.iterative_center_of_mass
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.load_profiles
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.phase_plot
~yt.analysis_modules.halo_analysis.halo_callbacks.profile
~yt.analysis_modules.halo_analysis.halo_callbacks.save_profiles
- ~yt.analysis_modules.halo_analysis.halo_callbacks.load_profiles
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.sphere_bulk_velocity
+ ~yt.analysis_modules.halo_analysis.halo_callbacks.sphere_field_max_recenter
~yt.analysis_modules.halo_analysis.halo_callbacks.virial_quantities
- ~yt.analysis_modules.halo_analysis.halo_callbacks.phase_plot
- ~yt.analysis_modules.halo_analysis.halo_callbacks.delete_attribute
~yt.analysis_modules.halo_analysis.halo_filters.HaloFilter
+ ~yt.analysis_modules.halo_analysis.halo_filters.not_subhalo
~yt.analysis_modules.halo_analysis.halo_filters.quantity_value
- ~yt.analysis_modules.halo_analysis.halo_filters.not_subhalo
~yt.analysis_modules.halo_analysis.halo_quantities.HaloQuantity
+ ~yt.analysis_modules.halo_analysis.halo_quantities.bulk_velocity
~yt.analysis_modules.halo_analysis.halo_quantities.center_of_mass
- ~yt.analysis_modules.halo_analysis.halo_quantities.bulk_velocity
Halo Finding
^^^^^^^^^^^^
diff -r 030d707551f658a9af158a949356aad11c3a8988 -r c193ac5077d28b99051393659da11c0e74125b6d yt/analysis_modules/halo_analysis/halo_callbacks.py
--- a/yt/analysis_modules/halo_analysis/halo_callbacks.py
+++ b/yt/analysis_modules/halo_analysis/halo_callbacks.py
@@ -18,7 +18,7 @@
import os
from yt.data_objects.profiles import \
- Profile1D
+ create_profile
from yt.units.yt_array import \
YTArray, YTQuantity
from yt.utilities.exceptions import \
@@ -147,11 +147,11 @@
add_callback("sphere_bulk_velocity", sphere_bulk_velocity)
-def profile(halo, x_field, y_fields, x_bins=32, x_range=None, x_log=True,
- weight_field="cell_mass", accumulation=False, storage="profiles",
- output_dir="."):
+def profile(halo, bin_fields, profile_fields, n_bins=32, extrema=None, logs=None,
+ weight_field="cell_mass", accumulation=False, fractional=False,
+ storage="profiles", output_dir="."):
r"""
- Create 1d profiles.
+ Create 1, 2, or 3D profiles of a halo.
Store profile data in a dictionary associated with the halo object.
@@ -159,26 +159,37 @@
----------
halo : Halo object
The Halo object to be provided by the HaloCatalog.
- x_field : string
- The binning field for the profile.
- y_fields : string or list of strings
+ bin_fields : list of strings
+ The binning fields for the profile.
+ profile_fields : string or list of strings
The fields to be propython
filed.
- x_bins : int
- The number of bins in the profile.
- Default: 32
- x_range : (float, float)
- The range of the x_field. If None, the extrema are used.
- Default: None
- x_log : bool
- Flag for logarithmmic binning.
- Default: True
+ n_bins : int or list of ints
+ The number of bins in each dimension. If None, 32 bins for
+ each bin are used for each bin field.
+ Default: 32.
+ extrema : dict of min, max tuples
+ Minimum and maximum values of the bin_fields for the profiles.
+ The keys correspond to the field names. Defaults to the extrema
+ of the bin_fields of the dataset. If a units dict is provided, extrema
+ are understood to be in the units specified in the dictionary.
+ logs : dict of boolean values
+ Whether or not to log the bin_fields for the profiles.
+ The keys correspond to the field names. Defaults to the take_log
+ attribute of the field.
weight_field : string
Weight field for profiling.
Default : "cell_mass"
- accumulation : bool
- If True, profile data is a cumulative sum.
- Default : False
+ accumulation : bool or list of bools
+ If True, the profile values for a bin n are the cumulative sum of
+ all the values from bin 0 to n. If -True, the sum is reversed so
+ that the value for bin n is the cumulative sum from bin N (total bins)
+ to n. If the profile is 2D or 3D, a list of values can be given to
+ control the summation in each dimension independently.
+ Default: False.
+ fractional : If True the profile values are divided by the sum of all
+ the profile data such that the profile represents a probability
+ distribution function.
storage : string
Name of the dictionary to store profiles.
Default: "profiles"
@@ -209,37 +220,18 @@
output_dir = storage
output_dir = os.path.join(halo.halo_catalog.output_dir, output_dir)
- if x_range is None:
- x_range = list(halo.data_object.quantities.extrema(x_field, non_zero=True))
-
- my_profile = Profile1D(halo.data_object, x_field, x_bins,
- x_range[0], x_range[1], x_log,
- weight_field=weight_field)
- my_profile.add_fields(ensure_list(y_fields))
-
- # temporary fix since profiles do not have units at the moment
- for field in my_profile.field_data:
- my_profile.field_data[field] = dds.arr(my_profile[field],
- dds.field_info[field].units)
-
- # accumulate, if necessary
- if accumulation:
- used = my_profile.used
- for field in my_profile.field_data:
- if weight_field is None:
- my_profile.field_data[field][used] = \
- np.cumsum(my_profile.field_data[field][used])
- else:
- my_weight = my_profile.weight
- my_profile.field_data[field][used] = \
- np.cumsum(my_profile.field_data[field][used] * my_weight[used]) / \
- np.cumsum(my_weight[used])
+ bin_fields = ensure_list(bin_fields)
+ my_profile = create_profile(halo.data_object, bin_fields, profile_fields, n_bins=n_bins,
+ extrema=extrema, logs=logs, weight_field=weight_field,
+ accumulation=accumulation, fractional=fractional)
- # create storage dictionary
prof_store = dict([(field, my_profile[field]) \
for field in my_profile.field_data])
prof_store[my_profile.x_field] = my_profile.x
-
+ if len(bin_fields) > 1:
+ prof_store[my_profile.y_field] = my_profile.y
+ if len(bin_fields) > 2:
+ prof_store[my_profile.z_field] = my_profile.z
if hasattr(halo, storage):
halo_store = getattr(halo, storage)
if "used" in halo_store:
@@ -249,6 +241,17 @@
setattr(halo, storage, halo_store)
halo_store.update(prof_store)
+ if hasattr(my_profile, "variance"):
+ variance_store = dict([(field, my_profile.variance[field]) \
+ for field in my_profile.variance])
+ variance_storage = "%s_variance" % storage
+ if hasattr(halo, variance_storage):
+ halo_variance_store = getattr(halo, variance_storage)
+ else:
+ halo_variance_store = {}
+ setattr(halo, variance_storage, halo_variance_store)
+ halo_variance_store.update(variance_store)
+
add_callback("profile", profile)
@parallel_root_only
@@ -287,18 +290,24 @@
mylog.info("Saving halo %d profile data to %s." %
(halo.quantities["particle_identifier"], output_file))
- out_file = h5py.File(output_file, "w")
+ fh = h5py.File(output_file, "w")
my_profile = getattr(halo, storage)
+ profile_group = fh.create_group("profiles")
for field in my_profile:
# Don't write code units because we might not know those later.
if isinstance(my_profile[field], YTArray):
my_profile[field].convert_to_cgs()
- dataset = out_file.create_dataset(str(field), data=my_profile[field])
- units = ""
- if isinstance(my_profile[field], YTArray):
- units = str(my_profile[field].units)
- dataset.attrs["units"] = units
- out_file.close()
+ _yt_array_hdf5(profile_group, str(field), my_profile[field])
+ variance_storage = "%s_variance" % storage
+ if hasattr(halo, variance_storage):
+ my_profile = getattr(halo, variance_storage)
+ variance_group = fh.create_group("variance")
+ for field in my_profile:
+ # Don't write code units because we might not know those later.
+ if isinstance(my_profile[field], YTArray):
+ my_profile[field].convert_to_cgs()
+ _yt_array_hdf5(variance_group, str(field), my_profile[field])
+ fh.close()
add_callback("save_profiles", save_profiles)
@@ -339,20 +348,33 @@
mylog.info("Loading halo %d profile data from %s." %
(halo.quantities["particle_identifier"], output_file))
- out_file = h5py.File(output_file, "r")
+ fh = h5py.File(output_file, "r")
+ if fields is None:
+ profile_fields = fh["profiles"].keys()
+ else:
+ profile_fields = fields
my_profile = {}
- if fields is None:
- fields = out_file.keys()
- for field in fields:
- if field not in out_file:
+ my_group = fh["profiles"]
+ for field in profile_fields:
+ if field not in my_group:
raise RuntimeError("%s field not present in %s." % (field, output_file))
- units = ""
- if "units" in out_file[field].attrs:
- units = out_file[field].attrs["units"]
- if units == "dimensionless": units = ""
- my_profile[field] = halo.halo_catalog.halos_ds.arr(out_file[field].value, units)
- out_file.close()
+ my_profile[field] = _hdf5_yt_array(my_group, field,
+ ds=halo.halo_catalog.halos_ds)
setattr(halo, storage, my_profile)
+
+ if "variance" in fh:
+ my_variance = {}
+ my_group = fh["variance"]
+ if fields is None:
+ profile_fields = my_group.keys()
+ for field in profile_fields:
+ if field not in my_group:
+ raise RuntimeError("%s field not present in %s." % (field, output_file))
+ my_variance[field] = _hdf5_yt_array(my_group, field,
+ ds=halo.halo_catalog.halos_ds)
+ setattr(halo, "%s_variance" % storage, my_variance)
+
+ fh.close()
add_callback("load_profiles", load_profiles)
@@ -382,6 +404,8 @@
halo.quantities["particle_identifier"])
fields = ensure_list(fields)
+ fields = [halo.halo_catalog.data_source._determine_fields(field)[0]
+ for field in fields]
dds = halo.halo_catalog.data_ds
profile_data = getattr(halo, profile_storage)
@@ -497,3 +521,74 @@
delattr(halo, attribute)
add_callback("delete_attribute", delete_attribute)
+
+def iterative_center_of_mass(halo, radius_field="virial_radius", inner_ratio=0.1, step_ratio=0.9,
+ units="pc"):
+ r"""
+ Adjust halo position by iteratively recalculating the center of mass while
+ decreasing the radius.
+
+ Parameters
+ ----------
+ halo : Halo object
+ The Halo object to be provided by the HaloCatalog.
+ radius_field : string
+ The halo quantity to be used as the radius for the sphere.
+ Default: "virial_radius"
+ inner_ratio : float
+ The ratio of the smallest sphere radius used for calculating the center of
+ mass to the initial radius. The sphere radius is reduced and center of mass
+ recalculated until the sphere has reached this size.
+ Default: 0.1
+ step_ratio : float
+ The multiplicative factor used to reduce the radius of the sphere after the
+ center of mass is calculated.
+ Default: 0.9
+ units : str
+ The units for printing out the distance between the initial and final centers.
+ Default : "pc"
+
+ """
+ if inner_ratio <= 0.0 or inner_ratio >= 1.0:
+ raise RuntimeError("iterative_center_of_mass: inner_ratio must be between 0 and 1.")
+ if step_ratio <= 0.0 or step_ratio >= 1.0:
+ raise RuntimeError("iterative_center_of_mass: step_ratio must be between 0 and 1.")
+
+ center_orig = halo.halo_catalog.data_ds.arr([halo.quantities["particle_position_%s" % axis]
+ for axis in "xyz"])
+ sphere = halo.halo_catalog.data_ds.sphere(center_orig, halo.quantities[radius_field])
+
+ while sphere.radius > inner_ratio * halo.quantities[radius_field]:
+ new_center = sphere.quantities.center_of_mass(use_gas=True, use_particles=True)
+ sphere = sphere.ds.sphere(new_center, step_ratio * sphere.radius)
+
+ distance = periodic_distance(center_orig.in_units("code_length").to_ndarray(),
+ new_center.in_units("code_length").to_ndarray())
+ distance = halo.halo_catalog.data_ds.quan(distance, "code_length")
+ mylog.info("Recentering halo %d %f %s away." %
+ (halo.quantities["particle_identifier"],
+ distance.in_units(units), units))
+
+ for i, axis in enumerate("xyz"):
+ halo.quantities["particle_position_%s" % axis] = sphere.center[i]
+ del sphere
+
+add_callback("iterative_center_of_mass", iterative_center_of_mass)
+
+def _yt_array_hdf5(fh, fieldname, data):
+ dataset = fh.create_dataset(fieldname, data=data)
+ units = ""
+ if isinstance(data, YTArray):
+ units = str(data.units)
+ dataset.attrs["units"] = units
+
+def _hdf5_yt_array(fh, fieldname, ds=None):
+ if ds is None:
+ new_arr = YTArray
+ else:
+ new_arr = ds.arr
+ units = ""
+ if "units" in fh[fieldname].attrs:
+ units = fh[fieldname].attrs["units"]
+ if units == "dimensionless": units = ""
+ return new_arr(fh[fieldname].value, units)
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