# HG changeset patch
# User Matthew Turk <matthewturk@gmail.com>
# Date 1283553024 25200
# Branch yt
# Node ID a16fa728b1fc49ca9315b6936f5407aa91472183
# Parent  9f8fb27e2fc129a992cf3ab779d7d3fbddd7fe3a
# Parent  3c6f946f64a9c031d3667f5b9d4e0211dc23e9b1
Merge

diff -r 9f8fb27e2fc129a992cf3ab779d7d3fbddd7fe3a -r a16fa728b1fc49ca9315b6936f5407aa91472183 yt/analysis_modules/halo_merger_tree/merger_tree.py
--- a/yt/analysis_modules/halo_merger_tree/merger_tree.py	Fri Sep 03 15:30:11 2010 -0700
+++ b/yt/analysis_modules/halo_merger_tree/merger_tree.py	Fri Sep 03 15:30:24 2010 -0700
@@ -27,7 +27,7 @@
 import os, glob, md5, time, gc, sys
 import h5py
 import types
-import sqlite3 as sql
+
 from yt.funcs import *
 
 from yt.analysis_modules.halo_finding.halo_objects import \
@@ -35,6 +35,7 @@
 from yt.analysis_modules.halo_profiler.multi_halo_profiler import \
     HaloProfiler
 from yt.convenience import load
+from yt.utilities.logger import ytLogger as mylog
 try:
     from yt.utilities.kdtree import *
 except ImportError:
@@ -44,6 +45,10 @@
     ParallelAnalysisInterface, \
     parallel_blocking_call
 
+try:
+    import sqlite3 as sql
+except ImportError:
+    mylog.error("sqlite3 not imported!")
 
 column_types = {
 "GlobalHaloID":"INTEGER",
diff -r 9f8fb27e2fc129a992cf3ab779d7d3fbddd7fe3a -r a16fa728b1fc49ca9315b6936f5407aa91472183 yt/data_objects/derived_quantities.py
--- a/yt/data_objects/derived_quantities.py	Fri Sep 03 15:30:11 2010 -0700
+++ b/yt/data_objects/derived_quantities.py	Fri Sep 03 15:30:24 2010 -0700
@@ -29,6 +29,7 @@
 
 from yt.funcs import *
 
+from yt.utilities.data_point_utilities import FindBindingEnergy
 from yt.utilities.parallel_tools.parallel_analysis_interface import \
     ParallelAnalysisInterface
 from yt.funcs import \
@@ -267,10 +268,10 @@
     try:
         pot = G*_cudaIsBound(data, truncate, kinetic/G)
     except (ImportError, AssertionError):
-        pot = G*PointCombine.FindBindingEnergy(data["CellMass"],
-                                               data['x'],data['y'],data['z'],
-                                               truncate, kinetic/G)
-    mylog.info("Boundedness check took %0.3e seconds", time.time()-t1)
+        pot = G*FindBindingEnergy(data["CellMass"],
+                                  data['x'],data['y'],data['z'],
+                                  truncate, kinetic/G)
+        mylog.info("Boundedness check took %0.3e seconds", time.time()-t1)
     return [(pot / kinetic)]
 def _combIsBound(data, bound):
     return bound