From 433d6f3a23bb2a987428a125683dc01c20062a42 Mon Sep 17 00:00:00 2001 From: tlatorre Date: Thu, 20 Sep 2018 14:35:26 -0500 Subject: don't include the OWL PMTs in the likelihood calculation For some reason the OWL tubes have 9999.00 for the x, y, and z coordinates of the normal vector in the PMT file. For now, I'm just going to remove them from the likelihood calculation. --- src/likelihood.c | 6 +++--- src/pmt.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/likelihood.c b/src/likelihood.c index 33bf095..db59040 100644 --- a/src/likelihood.c +++ b/src/likelihood.c @@ -368,7 +368,7 @@ double nll_muon(event *ev, double T0, double *pos, double *dir, double t0, doubl total_charge = 0.0; for (i = 0; i < MAX_PMTS; i++) { - if (ev->pmt_hits[i].flags || (pmts[i].pmt_type != PMT_NORMAL && pmts[i].pmt_type != PMT_OWL)) continue; + if (ev->pmt_hits[i].flags || pmts[i].pmt_type != PMT_NORMAL) continue; params.i = i; @@ -406,13 +406,13 @@ double nll_muon(event *ev, double T0, double *pos, double *dir, double t0, doubl mu_indirect = total_charge*CHARGE_FRACTION/10000.0; for (i = 0; i < MAX_PMTS; i++) { - if (ev->pmt_hits[i].flags || (pmts[i].pmt_type != PMT_NORMAL && pmts[i].pmt_type != PMT_OWL)) continue; + if (ev->pmt_hits[i].flags || pmts[i].pmt_type != PMT_NORMAL) continue; 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 && pmts[i].pmt_type != PMT_OWL)) continue; + if (ev->pmt_hits[i].flags || pmts[i].pmt_type != PMT_NORMAL) continue; log_mu = log(mu[i]); diff --git a/src/pmt.h b/src/pmt.h index b6a0359..6be3905 100644 --- a/src/pmt.h +++ b/src/pmt.h @@ -1,6 +1,11 @@ #ifndef PMT_H #define PMT_H +/* FIXME: The OWL PMTs normal vector isn't defined in pmt.txt! + * + * I'm not sure why, but for now we shouldn't use the OWL tubes in the + * likelihood calculation. */ + #define MAX_PMTS 10000 /* Radius of the PMT concentrator (cm). */ #define PMT_RADIUS 13.5 -- cgit