diff options
| author | tlatorre <tlatorre@uchicago.edu> | 2018-10-12 10:20:28 -0500 |
|---|---|---|
| committer | tlatorre <tlatorre@uchicago.edu> | 2018-10-12 10:20:28 -0500 |
| commit | 09f7f3ec8bbff5102d0447ee664df3f3a404c9bc (patch) | |
| tree | 1349e40cfb6debc57b536ec25fdec23d01005d66 /src/likelihood.c | |
| parent | 26535b2e40ea8c031bb850a594a815d4a3435ebb (diff) | |
| download | sddm-09f7f3ec8bbff5102d0447ee664df3f3a404c9bc.tar.gz sddm-09f7f3ec8bbff5102d0447ee664df3f3a404c9bc.tar.bz2 sddm-09f7f3ec8bbff5102d0447ee664df3f3a404c9bc.zip | |
skip PMTs which weren't hit for the fast likelihood calculation
Diffstat (limited to 'src/likelihood.c')
| -rw-r--r-- | src/likelihood.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/likelihood.c b/src/likelihood.c index ccdfc84..5f66a72 100644 --- a/src/likelihood.c +++ b/src/likelihood.c @@ -392,6 +392,10 @@ double nll_muon(event *ev, double T0, double *pos, double *dir, double t0, doubl for (i = 0; i < MAX_PMTS; i++) { if (pmts[i].pmt_type != PMT_NORMAL) continue; + /* Skip PMTs which weren't hit when doing the "fast" likelihood + * calculation. */ + if (fast && !ev->pmt_hits[i].hit) continue; + params.i = i; if (fast) { @@ -501,13 +505,25 @@ double nll_muon(event *ev, double T0, double *pos, double *dir, double t0, doubl for (i = 0; i < MAX_PMTS; i++) { if (ev->pmt_hits[i].flags || pmts[i].pmt_type != PMT_NORMAL) continue; - mu[i] = mu_direct[i] + mu_indirect + mu_noise; + + /* Skip PMTs which weren't hit when doing the "fast" likelihood + * calculation. */ + if (fast && !ev->pmt_hits[i].hit) continue; + + if (fast) + mu[i] = mu_direct[i] + mu_noise; + else + mu[i] = mu_direct[i] + mu_indirect + mu_noise; } nhit = 0; for (i = 0; i < MAX_PMTS; i++) { if (ev->pmt_hits[i].flags || pmts[i].pmt_type != PMT_NORMAL) continue; + /* Skip PMTs which weren't hit when doing the "fast" likelihood + * calculation. */ + if (fast && !ev->pmt_hits[i].hit) continue; + log_mu = log(mu[i]); if (ev->pmt_hits[i].hit) { |