[yt-svn] commit/yt: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/a8644c0b8411/
Changeset:   a8644c0b8411
Branch:      yt-3.0
User:        hegan
Date:        2014-09-18 16:19:29+00:00
Summary:     catch no halos found error before trying to index the halos_ds
Affected #:  1 file

diff -r 95a477fcf9ac3d51b348404756f07ef466bb0998 -r a8644c0b8411a86fc4dec31a6695b0d8d3c881a8 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
@@ -364,7 +364,6 @@
         if self.halos_ds is None:
             # Find the halos and make a dataset of them
             self.halos_ds = self.finder_method(self.data_ds)
-            self.halos_ds.index
             if self.halos_ds is None:
                 mylog.warning('No halos were found for {0}'.format(\
                         self.data_ds.basename))
@@ -373,6 +372,7 @@
                     self.save_catalog()
                     self.halos_ds = None
                 return
+            self.halos_ds.index
 
             # Assign ds and data sources appropriately
             self.data_source = self.halos_ds.all_data()


https://bitbucket.org/yt_analysis/yt/commits/dc60658345cd/
Changeset:   dc60658345cd
Branch:      yt
User:        MatthewTurk
Date:        2014-09-20 19:48:56+00:00
Summary:     Merged in hegan/yt/yt-3.0 (pull request #1213)

[bugfix] catch no halos found error before trying to index the halos_ds
Affected #:  1 file

diff -r 08157f94abc7612236f73b240503050044035f46 -r dc60658345cd68e6e29218b52b0566053c62b144 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
@@ -364,7 +364,6 @@
         if self.halos_ds is None:
             # Find the halos and make a dataset of them
             self.halos_ds = self.finder_method(self.data_ds)
-            self.halos_ds.index
             if self.halos_ds is None:
                 mylog.warning('No halos were found for {0}'.format(\
                         self.data_ds.basename))
@@ -373,6 +372,7 @@
                     self.save_catalog()
                     self.halos_ds = None
                 return
+            self.halos_ds.index
 
             # Assign ds and data sources appropriately
             self.data_source = self.halos_ds.all_data()

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.