From 43424deb511bab000e2cabceb162c5f755e46910 Mon Sep 17 00:00:00 2001 From: tlatorre Date: Wed, 19 Jun 2019 11:45:58 -0500 Subject: add data cleaning word and ftp, ftk, and rsp info to zdab-cat output --- src/zdab-cat.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/zdab-cat.c b/src/zdab-cat.c index 1a60a9c..a29d947 100644 --- a/src/zdab-cat.c +++ b/src/zdab-cat.c @@ -25,6 +25,7 @@ #include /* for memcpy() */ #include /* for errno */ #include "release.h" +#include "dc.h" #define EV_RECORD 0x45562020 // 'EV ' #define MCTK_RECORD 0x4d43544b // 'MCTK' @@ -49,6 +50,9 @@ int main(int argc, char **argv) zebraBank bmast, bmc, bmcgn, mctk, b; int rv; EVBank bev; + FTPVBank bftpv; + FTXKBank bftxk; + RSPBank bftxr; MCTKBank bmctk; MCVXBank bmcvx; event ev = {0}; @@ -303,8 +307,40 @@ skip_mc: if (fout) { fprintf(fout, " - run: %i\n", ev.run); - fprintf(fout, " gtid: %i\n", ev.gtid); + fprintf(fout, " gtr: %.0f\n", ev.trigger_time); fprintf(fout, " nhit: %zu\n", nhit); + fprintf(fout, " gtid: %i\n", ev.gtid); + fprintf(fout, " trg_type: 0x%08x\n", ev.trigger_type); + fprintf(fout, " dc: 0x%08x\n", get_dc_word(&ev, f, &bmast, &b)); + } + + if (fout) { + if (get_ftpv(f,&b,&bftpv)) { + fprintf(stderr, "%s\n", zdab_err); + } else { + fprintf(fout, " ftp:\n"); + fprintf(fout, " x: %.2f\n", bftpv.x); + fprintf(fout, " y: %.2f\n", bftpv.y); + fprintf(fout, " z: %.2f\n", bftpv.z); + } + } + + if (fout) { + if (get_ftxk(f,&b,&bftxk)) { + fprintf(stderr, "%s\n", zdab_err); + } else { + fprintf(fout, " ftk:\n"); + fprintf(fout, " energy: %.2f\n", bftxk.energy); + } + } + + if (fout) { + if (get_rsp(f,&b,&bftxr)) { + fprintf(stderr, "%s\n", zdab_err); + } else { + fprintf(fout, " rsp:\n"); + fprintf(fout, " energy: %.2f\n", bftxr.ene); + } } /* Note the origin link for the first EV bank points back to the -- cgit