diff options
| author | tlatorre <tlatorre@uchicago.edu> | 2019-06-14 16:51:31 -0500 |
|---|---|---|
| committer | tlatorre <tlatorre@uchicago.edu> | 2019-06-14 16:51:31 -0500 |
| commit | f6465b7254c13b2effcc1813280151186d64f8b7 (patch) | |
| tree | 15bf9a62a6c837a8bfdf8633c849fdd2b4df12ce /src | |
| parent | b1e355f5249126f8a5bec4eab427bfe260dfb1a3 (diff) | |
| download | sddm-f6465b7254c13b2effcc1813280151186d64f8b7.tar.gz sddm-f6465b7254c13b2effcc1813280151186d64f8b7.tar.bz2 sddm-f6465b7254c13b2effcc1813280151186d64f8b7.zip | |
fix parsing of global trigger time from EV bank (it's stored as a double)
Diffstat (limited to 'src')
| -rw-r--r-- | src/zdab_utils.c | 3 | ||||
| -rw-r--r-- | src/zdab_utils.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/zdab_utils.c b/src/zdab_utils.c index e32a2f3..5c1ef9f 100644 --- a/src/zdab_utils.c +++ b/src/zdab_utils.c @@ -319,8 +319,7 @@ void unpack_ev(uint32_t *data, EVBank *b) unpack((uint8_t *) (data+5), "l",&b->ut2); unpack((uint8_t *) (data+6), "l",&b->dte); unpack((uint8_t *) (data+7), "l",&b->hmsc); - unpack((uint8_t *) (data+8), "l",&b->gtr1); - unpack((uint8_t *) (data+9), "l",&b->gtr2); + unpack((uint8_t *) (data+8), "F",&b->gtr); unpack((uint8_t *) (data+10),"l",&b->npm); unpack((uint8_t *) (data+11),"l",&b->nph); unpack((uint8_t *) (data+12),"l",&b->sub_run); diff --git a/src/zdab_utils.h b/src/zdab_utils.h index 1c138b9..9176d92 100644 --- a/src/zdab_utils.h +++ b/src/zdab_utils.h @@ -283,9 +283,7 @@ typedef struct EVBank { /* Time (format: hhmmsscc - cc is centisec). */ uint32_t hmsc; /* Global trigger time in nsec (first word). */ - uint32_t gtr1; - /* Second word. */ - uint32_t gtr2; + double gtr; /* Number of PMTs that fired. */ uint32_t npm; /* Integrated charge in the event. */ |