summaryrefslogtreecommitdiff
path: root/solids/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'solids/__init__.py')
-rw-r--r--solids/__init__.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/solids/__init__.py b/solids/__init__.py
index 338725c..9de5c8d 100644
--- a/solids/__init__.py
+++ b/solids/__init__.py
@@ -1,6 +1,6 @@
import numpy as np
-from pmts import build_pmt, build_light_collector
+from pmts import build_pmt, build_light_collector, build_light_collector_from_file
import os
import sys
@@ -28,5 +28,11 @@ def build_12inch_pmt_with_lc(outer_material=water, theta=np.pi/8):
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('8inch_pmt')
-def build_8inch_pmt(outer_material=water, theta=np.pi/8):
- return build_pmt(dir + '/sno_pmt.txt', 0.003, outer_material, theta)
+def build_8inch_pmt(outer_material=water, theta=np.pi/12):
+ return build_pmt(dir + '/sno_pmt_reduced.txt', 0.003, outer_material, theta)
+
+@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)
+ return pmt + lc