diff options
| author | tlatorre <tlatorre@uchicago.edu> | 2019-08-28 13:52:32 -0500 |
|---|---|---|
| committer | tlatorre <tlatorre@uchicago.edu> | 2019-08-28 13:52:32 -0500 |
| commit | 5a40f23ce50480edd235a309aaaad078d6cc740f (patch) | |
| tree | 1a712c0e32f5c197ccc87f4dd39ce1ecdbc86048 /src/zdab-cat.c | |
| parent | 8a1d843403cda4b82417167d3473f3cefdfdc463 (diff) | |
| download | sddm-5a40f23ce50480edd235a309aaaad078d6cc740f.tar.gz sddm-5a40f23ce50480edd235a309aaaad078d6cc740f.tar.bz2 sddm-5a40f23ce50480edd235a309aaaad078d6cc740f.zip | |
fix some error handling in zebra.c
This commit updates the zebra code to properly handle all the errors from
get_bytes(). I also updated fit and cat-zdab to not display the errors about
the FTX banks by default unless you run them with the -v command line option.
Diffstat (limited to 'src/zdab-cat.c')
| -rw-r--r-- | src/zdab-cat.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/zdab-cat.c b/src/zdab-cat.c index 009fdf8..88024d4 100644 --- a/src/zdab-cat.c +++ b/src/zdab-cat.c @@ -48,6 +48,7 @@ void usage(void) fprintf(stderr,"Usage: ./zdab-cat [options] FILENAME\n"); fprintf(stderr," -o output file (default: stdout)\n"); fprintf(stderr," --skip-second-event only fit the first event after a MAST bank\n"); + fprintf(stderr," -v verbose\n"); fprintf(stderr," -h display this help message\n"); exit(1); } @@ -75,6 +76,7 @@ int main(int argc, char **argv) static HDF5Event hdf5_events[MAX_NEVENTS]; int nmcgn = 0; static HDF5MCGN hdf5_mcgn[MAX_NEVENTS]; + int verbose = 0; for (i = 1; i < argc; i++) { if (strlen(argv[i]) >= 2 && !strncmp(argv[i], "--", 2)) { @@ -87,6 +89,9 @@ int main(int argc, char **argv) case 'o': output = argv[++i]; break; + case 'v': + verbose = 1; + break; case 'h': usage(); default: @@ -307,7 +312,7 @@ skip_mc: hdf5_events[nevents].dc = get_dc_word(&ev, f, &bmast, &b); if (get_ftpv(f,&b,&bftpv)) { - fprintf(stderr, "%s\n", zdab_err); + if (verbose) fprintf(stderr, "%s\n", zdab_err); hdf5_events[nevents].ftp_x = NAN; hdf5_events[nevents].ftp_y = NAN; hdf5_events[nevents].ftp_z = NAN; @@ -318,14 +323,14 @@ skip_mc: } if (get_ftxk(f,&b,&bftxk)) { - fprintf(stderr, "%s\n", zdab_err); + if (verbose) fprintf(stderr, "%s\n", zdab_err); hdf5_events[nevents].ftk_energy = NAN; } else { hdf5_events[nevents].ftk_energy = bftxk.energy; } if (get_rsp(f,&b,&bftxr)) { - fprintf(stderr, "%s\n", zdab_err); + if (verbose) fprintf(stderr, "%s\n", zdab_err); hdf5_events[nevents].rsp_energy = NAN; } else { hdf5_events[nevents].rsp_energy = bftxr.ene; |