diff options
| author | tlatorre <tlatorre@uchicago.edu> | 2019-06-20 16:55:40 -0500 |
|---|---|---|
| committer | tlatorre <tlatorre@uchicago.edu> | 2019-06-20 16:55:40 -0500 |
| commit | d997c4d8e0b429f7fab846a13e7c0d9725a58231 (patch) | |
| tree | 3cb13a1507f0f71c6a628ae8a3053ddd6295d3de | |
| parent | f255a7d36c551e36e8b7ed7c821e526db27f6fc2 (diff) | |
| download | sddm-d997c4d8e0b429f7fab846a13e7c0d9725a58231.tar.gz sddm-d997c4d8e0b429f7fab846a13e7c0d9725a58231.tar.bz2 sddm-d997c4d8e0b429f7fab846a13e7c0d9725a58231.zip | |
update zdab-cat to output 50 MHz clock time and trigger type
| -rw-r--r-- | src/zdab-cat.c | 2 | ||||
| -rw-r--r-- | src/zdab_utils.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/zdab-cat.c b/src/zdab-cat.c index c7f7a96..4f87290 100644 --- a/src/zdab-cat.c +++ b/src/zdab-cat.c @@ -282,6 +282,8 @@ skip_mc: unpack_ev(b.data, &bev); ev.run = bev.run; ev.gtid = bev.gtr_id; + ev.trigger_type = bev.trg_type; + ev.trigger_time = bev.gtr; if (ev.run != last_run) { fprintf(stderr, "loading DQXX file for run %010i\n", ev.run); diff --git a/src/zdab_utils.c b/src/zdab_utils.c index ca0e3dc..716503c 100644 --- a/src/zdab_utils.c +++ b/src/zdab_utils.c @@ -679,7 +679,7 @@ void unpack_ev(uint32_t *data, EVBank *b) unpack((uint8_t *) (data+37),"l",&b->ncd_reg); unpack((uint8_t *) (data+38),"l",&b->ncd_gtid); unpack((uint8_t *) (data+39),"l",&b->ncd_sync); - unpack((uint8_t *) (data+40),"l",&b->spare3[0], + unpack((uint8_t *) (data+40),"llllllllll",&b->spare3[0], &b->spare3[1], &b->spare3[2], &b->spare3[3], |