From 86cb5f26029b3357727b88fee3fa7dd799a8d6c8 Mon Sep 17 00:00:00 2001 From: Anthony LaTorre Date: Tue, 6 Sep 2011 17:18:14 -0400 Subject: geometry on the GPU is now a struct created in the GPUGeometry class. coding style for cuda code is now compliant with python PEP 7 -- Style Guide for C Code. --- tests/test_pdf.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/test_pdf.py') diff --git a/tests/test_pdf.py b/tests/test_pdf.py index 791f119..c7c9394 100644 --- a/tests/test_pdf.py +++ b/tests/test_pdf.py @@ -20,7 +20,7 @@ class TestPDF(unittest.TestCase): g4generator = G4ParallelGenerator(1, water_wcsim) gpu_instance = gpu.GPU(0) - gpu_geometry = gpu.GPUGeometry(gpu_instance, self.detector) + gpu_geometry = gpu.GPUGeometry(self.detector) nthreads_per_block, max_blocks = 64, 1024 @@ -34,8 +34,10 @@ class TestPDF(unittest.TestCase): for ev in g4generator.generate_events(itertools.islice(self.vertex_gen, 10)): gpu_photons = gpu.GPUPhotons(ev.photons_beg) - gpu.propagate(gpu_instance, gpu_photons, rng_states, nthreads_per_block, max_blocks) - gpu_channels = gpu_daq.acquire(gpu_photons, rng_states, nthreads_per_block, max_blocks) + gpu_photons.propagate(gpu_geometry, rng_states, nthreads_per_block, + max_blocks) + gpu_channels = gpu_daq.acquire(gpu_photons, rng_states, + nthreads_per_block, max_blocks) gpu_pdf.add_hits_to_pdf(gpu_channels) hitcount, pdf = gpu_pdf.get_pdfs() -- cgit