[yt-svn] commit/yt: 5 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Dec 9 11:12:58 PST 2014
5 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/2202b08a0a45/
Changeset: 2202b08a0a45
Branch: yt
User: brittonsmith
Date: 2014-12-09 11:41:15+00:00
Summary: Making sure to check the right dataset for determining fields and using explicit field name for particle id.
Affected #: 1 file
diff -r c49dbb18e2f0cbc1357be61e77a1757bf4aa47d2 -r 2202b08a0a454aa82ed82c45ff1067ab16ac4804 yt/analysis_modules/halo_analysis/halo_catalog.py
--- a/yt/analysis_modules/halo_analysis/halo_catalog.py
+++ b/yt/analysis_modules/halo_analysis/halo_catalog.py
@@ -376,7 +376,7 @@
# Add all of the default quantities that all halos must have
self.add_default_quantities('all')
- my_index = np.argsort(self.data_source["particle_identifier"])
+ my_index = np.argsort(self.data_source["halos", "particle_identifier"])
for i in parallel_objects(my_index, njobs=njobs, dynamic=dynamic):
new_halo = Halo(self)
halo_filter = True
https://bitbucket.org/yt_analysis/yt/commits/da00718ab49c/
Changeset: da00718ab49c
Branch: yt
User: brittonsmith
Date: 2014-12-09 11:44:36+00:00
Summary: Updating ipython halo analysis recipe.
Affected #: 1 file
diff -r 2202b08a0a454aa82ed82c45ff1067ab16ac4804 -r da00718ab49c65795372efec0491ad7b20f27c17 doc/source/cookbook/Halo_Analysis.ipynb
--- a/doc/source/cookbook/Halo_Analysis.ipynb
+++ b/doc/source/cookbook/Halo_Analysis.ipynb
@@ -1,7 +1,7 @@
{
"metadata": {
"name": "",
- "signature": "sha256:083fded18194cc4b6d9ebf6d04e24a7f1d90cf57831ff0155e99868c0ace73b7"
+ "signature": "sha256:cb4a8114d92def67d5f948ec8326e8af0b20a5340dc8fd54d8d583e9c646886e"
},
"nbformat": 3,
"nbformat_minor": 0,
@@ -226,7 +226,7 @@
"cell_type": "code",
"collapsed": false,
"input": [
- "hc.add_callback('profile', 'virial_radius', [('gas','temperature')],\n",
+ "hc.add_callback('profile', 'virial_radius_fraction', [('gas','temperature')],\n",
" storage='virial_profiles',\n",
" weight_field='cell_mass', \n",
" accumulation=False, output_dir='profiles')\n"
@@ -368,7 +368,7 @@
"input": [
"halo = hc_reloaded.halo_list[0]\n",
"\n",
- "radius = halo.virial_profiles['virial_radius']\n",
+ "radius = halo.virial_profiles[u\"('index', 'virial_radius_fraction')\"]\n",
"temperature = halo.virial_profiles[u\"('gas', 'temperature')\"]\n",
"\n",
"# Remove output files, that are no longer needed\n",
https://bitbucket.org/yt_analysis/yt/commits/afc81a1676ba/
Changeset: afc81a1676ba
Branch: yt
User: brittonsmith
Date: 2014-12-09 12:37:05+00:00
Summary: Making sure to call determine fields on the right data container.
Affected #: 1 file
diff -r da00718ab49c65795372efec0491ad7b20f27c17 -r afc81a1676ba40d093ca618a6ec2519b2d24538a 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
@@ -404,7 +404,7 @@
halo.quantities["particle_identifier"])
fields = ensure_list(fields)
- fields = [halo.halo_catalog.data_source._determine_fields(field)[0]
+ fields = [halo.data_object._determine_fields(field)[0]
for field in fields]
dds = halo.halo_catalog.data_ds
https://bitbucket.org/yt_analysis/yt/commits/0302b3f46b56/
Changeset: 0302b3f46b56
Branch: yt
User: brittonsmith
Date: 2014-12-09 13:51:22+00:00
Summary: Not all particle data has the halos type.
Affected #: 1 file
diff -r afc81a1676ba40d093ca618a6ec2519b2d24538a -r 0302b3f46b56d956959f354a9879918346ee071b yt/analysis_modules/halo_analysis/halo_catalog.py
--- a/yt/analysis_modules/halo_analysis/halo_catalog.py
+++ b/yt/analysis_modules/halo_analysis/halo_catalog.py
@@ -376,7 +376,7 @@
# Add all of the default quantities that all halos must have
self.add_default_quantities('all')
- my_index = np.argsort(self.data_source["halos", "particle_identifier"])
+ my_index = np.argsort(self.data_source["all", "particle_identifier"])
for i in parallel_objects(my_index, njobs=njobs, dynamic=dynamic):
new_halo = Halo(self)
halo_filter = True
https://bitbucket.org/yt_analysis/yt/commits/8b8a5a4348f0/
Changeset: 8b8a5a4348f0
Branch: yt
User: xarthisius
Date: 2014-12-09 19:12:51+00:00
Summary: Merged in brittonsmith/yt (pull request #1349)
Fixing some halo_analysis-related issues (closes Issue #949)
Affected #: 3 files
diff -r 9799455919d22c5c6d6168287bb69439a9fd1962 -r 8b8a5a4348f0918536c019ab2bb04bd420fd54ca doc/source/cookbook/Halo_Analysis.ipynb
--- a/doc/source/cookbook/Halo_Analysis.ipynb
+++ b/doc/source/cookbook/Halo_Analysis.ipynb
@@ -1,7 +1,7 @@
{
"metadata": {
"name": "",
- "signature": "sha256:083fded18194cc4b6d9ebf6d04e24a7f1d90cf57831ff0155e99868c0ace73b7"
+ "signature": "sha256:cb4a8114d92def67d5f948ec8326e8af0b20a5340dc8fd54d8d583e9c646886e"
},
"nbformat": 3,
"nbformat_minor": 0,
@@ -226,7 +226,7 @@
"cell_type": "code",
"collapsed": false,
"input": [
- "hc.add_callback('profile', 'virial_radius', [('gas','temperature')],\n",
+ "hc.add_callback('profile', 'virial_radius_fraction', [('gas','temperature')],\n",
" storage='virial_profiles',\n",
" weight_field='cell_mass', \n",
" accumulation=False, output_dir='profiles')\n"
@@ -368,7 +368,7 @@
"input": [
"halo = hc_reloaded.halo_list[0]\n",
"\n",
- "radius = halo.virial_profiles['virial_radius']\n",
+ "radius = halo.virial_profiles[u\"('index', 'virial_radius_fraction')\"]\n",
"temperature = halo.virial_profiles[u\"('gas', 'temperature')\"]\n",
"\n",
"# Remove output files, that are no longer needed\n",
diff -r 9799455919d22c5c6d6168287bb69439a9fd1962 -r 8b8a5a4348f0918536c019ab2bb04bd420fd54ca 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
@@ -404,7 +404,7 @@
halo.quantities["particle_identifier"])
fields = ensure_list(fields)
- fields = [halo.halo_catalog.data_source._determine_fields(field)[0]
+ fields = [halo.data_object._determine_fields(field)[0]
for field in fields]
dds = halo.halo_catalog.data_ds
diff -r 9799455919d22c5c6d6168287bb69439a9fd1962 -r 8b8a5a4348f0918536c019ab2bb04bd420fd54ca yt/analysis_modules/halo_analysis/halo_catalog.py
--- a/yt/analysis_modules/halo_analysis/halo_catalog.py
+++ b/yt/analysis_modules/halo_analysis/halo_catalog.py
@@ -376,7 +376,7 @@
# Add all of the default quantities that all halos must have
self.add_default_quantities('all')
- my_index = np.argsort(self.data_source["particle_identifier"])
+ my_index = np.argsort(self.data_source["all", "particle_identifier"])
for i in parallel_objects(my_index, njobs=njobs, dynamic=dynamic):
new_halo = Halo(self)
halo_filter = True
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