diff options
| author | Stan Seibert <stan@mtrr.org> | 2011-08-23 10:31:43 -0400 |
|---|---|---|
| committer | Stan Seibert <stan@mtrr.org> | 2011-08-23 10:31:43 -0400 |
| commit | 20e90ebfea255c09a7e49204e6d94fdea352340a (patch) | |
| tree | 55bcc897393e34aaeac446fa7cb6c5046d14b86f /likelihood.py | |
| parent | 5f0f80459b59d63c6531e33712f3754cd94bde75 (diff) | |
| download | chroma-20e90ebfea255c09a7e49204e6d94fdea352340a.tar.gz chroma-20e90ebfea255c09a7e49204e6d94fdea352340a.tar.bz2 chroma-20e90ebfea255c09a7e49204e6d94fdea352340a.zip | |
Fix Likelihood to use self.sim instead of the global sim, so now it
imports properly. Also correct a units bug in the default time range
for the PDFs. We work in units of seconds, not nanoseconds!
Diffstat (limited to 'likelihood.py')
| -rw-r--r-- | likelihood.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/likelihood.py b/likelihood.py index 99d0543..2487442 100644 --- a/likelihood.py +++ b/likelihood.py @@ -7,7 +7,7 @@ from chroma.tools import profile_if_possible class Likelihood(object): "Class to evaluate likelihoods for detector events." - def __init__(self, sim, event=None, tbins=100, trange=(-0.5, 499.5), + def __init__(self, sim, event=None, tbins=100, trange=(-0.5e-9, 999.5e-9), qbins=10, qrange=(-0.5, 9.5)): """ Args: @@ -47,10 +47,10 @@ class Likelihood(object): will be propagated `nreps` times. """ - hitcount, pdfcount = sim.create_pdf(nevals, vertex_generator, - self.tbins, self.trange, - self.qbins, self.qrange, - nreps=nreps) + hitcount, pdfcount = self.sim.create_pdf(nevals, vertex_generator, + self.tbins, self.trange, + self.qbins, self.qrange, + nreps=nreps) # Normalize probabilities and put a floor to keep the log finite hit_prob = hitcount.astype(np.float32) / (nreps * nevals) |