cleanup

4 files changed, 7 insertions, 6 deletions

diff --git a/__init__.py b/__init__.py
index 7387dc2..f6d25eb 100644
--- a/__init__.py
+++ b/__init__.py
@@ -3,4 +3,4 @@ import materials
 import transform
 import stl
 import photon
-import layout
+import likelihood
diff --git a/detectors/lbne.py b/detectors/lbne.py
index ff38ef4..a9136dd 100644
--- a/detectors/lbne.py
+++ b/detectors/lbne.py
@@ -9,7 +9,7 @@ dir = os.path.split(os.path.realpath(__file__))[0]
 
 sys.path.append(dir + '/..')
 
-import layout
+import models
 from stl import read_stl
 from transform import rotate
 from geometry import Geometry, Solid
@@ -27,7 +27,7 @@ class LBNE(Geometry):
     def __init__(self):
         super(LBNE, self).__init__()
 
-        pmt_mesh = read_stl(layout.models + '/hamamatsu_12inch.stl')/1000.0
+        pmt_mesh = read_stl(models.dir + '/hamamatsu_12inch.stl')/1000.0
         pmt_solid = Solid(pmt_mesh, glass, h2o)
 
         # construct the barrel
diff --git a/models/__init__.py b/models/__init__.py
new file mode 100644
index 0000000..f369c9b
--- /dev/null
+++ b/models/__init__.py
@@ -0,0 +1,3 @@
+import os
+
+dir = os.path.split(os.path.realpath(__file__))[0]
diff --git a/view.py b/view.py
index e99c46e..cc28355 100755
--- a/view.py
+++ b/view.py
@@ -196,13 +196,11 @@ if __name__ == '__main__':
         view(geometry, tail)
     else:
         import inspect
-        import chroma.geometry
 
         members = dict(inspect.getmembers(detectors))
 
         if args[0] in members:
-            if issubclass(members[args[0]], Geometry) or \
-                    issubclass(members[args[0]], chroma.geometry.Geometry):
+            if issubclass(members[args[0]], Geometry):
                 geometry = members[args[0]]()
                 geometry.build(options.bits)
                 view(geometry, args[0])