diff options
Diffstat (limited to 'solids')
| -rw-r--r-- | solids/__init__.py | 26 | ||||
| -rw-r--r-- | solids/pmts.py | 2 |
2 files changed, 13 insertions, 15 deletions
diff --git a/solids/__init__.py b/solids/__init__.py index 421b66f..5ec11cf 100644 --- a/solids/__init__.py +++ b/solids/__init__.py @@ -1,14 +1,11 @@ -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.camera import buildable from os.path import dirname -@buildable('12inch_pmt') def build_12inch_pmt(outer_material=water, nsteps=16): - return build_pmt(dirname(__file__) + '/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(dirname(__file__) + '/hamamatsu_12inch.txt') @@ -19,23 +16,24 @@ lc_12inch_d = 0.09548 lc_12inch_rmin = 0.1524 lc_12inch_rmax = 0.235072 -@buildable('12inch_pmt_with_lc') 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) + 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, 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) + 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, nsteps=24): - return build_pmt(dirname(__file__) + '/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(dirname(__file__) + '/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 43aed3f..4c8d288 100644 --- a/solids/pmts.py +++ b/solids/pmts.py @@ -38,7 +38,7 @@ def build_pmt_shell(filename, outer_material=water, nsteps=16): # convert mm -> m profile /= 1000.0 - return Solid(rotate_extrude(profile[:,0], profile[:,1], nsteps), glass, outer_material, color=0xeeffffff) + return Solid(rotate_extrude(profile[:,0], profile[:,1], nsteps), glass, outer_material, color=0x99ffffff) def build_pmt(filename, glass_thickness, outer_material=water, nsteps=16): profile = read_csv(filename) |