[yt-svn] commit/yt: xarthisius: Merged in brittonsmith/yt (pull request #1349)

[commits-noreply at bitbucket.org]

1 new commit in yt:

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.