summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Seibert <stan@mtrr.org>2011-11-23 12:53:33 -0500
committertlatorre <tlatorre@uchicago.edu>2021-05-09 08:42:38 -0700
commit6ae6a660d0276bf671362e8456edbf8ead6f3e5c (patch)
treee288fae55b36eb829b12bf35ccb2cdedc321679b
parente1dcaa002f9d420fb61af3b812bb2f8f87eb0525 (diff)
downloadchroma-6ae6a660d0276bf671362e8456edbf8ead6f3e5c.tar.gz
chroma-6ae6a660d0276bf671362e8456edbf8ead6f3e5c.tar.bz2
chroma-6ae6a660d0276bf671362e8456edbf8ead6f3e5c.zip
Use bigger blocks for multi-DAQ calculation
-rw-r--r--chroma/sim.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/chroma/sim.py b/chroma/sim.py
index 47f1820..4af877b 100644
--- a/chroma/sim.py
+++ b/chroma/sim.py
@@ -127,7 +127,8 @@ class Simulation(object):
def eval_pdf(self, event_channels, iterable, min_twidth, trange, min_qwidth, qrange, min_bin_content=100, nreps=1, ndaq=1, time_only=True):
"""Returns tuple: 1D array of channel hit counts, 1D array of PDF
probability densities."""
- ndaq_reps = ndaq // 32
+ ndaq_per_rep = 64
+ ndaq_reps = ndaq // ndaq_per_rep
gpu_daq = gpu.GPUDaq(self.gpu_geometry, ndaq=32)
self.gpu_pdf.setup_pdf_eval(event_channels.hit,
@@ -164,7 +165,7 @@ class Simulation(object):
#print 'weights', weights.min(), weights.max()
for j in xrange(ndaq_reps):
gpu_channels = gpu_daq.acquire(gpu_photon_slice, self.rng_states, nthreads_per_block=self.nthreads_per_block, max_blocks=self.max_blocks)
- self.gpu_pdf.accumulate_pdf_eval(gpu_channels, nthreads_per_block=32)
+ self.gpu_pdf.accumulate_pdf_eval(gpu_channels, nthreads_per_block=ndaq_per_rep)
return self.gpu_pdf.get_pdf_eval()