diff options
| author | tlatorre <tlatorre@uchicago.edu> | 2020-11-16 08:36:23 -0600 |
|---|---|---|
| committer | tlatorre <tlatorre@uchicago.edu> | 2020-11-16 08:36:23 -0600 |
| commit | 9e07d3109081d4edd3210a45d991b2ad1e11ddfd (patch) | |
| tree | f55f6e81c94cbe9a96d35700ec7a847526343aaa | |
| parent | f92ebc3df77a24f67eeb7b78c45d03b7806bdfa3 (diff) | |
| download | sddm-9e07d3109081d4edd3210a45d991b2ad1e11ddfd.tar.gz sddm-9e07d3109081d4edd3210a45d991b2ad1e11ddfd.tar.bz2 sddm-9e07d3109081d4edd3210a45d991b2ad1e11ddfd.zip | |
add jdy, ut1, ut2, dte, and hmsc to hdf5 output file
| -rw-r--r-- | src/event.h | 6 | ||||
| -rw-r--r-- | src/fit.c | 5 | ||||
| -rw-r--r-- | src/hdf5_utils.c | 5 | ||||
| -rw-r--r-- | src/hdf5_utils.h | 5 | ||||
| -rw-r--r-- | src/zdab-cat.c | 5 | ||||
| -rw-r--r-- | src/zdab_utils.c | 3 |
6 files changed, 29 insertions, 0 deletions
diff --git a/src/event.h b/src/event.h index fbb1658..5f1dd1a 100644 --- a/src/event.h +++ b/src/event.h @@ -84,6 +84,12 @@ typedef struct event { uint32_t gtid; /* Trigger word. See trigger_mask_bits.inc. */ uint32_t trigger_type; + /* Julian date. */ + uint32_t jdy; + /* Universal time (seconds). */ + uint32_t ut1; + /* Universal time (nanoseconds). */ + uint32_t ut2; /* Date (format: yyyymmdd) */ uint32_t dte; /* Time (format: hhmmsscc - cc is centisec). */ @@ -6564,6 +6564,11 @@ skip_mc: hdf5_events[nevents].sub_run = ev.sub_run; hdf5_events[nevents].evn = bmc.evn; hdf5_events[nevents].gtr = ev.trigger_time; + hdf5_events[nevents].jdy = ev.jdy; + hdf5_events[nevents].ut1 = ev.ut1; + hdf5_events[nevents].ut2 = ev.ut2; + hdf5_events[nevents].dte = ev.dte; + hdf5_events[nevents].hmsc = ev.hmsc; hdf5_events[nevents].nhit = ev.nhit; hdf5_events[nevents].nhit_cal = ev.nhit_cal; hdf5_events[nevents].gtid = ev.gtid; diff --git a/src/hdf5_utils.c b/src/hdf5_utils.c index f8a91c2..5fc79ad 100644 --- a/src/hdf5_utils.c +++ b/src/hdf5_utils.c @@ -115,6 +115,11 @@ int save_output(const char *output, HDF5Event *hdf5_events, size_t nevents, HDF5 H5Tinsert(hdf5_events_tid, "sub_run", HOFFSET(HDF5Event, sub_run), H5T_NATIVE_INT); H5Tinsert(hdf5_events_tid, "evn", HOFFSET(HDF5Event, evn), H5T_NATIVE_INT); H5Tinsert(hdf5_events_tid, "gtr", HOFFSET(HDF5Event, gtr), H5T_NATIVE_DOUBLE); + H5Tinsert(hdf5_events_tid, "jdy", HOFFSET(HDF5Event, jdy), H5T_NATIVE_INT); + H5Tinsert(hdf5_events_tid, "ut1", HOFFSET(HDF5Event, ut1), H5T_NATIVE_INT); + H5Tinsert(hdf5_events_tid, "ut2", HOFFSET(HDF5Event, ut2), H5T_NATIVE_INT); + H5Tinsert(hdf5_events_tid, "dte", HOFFSET(HDF5Event, dte), H5T_NATIVE_INT); + H5Tinsert(hdf5_events_tid, "hmsc", HOFFSET(HDF5Event, hmsc), H5T_NATIVE_INT); H5Tinsert(hdf5_events_tid, "nhit", HOFFSET(HDF5Event, nhit), H5T_NATIVE_INT); H5Tinsert(hdf5_events_tid, "nhit_cal", HOFFSET(HDF5Event, nhit_cal), H5T_NATIVE_INT); H5Tinsert(hdf5_events_tid, "gtid", HOFFSET(HDF5Event, gtid), H5T_NATIVE_UINT32); diff --git a/src/hdf5_utils.h b/src/hdf5_utils.h index 03ef6ae..7479854 100644 --- a/src/hdf5_utils.h +++ b/src/hdf5_utils.h @@ -26,6 +26,11 @@ typedef struct HDF5Event { int sub_run; int evn; double gtr; + int jdy; + int ut1; + int ut2; + int dte; + int hmsc; int nhit; int nhit_cal; uint32_t gtid; diff --git a/src/zdab-cat.c b/src/zdab-cat.c index 950ead3..2614125 100644 --- a/src/zdab-cat.c +++ b/src/zdab-cat.c @@ -341,6 +341,11 @@ skip_mc: hdf5_events[nevents].sub_run = ev.sub_run; hdf5_events[nevents].evn = bmc.evn; hdf5_events[nevents].gtr = ev.trigger_time; + hdf5_events[nevents].jdy = ev.jdy; + hdf5_events[nevents].ut1 = ev.ut1; + hdf5_events[nevents].ut2 = ev.ut2; + hdf5_events[nevents].dte = ev.dte; + hdf5_events[nevents].hmsc = ev.hmsc; hdf5_events[nevents].nhit = ev.nhit; hdf5_events[nevents].nhit_cal = ev.nhit_cal; hdf5_events[nevents].gtid = ev.gtid; diff --git a/src/zdab_utils.c b/src/zdab_utils.c index 4fc267c..e44d807 100644 --- a/src/zdab_utils.c +++ b/src/zdab_utils.c @@ -110,6 +110,9 @@ int get_event(zebraFile *f, event *ev, zebraBank *bev) ev->gtid = ev_bank.gtr_id; ev->trigger_type = ev_bank.trg_type; ev->trigger_time = ev_bank.gtr; + ev->jdy = ev_bank.jdy; + ev->ut1 = ev_bank.ut1; + ev->ut2 = ev_bank.ut2; ev->dte = ev_bank.dte; ev->hmsc = ev_bank.hmsc; |