tree.py: more templates

gstlal-ugly/python/tree.py

@@ -38,9 +38,11 @@ def mass_sym_constraint(vertices, mass_ratio  = float("inf"), total_mass = float
 	return False
 
 def packing_density(n):
+	# this packing density puts two in a cell, we split if there are two or
+	# more expected in a cell
+	return 0.50
+	#prefactor = 0.5
 	# From: http://mathworld.wolfram.com/HyperspherePacking.html
-	return 0.7
-	prefactor = 1.0
 	if n==1:
 		return prefactor
 	if n==2:
@@ -202,7 +204,7 @@ class Node(object):
 		self.parent = parent
 		self.sibling = None
 
-	def split(self, split_num_templates, mismatch, bifurcation = 0, verbose = True, vtol = 1.25, max_coord_vol = float(100)):
+	def split(self, split_num_templates, mismatch, bifurcation = 0, verbose = True, vtol = 1.05, max_coord_vol = float(100)):
 		size = self.cube.num_tmps_per_side(mismatch)
 		splitdim = numpy.argmax(size)
 		aspect_ratios = size / min(size)
@@ -238,7 +240,7 @@ class Node(object):
 			numtmps = max(max(numtmps, par_numtmps), sib_numtmps)
 
 
-		if  (self.cube.constraint_func(self.cube.vertices + [self.cube.center]) and (numtmps > split_num_templates)):
+		if  (self.cube.constraint_func(self.cube.vertices + [self.cube.center]) and (numtmps >= split_num_templates)):
 			self.template_count[0] = self.template_count[0] + 1
 			bifurcation += 1
 			if numtmps < 5**len(size) and volume_split_condition: