From e33c6fab8b8dd8adb3d71af8517dfe45ba264cf7 Mon Sep 17 00:00:00 2001
From: Anthony LaTorre <tlatorre9@gmail.com>
Date: Wed, 17 Aug 2011 10:36:22 -0400
Subject: import chroma modules from subpackages with import chroma.module_name

---
 solids/__init__.py | 21 +++++++--------------
 solids/pmts.py     | 14 ++++----------
 2 files changed, 11 insertions(+), 24 deletions(-)

(limited to 'solids')

diff --git a/solids/__init__.py b/solids/__init__.py
index a24ce9c..c23be98 100644
--- a/solids/__init__.py
+++ b/solids/__init__.py
@@ -1,23 +1,16 @@
 import numpy as np
-
 from pmts import build_pmt, build_light_collector, build_light_collector_from_file, build_pmt_shell
-
-import os
-import sys
-
-dir = os.path.split(os.path.realpath(__file__))[0]
-sys.path.append(dir + '/..')
-
-from optics import *
-from view import buildable
+from chroma.optics import *
+from chroma.view import buildable
+from os.path import dirname
 
 @buildable('12inch_pmt')
 def build_12inch_pmt(outer_material=water, nsteps=16):
-    return build_pmt(dir + '/hamamatsu_12inch.txt', 0.003, outer_material, nsteps)
+    return build_pmt(dirname(__file__) + '/hamamatsu_12inch.txt', 0.003, outer_material, nsteps)
 
 @buildable('12inch_pmt_shell')
 def build_12inch_pmt_shell(outer_material=water, nsteps=16):
-    return build_pmt_shell(dir + '/hamamatsu_12inch.txt')
+    return build_pmt_shell(dirname(__file__) + '/hamamatsu_12inch.txt')
 
 # from Jelena Maricic
 lc_12inch_a = 0.16597
@@ -39,10 +32,10 @@ def build_12inch_pmt_with_lc_hd(outer_material=water, nsteps=128):
 
 @buildable('8inch_pmt')
 def build_8inch_pmt(outer_material=water, nsteps=24):
-    return build_pmt(dir + '/sno_pmt_reduced.txt', 0.003, outer_material, nsteps)
+    return build_pmt(dirname(__file__) + '/sno_pmt_reduced.txt', 0.003, outer_material, nsteps)
 
 @buildable('8inch_pmt_with_lc')
 def build_8inch_pmt_with_lc(outer_material=water, nsteps=24):
     pmt = build_8inch_pmt(outer_material, nsteps)
-    lc = build_light_collector_from_file(dir + '/sno_cone.txt', outer_material, nsteps)
+    lc = build_light_collector_from_file(dirname(__file__) + '/sno_cone.txt', outer_material, nsteps)
     return pmt + lc
diff --git a/solids/pmts.py b/solids/pmts.py
index fcbc8fc..43aed3f 100644
--- a/solids/pmts.py
+++ b/solids/pmts.py
@@ -1,14 +1,8 @@
-import os
-import sys
-
-dir = os.path.split(os.path.realpath(__file__))[0]
-sys.path.append(dir + '/..')
-
 import numpy as np
-from geometry import Solid
-from make import rotate_extrude
-from optics import *
-from tools import read_csv, offset
+from chroma.geometry import Solid
+from chroma.make import rotate_extrude
+from chroma.optics import *
+from chroma.tools import read_csv, offset
 
 def get_lc_profile(radii, a, b, d, rmin, rmax):
     c = -b*np.sqrt(1 - (rmin-d)**2/a**2)
-- 
cgit 


From 11210ce25a543875eb51cff8efc06e7f02984214 Mon Sep 17 00:00:00 2001
From: Anthony LaTorre <tlatorre9@gmail.com>
Date: Wed, 17 Aug 2011 11:54:41 -0400
Subject: move useful bits from view.py into camera.py and get rid of view.py

---
 solids/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solids')

diff --git a/solids/__init__.py b/solids/__init__.py
index c23be98..421b66f 100644
--- a/solids/__init__.py
+++ b/solids/__init__.py
@@ -1,7 +1,7 @@
 import numpy as np
 from pmts import build_pmt, build_light_collector, build_light_collector_from_file, build_pmt_shell
 from chroma.optics import *
-from chroma.view import buildable
+from chroma.camera import buildable
 from os.path import dirname
 
 @buildable('12inch_pmt')
-- 
cgit