diff options
| author | Stan Seibert <stan@mtrr.org> | 2011-10-11 20:30:50 -0400 |
|---|---|---|
| committer | tlatorre <tlatorre@uchicago.edu> | 2021-05-09 08:42:10 -0700 |
| commit | 62deea26d08b70079d4401588191785a94fb6772 (patch) | |
| tree | 053f8e331b6201a395117d11b770481b9c078e24 | |
| parent | a5bc898b7847fb09e4191370eb0a3777b35e6b7a (diff) | |
| download | chroma-62deea26d08b70079d4401588191785a94fb6772.tar.gz chroma-62deea26d08b70079d4401588191785a94fb6772.tar.bz2 chroma-62deea26d08b70079d4401588191785a94fb6772.zip | |
Stop returning the PDF probabilities and put the hit/not hit back into the likelihood
| -rw-r--r-- | chroma/likelihood.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chroma/likelihood.py b/chroma/likelihood.py index 93a95c3..d5e3f5d 100644 --- a/chroma/likelihood.py +++ b/chroma/likelihood.py @@ -82,7 +82,7 @@ class Likelihood(object): hit_channel_prob = np.log(hit_prob[self.event.channels.hit]).sum() + np.log(1.0-hit_prob[~self.event.channels.hit])[1:].sum() hit_channel_prob_uncert = ( (ntotal * hit_prob * (1.0 - hit_prob)) / hit_prob**2 ).sum()**0.5 log_likelihood = ufloat((hit_channel_prob, 0.0)) - log_likelihood = ufloat((0.0,0.0)) # FIXME: skipping hit/not hit probabilities for now + #log_likelihood = ufloat((0.0,0.0)) # FIXME: skipping hit/not hit probabilities for now # Then include the probability densities of the observed # charges and times. @@ -90,7 +90,7 @@ class Likelihood(object): pdf_prob_uncert[self.event.channels.hit])) log_likelihood += unumpy.log(hit_pdf_ufloat).sum() - return -log_likelihood, pdf_prob + return -log_likelihood def setup_kernel(self, vertex_generator, nevals, nreps, ndaq, oversample_factor): bandwidth_generator = islice(vertex_generator, nevals*oversample_factor) |