New demo detector for Chroma that is not dependent on any internal experiment information.

3 files changed, 10 insertions, 10 deletions

diff --git a/test/test_generator_photon.py b/test/test_generator_photon.py
index 13501fe..6952da9 100644
--- a/test/test_generator_photon.py
+++ b/test/test_generator_photon.py
@@ -3,19 +3,19 @@ import itertools
 
 from chroma import generator
 from chroma.generator.vertex import constant_particle_gun
-from chroma import optics
+from chroma.demo.optics import water
 
 class TestG4ParallelGenerator(unittest.TestCase):
     def test_center(self):
         '''Generate Cherenkov light at the center of the world volume'''
-        gen = generator.photon.G4ParallelGenerator(1, optics.water_wcsim)
+        gen = generator.photon.G4ParallelGenerator(1, water)
         vertex = itertools.islice(constant_particle_gun('e-', (0,0,0), (1,0,0), 100), 10)
         for event in gen.generate_events(vertex):
             self.assertGreater(len(event.photons_beg.pos), 0)
 
     def test_off_center(self):
         '''Generate Cherenkov light at (1 m, 0 m, 0 m)'''
-        gen = generator.photon.G4ParallelGenerator(1, optics.water_wcsim)
+        gen = generator.photon.G4ParallelGenerator(1, water)
         vertex = itertools.islice(constant_particle_gun('e-', (1,0,0), (1,0,0), 100), 10)
         for event in gen.generate_events(vertex):
             self.assertGreater(len(event.photons_beg.pos), 0)
diff --git a/test/test_pdf.py b/test/test_pdf.py
index 571cbd4..2eafd67 100644
--- a/test/test_pdf.py
+++ b/test/test_pdf.py
@@ -2,23 +2,23 @@ import unittest
 import numpy as np
 import itertools
 
-import chroma.detectors
+import chroma.demo
 from chroma.generator.photon import G4ParallelGenerator
 from chroma.generator.vertex import constant_particle_gun
-from chroma.optics import water_wcsim
+from chroma.demo.optics import water
 from chroma import gpu
 from chroma.sim import Simulation
 
 class TestPDF(unittest.TestCase):
     def setUp(self):
-        self.detector = chroma.detectors.microlbne()
+        self.detector = chroma.demo.tiny()
         self.detector.build()
         self.vertex_gen = constant_particle_gun('e-', (0,0,0), (1,0,0), 10)
 
     def testGPUPDF(self):
         '''Create a hit count and (q,t) PDF for 10 MeV events in MicroLBNE'''
 
-        g4generator = G4ParallelGenerator(1, water_wcsim)
+        g4generator = G4ParallelGenerator(1, water)
 
         context = gpu.create_cuda_context()
 
diff --git a/test/test_rayleigh.py b/test/test_rayleigh.py
index 02ccb41..cfb0441 100644
--- a/test/test_rayleigh.py
+++ b/test/test_rayleigh.py
@@ -4,7 +4,7 @@ import numpy as np
 from chroma.geometry import Solid, Geometry
 from chroma.make import box
 from chroma.sim import Simulation
-from chroma.optics import water_wcsim
+from chroma.demo.optics import water
 from chroma.event import Photons
 import histogram
 from histogram.root import rootify
@@ -13,8 +13,8 @@ ROOT.gROOT.SetBatch(1)
 
 class TestRayleigh(unittest.TestCase):
     def setUp(self):
-        self.cube = Geometry(water_wcsim)
-        self.cube.add_solid(Solid(box(100,100,100), water_wcsim, water_wcsim))
+        self.cube = Geometry(water)
+        self.cube.add_solid(Solid(box(100,100,100), water, water))
         self.cube.pmtids = [0]
         self.cube.build(use_cache=False)
         self.sim = Simulation(self.cube, geant4_processes=0)