diff options
Diffstat (limited to 'src/zdab_utils.c')
| -rw-r--r-- | src/zdab_utils.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/src/zdab_utils.c b/src/zdab_utils.c index c4b04ea..cf1a01c 100644 --- a/src/zdab_utils.c +++ b/src/zdab_utils.c @@ -49,25 +49,6 @@ static double TAC_OFFSET = 300.0; * a plot of QHS vs QLX. */ static double QLX_TO_QHS = 12.0; -size_t get_nhit(event *ev) -{ - /* Returns the number of PMT hits in event `ev`. - * - * Note: Only hits on normal PMTs which aren't flagged are counted. */ - size_t i, nhit; - - nhit = 0; - for (i = 0; i < MAX_PMTS; i++) { - if (ev->pmt_hits[i].flags || pmts[i].pmt_type != PMT_NORMAL) continue; - - if (!ev->pmt_hits[i].hit) continue; - - nhit++; - } - - return nhit; -} - /* Returns 1 if the EV is produced by MC, otherwise zero. * * Data type = 10*(1=real, 2=MC) @@ -128,6 +109,8 @@ int get_event(zebraFile *f, event *ev, zebraBank *bev) ev->dte = ev_bank.dte; ev->hmsc = ev_bank.hmsc; + ev->nhit = 0; + ev->nhit_cal = 0; for (i = 0; i < LEN(pmt_links); i++) { if (bev->links[pmt_links[i]-1] == 0) continue; @@ -349,6 +332,10 @@ int get_event(zebraFile *f, event *ev, zebraBank *bev) warned[id] = 1; } + ev->nhit += 1; + + if (!ev->pmt_hits[id].flags) ev->nhit_cal += 1; + if (!b.next) break; rv = zebra_get_bank(f,&b,b.next); @@ -360,8 +347,6 @@ int get_event(zebraFile *f, event *ev, zebraBank *bev) } } - ev->nhit = get_nhit(ev); - return 0; } |