summaryrefslogtreecommitdiff
path: root/geometry.py
diff options
context:
space:
mode:
authorStan Seibert <stan@mtrr.org>2011-08-17 14:38:45 -0400
committerStan Seibert <stan@mtrr.org>2011-08-17 14:38:45 -0400
commitb88e37c5c7de5411fb003a3c146a1b697b5813ad (patch)
treece6b6bc992a901da7e83097bfe22d2b1f3ced09f /geometry.py
parentee07d0165f86ef6942bffd6ae88057926ab4e775 (diff)
parent11210ce25a543875eb51cff8efc06e7f02984214 (diff)
downloadchroma-b88e37c5c7de5411fb003a3c146a1b697b5813ad.tar.gz
chroma-b88e37c5c7de5411fb003a3c146a1b697b5813ad.tar.bz2
chroma-b88e37c5c7de5411fb003a3c146a1b697b5813ad.zip
merge
Diffstat (limited to 'geometry.py')
-rw-r--r--geometry.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/geometry.py b/geometry.py
index 856ded3..6ea8994 100644
--- a/geometry.py
+++ b/geometry.py
@@ -1,8 +1,8 @@
import sys
import os
import numpy as np
-from itertoolset import *
-from tools import timeit, profile_if_possible
+from chroma.itertoolset import *
+from chroma.tools import timeit, profile_if_possible
from hashlib import md5
import cPickle as pickle
import gzip
@@ -274,7 +274,7 @@ class Geometry(object):
try:
self.surface_index[self.surface_index == surface_lookup[None]] = -1
- except ValueError:
+ except KeyError:
pass
checksum = md5(str(bits))