diff options
| -rw-r--r-- | chroma/demo/__init__.py | 3 | ||||
| -rw-r--r-- | chroma/demo/checkerboard.py (renamed from chroma/scenes/checkerboard.py) | 5 | ||||
| -rw-r--r-- | chroma/scenes/__init__.py | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/chroma/demo/__init__.py b/chroma/demo/__init__.py index b103626..edd344a 100644 --- a/chroma/demo/__init__.py +++ b/chroma/demo/__init__.py @@ -12,6 +12,8 @@ from chroma.transform import rotate, make_rotation_matrix from chroma.demo.pmt import build_8inch_pmt_with_lc from chroma.demo.optics import water +from chroma.demo.checkerboard import build_checkerboard_scene as checkerboard_scene + def spherical_spiral(radius, spacing): '''Returns iterator generating points on a spiral wrapping the surface of a sphere. Points should be approximately equidistiant @@ -54,3 +56,4 @@ def detector(pmt_radius=30.0, sphere_radius=30.5, spiral_step=0.14): def tiny(): return detector(1.0, 1.5, 0.4) + diff --git a/chroma/scenes/checkerboard.py b/chroma/demo/checkerboard.py index c176b32..dd2e3e1 100644 --- a/chroma/scenes/checkerboard.py +++ b/chroma/demo/checkerboard.py @@ -1,11 +1,10 @@ import numpy as np from chroma.itertoolset import * from chroma.geometry import Mesh, Solid, Geometry -from chroma.optics import * from chroma.make import sphere -#from chroma.camera import buildable -#@buildable('checkerboard_scene') +from chroma.demo.optics import * + def build_checkerboard_scene(checkers_per_side=10, squares_per_checker=50): x = np.linspace(-5.0, 5.0, checkers_per_side*squares_per_checker+1) y = np.linspace(-5.0, 5.0, checkers_per_side*squares_per_checker+1) diff --git a/chroma/scenes/__init__.py b/chroma/scenes/__init__.py deleted file mode 100644 index 1d57220..0000000 --- a/chroma/scenes/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from checkerboard import build_checkerboard_scene |