diff options
| author | Anthony LaTorre <tlatorre9@gmail.com> | 2011-08-03 14:33:39 -0400 |
|---|---|---|
| committer | Anthony LaTorre <tlatorre9@gmail.com> | 2011-08-03 14:33:39 -0400 |
| commit | 4e1047698bad5a600dd6a2aaa825667fc3617b07 (patch) | |
| tree | 0fe658ce1f3fd2ef272997d800757056cfd18291 /solids/__init__.py | |
| parent | 4bf95f452e3275c12026b16b51dc646846598f19 (diff) | |
| parent | 91bf7a2e2371a321b3bd402810cfe3b2774e2777 (diff) | |
| download | chroma-4e1047698bad5a600dd6a2aaa825667fc3617b07.tar.gz chroma-4e1047698bad5a600dd6a2aaa825667fc3617b07.tar.bz2 chroma-4e1047698bad5a600dd6a2aaa825667fc3617b07.zip | |
merge heads
Diffstat (limited to 'solids/__init__.py')
| -rw-r--r-- | solids/__init__.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/solids/__init__.py b/solids/__init__.py index d37af7e..479bacd 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 @@ -34,5 +34,11 @@ def build_12inch_pmt_with_lc_hd(outer_material=water, theta=np.pi/64): @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 |