merge

1 files changed, 12 insertions, 12 deletions

diff --git a/solids/__init__.py b/solids/__init__.py
index 46f3119..a24ce9c 100644
--- a/solids/__init__.py
+++ b/solids/__init__.py
@@ -12,11 +12,11 @@ from optics import *
 from view import buildable
 
 @buildable('12inch_pmt')
-def build_12inch_pmt(outer_material=water, theta=np.pi/8):
-    return build_pmt(dir + '/hamamatsu_12inch.txt', 0.003, outer_material, theta)
+def build_12inch_pmt(outer_material=water, nsteps=16):
+    return build_pmt(dir + '/hamamatsu_12inch.txt', 0.003, outer_material, nsteps)
 
 @buildable('12inch_pmt_shell')
-def build_12inch_pmt_shell(outer_material=water, theta=np.pi/8):
+def build_12inch_pmt_shell(outer_material=water, nsteps=16):
     return build_pmt_shell(dir + '/hamamatsu_12inch.txt')
 
 # from Jelena Maricic
@@ -27,22 +27,22 @@ lc_12inch_rmin = 0.1524
 lc_12inch_rmax = 0.235072
 
 @buildable('12inch_pmt_with_lc')
-def build_12inch_pmt_with_lc(outer_material=water, theta=np.pi/8):
-    pmt = build_12inch_pmt(outer_material, theta)
+def build_12inch_pmt_with_lc(outer_material=water, nsteps=16):
+    pmt = build_12inch_pmt(outer_material, nsteps)
     return pmt + build_light_collector(pmt, a=lc_12inch_a, b=lc_12inch_b, d=lc_12inch_d, rmin=lc_12inch_rmin, rmax=lc_12inch_rmax)
 
 @buildable('12inch_pmt_with_lc_hd')
-def build_12inch_pmt_with_lc_hd(outer_material=water, theta=np.pi/64):
-    pmt = build_12inch_pmt(outer_material, theta)
+def build_12inch_pmt_with_lc_hd(outer_material=water, nsteps=128):
+    pmt = build_12inch_pmt(outer_material, nsteps)
     return pmt + build_light_collector(pmt, a=lc_12inch_a, b=lc_12inch_b, d=lc_12inch_d, rmin=lc_12inch_rmin, rmax=lc_12inch_rmax, npoints=100)
 
 
 @buildable('8inch_pmt')
-def build_8inch_pmt(outer_material=water, theta=np.pi/12):
-    return build_pmt(dir + '/sno_pmt_reduced.txt', 0.003, outer_material, theta)
+def build_8inch_pmt(outer_material=water, nsteps=24):
+    return build_pmt(dir + '/sno_pmt_reduced.txt', 0.003, outer_material, nsteps)
 
 @buildable('8inch_pmt_with_lc')
-def build_8inch_pmt_with_lc(outer_material=water, theta=np.pi/12):
-    pmt = build_8inch_pmt(outer_material, theta)
-    lc = build_light_collector_from_file(dir + '/sno_cone.txt', outer_material, theta)
+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)
     return pmt + lc